Index: /applications/editors/josm/i18n/po/bg.po =================================================================== --- /applications/editors/josm/i18n/po/bg.po (revision 13832) +++ /applications/editors/josm/i18n/po/bg.po (revision 13833) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-15 22:03+0100\n" -"PO-Revision-Date: 2009-02-14 23:10+0000\n" +"POT-Creation-Date: 2009-02-21 16:35+0100\n" +"PO-Revision-Date: 2009-02-21 22:28+0000\n" "Last-Translator: LandShark \n" "Language-Team: Bulgarian \n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-02-15 20:41+0000\n" +"X-Launchpad-Export-Date: 2009-02-22 20:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 #, java-format msgid "" @@ -31,5 +31,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 msgid "" "This action will have no shortcut.\n" @@ -39,5 +39,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -48,5 +48,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "" @@ -58,17 +58,17 @@ #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 msgid "Information" msgstr "Информация" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Do nothing" msgstr "Не прави нищо" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Report Bug" msgstr "Съобщаване за грешка" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 msgid "" "An unexpected exception occurred.\n" @@ -82,14 +82,14 @@ "на JOSM, бъдете така добри да съобщите за проблема." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Unexpected Exception" msgstr "Неочаквана грешка" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 #, java-format msgid "Please report a ticket at {0}" msgstr "Моля, съобщете за грешката на адрес {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" @@ -97,5 +97,5 @@ "се може по-подробно!)" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:78 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -105,9 +105,9 @@ "да съобщите за грешка." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Be sure to include the following information:" msgstr "Прикрепете следната информация към репорта ви:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75 msgid "(The text has already been copied to your clipboard.)" msgstr "(Текста вече е кипиран в буфера за обмен на данни)" @@ -121,5 +121,5 @@ msgstr "Грешка при възпроизвеждане на звука" -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:94 @@ -127,5 +127,5 @@ msgstr "Свързване с OSM Сървър..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:48 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:32 @@ -133,10 +133,10 @@ msgstr "Сваляне данни от OSM..." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 msgid "NullPointerException, possibly some missing tags." msgstr "Грешка! Възможно е да липсват маркери (тагове)." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83 msgid "Preparing data..." msgstr "Подготвяне на данните..." @@ -165,48 +165,48 @@ msgstr "Зареждане точки {0} до {1}..." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:164 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:168 msgid "Unknown version" msgstr "Неизвестна версия" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 msgid "Found element in non-way." msgstr "Намерен е елемент извън път." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 msgid " has zero ref" msgstr "към няма обръщения ref." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 msgid "Found element in non-relation." msgstr "Открит е маркер извън релация." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:252 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250 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:294 msgid "Illegal object with id=0" msgstr "Недопустим обект с id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Липсва необходимия атрибут \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 #, java-format msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" msgstr "Игнориране на път, понеже съдържа несъществуващ елемент: {0}\n" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:502 msgid "Prepare OSM data..." msgstr "Подготовка на OSM данните..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:518 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:516 msgid "Ill-formed node id" msgstr "Неправилен код на точка" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:280 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:287 msgid "Parse error: invalid document structure for gpx document" msgstr "Грешка при разбор: невалидна структура на gpx документа" @@ -216,18 +216,18 @@ msgstr "Свързване със сървъра..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Опишете измененията на качваните от вас данни:" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 msgid "Commit comment" msgstr "Коментар на съхранението" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" msgstr "{0}% ({1}/{2}), {3} остава. Качване {4}: {5} (id: {6})" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64 @@ -237,34 +237,32 @@ msgstr "Възникна грешка: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:192 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190 msgid "Opening changeset..." msgstr "Отваряне на списък промени по версии..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:226 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224 msgid "Server does not support changesets" msgstr "Сървъра не поддържа управление на версиите" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:246 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:428 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:609 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:184 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607 msgid "Unknown host" msgstr "Неизвестен хост" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282 msgid "Preparing..." msgstr "Подготвяне…" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:294 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292 msgid "Uploading..." msgstr "Качване..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375 msgid "Closing changeset..." msgstr "Затваряне на списък промени по версии..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:652 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650 msgid "Transfer aborted due to error (will wait for 5 seconds):" msgstr "Прехвърлянето прекъснато поради грешка (повторен опит след 5 сек):" @@ -302,17 +300,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95 #: ../core/src/org/openstreetmap/josm/Main.java:348 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:29 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 @@ -325,11 +326,11 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:110 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -344,11 +345,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:186 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 msgid "Creating main GUI" msgstr "Създаване на интерфейса" #: ../core/src/org/openstreetmap/josm/Main.java:195 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:271 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:278 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:56 msgid "Help" @@ -391,21 +392,21 @@ msgstr "Игнориране неправилен адрес на файл: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109 msgid "min lat" msgstr "мин. ширина" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111 msgid "min lon" msgstr "мин. дължина" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:117 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "max lat" msgstr "макс. ширина" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 msgid "max lon" msgstr "макс. дължина" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:122 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -415,5 +416,5 @@ "за сваляне)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:134 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130 msgid "Bounding Box" msgstr "Рамка" @@ -449,6 +450,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:96 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:894 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:956 msgid "name" msgstr "име" @@ -481,5 +482,5 @@ msgstr "мащаб" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:107 msgid "" "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -489,5 +490,5 @@ "картата: Задръжте десния бутон на мишката и движете. Избор: Щракане." -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:109 msgid "Slippy map" msgstr "Интерактивна карта" @@ -498,7 +499,7 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:605 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:602 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:89 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -518,5 +519,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380 msgid "Remove" msgstr "Премахни" @@ -593,5 +594,6 @@ #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:101 msgid "unset: do not set this property on the selected objects" -msgstr "unset: не променяйте стойността на този параметър на избраните обекти" +msgstr "" +"unset: не променяйте стойността на този параметър на избраните обекти" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 @@ -620,5 +622,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" -msgstr "Променете размера на аплета до зададения (формат: ШИРОЧИНА x ВИСОЧИНА)" +msgstr "" +"Променете размера на аплета до зададения (формат: ШИРОЧИНА x ВИСОЧИНА)" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 @@ -660,20 +663,20 @@ msgstr "Ако е указано, да се нулира конфигурацията вместо да се прочете." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:109 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:186 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:198 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:108 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:191 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:203 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 msgid "Java OpenStreetMap Editor" msgstr "Java OpenStreetMap Редактор" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:111 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:110 msgid "Message of the day not available" msgstr "Съобщение за деня не е налично" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:200 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:205 msgid "Downloading \"Message of the day\"" msgstr "Зареждане на \"Съобщение на деня\"" @@ -713,33 +716,33 @@ msgstr "Намаляване" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:234 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:474 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:512 msgid "" msgstr "<различни>" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:383 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:380 msgid "More information about this feature" msgstr "Повече информация за тази възможност" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:393 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:390 msgid "Optional Attributes:" msgstr "Незадължителни Атрибути:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:437 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Използване шаблон ''{0}'' от група ''{1}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:438 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:435 #, java-format msgid "Use preset ''{0}''" msgstr "Използване шаблон ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 msgid "way" @@ -748,11 +751,11 @@ msgstr[1] "пътища" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:214 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 msgid "node" msgid_plural "nodes" @@ -760,6 +763,6 @@ msgstr[1] "възли" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:81 @@ -769,14 +772,14 @@ msgstr[1] "релации" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 msgid "closedway" msgstr "затворен път" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:475 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 #, java-format msgid "Unknown type: {0}" msgstr "Неизвестен тип: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:549 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 #, java-format @@ -784,15 +787,15 @@ msgstr "Не може да се прочете източник на шаблони за маркиране: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:555 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 #, java-format msgid "Error parsing {0}: " msgstr "Грешка при разбор {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:572 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:569 #, java-format msgid "Elements of type {0} are supported." msgstr "Елементи от тип {0} се поддържат." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595 #, java-format msgid "Change {0} object" @@ -801,9 +804,17 @@ msgstr[1] "Промяна {0} обекта" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 msgid "Nothing selected!" msgstr "Нищо не е избрано!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 +msgid "Selection unsuitable!" +msgstr "Селекцията е неподходяща!" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +msgid "Apply Preset" +msgstr "Прилагане шаблон" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 msgid "Change Properties" msgstr "Промяна параметри" @@ -814,14 +825,14 @@ msgstr "Група шаблони ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:107 msgid "File" msgstr "Файл" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:135 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:107 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:86 @@ -833,22 +844,22 @@ msgstr "Редактиране" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 msgid "View" msgstr "Преглед" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:26 msgid "Tools" msgstr "Инструменти" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:141 msgid "Audio" msgstr "Аудио" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:142 msgid "Presets" msgstr "Шаблони" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:40 @@ -860,18 +871,18 @@ msgstr "Меню: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:210 msgid "Wireframe View" msgstr "Каркас" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212 msgid "Toggle Wireframe view" msgstr "Превключване режим каркас" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:28 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 msgid "Contacting the OSM server..." msgstr "Свързване с OSM сървър..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 #, java-format msgid "This will change up to {0} object." @@ -880,11 +891,11 @@ msgstr[1] "Това ще промени до {0} обекта" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 msgid "An empty value deletes the key." msgstr "Празна стойност изтрива ключа." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66 @@ -894,7 +905,7 @@ msgstr "Ключ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 @@ -903,10 +914,10 @@ msgstr "Стойност" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333 msgid "Change values?" msgstr "Промени стойностите?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:257 #, java-format msgid "Change properties of up to {0} object" @@ -915,33 +926,33 @@ msgstr[1] "Промяна параметрите на {0} обекта" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 msgid "Please select a key" msgstr "Моля, изберете ключ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321 msgid "Please select a value" msgstr "Изберете стойност" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:445 msgid "Please select the objects you want to change properties for." msgstr "Моля, изберете обектите, чиито параметри искате да промените." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 msgid "Properties/Memberships" msgstr "Параметри/Отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 msgid "Properties for selected objects." msgstr "Параметри на избраните обекти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97 @@ -953,58 +964,58 @@ msgstr "Превключи: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 msgid "Member Of" msgstr "Член на" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Role" msgstr "Роля" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:559 msgid "Change relation" msgstr "Промени релация" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Изваждане на избраните обекти от релация {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 msgid "Delete from relation" msgstr "Изтриване от релация" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:600 msgid "Add Properties" msgstr "Добавяне на параметри" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 msgid "Add a new key/value pair to all objects" msgstr "Добавяне на нова двойка ключ/стойност за всички обекти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 msgid "Edit Properties" msgstr "Редактиране на параметри" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609 msgid "Edit the value of the selected key for all objects" msgstr "Редактиране стойността на избрания ключ за всички обекти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 msgid "Delete Properties" msgstr "Изтриване на параметри" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:77 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:293 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 @@ -1013,98 +1024,115 @@ msgstr "Изтриване" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 msgid "Delete the selected key in all objects" msgstr "Изтриване на избрания ключ за всички обекти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:763 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Свойства: {0} / Членство: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:769 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 msgid "Properties / Memberships" msgstr "Параметри / Отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178 +msgid "Apply Changes" +msgstr "Приложи промените" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 msgid "Create new relation" msgstr "Създаване нова релация" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208 msgid "Edit new relation" msgstr "Редактиране на нова релация" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209 #, java-format msgid "Edit relation #{0}" msgstr "Редактиране релация #{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230 +msgid "Basic" +msgstr "Основен" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Occupied By" msgstr "Обект" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311 msgid "Tags (empty value deletes tag)" msgstr "Маркери (празна стойност изтрива маркера)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313 msgid "Members" msgstr "Членове" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 +msgid "Move Up" +msgstr "Преместване нагоре" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 msgid "Move the currently selected members up" msgstr "Преместване на текущо избраните членове нагоре" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358 +msgid "Add Selected" +msgstr "Добавяне на избраните" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359 +msgid "Add all currently selected objects as members" +msgstr "Добавяне на всички текущо обекти като членове" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365 +msgid "Remove Selected" +msgstr "Изтриване на избраното" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366 +msgid "Remove all currently selected objects from relation" +msgstr "Изтриване на всички текущи избрани обекти от релацията" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 +msgid "Move Down" +msgstr "Преместване надолу" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 msgid "Move the currently selected members down" msgstr "Преместване на текущо избраните членове надолу" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356 -msgid "Add Selected" -msgstr "Добавяне на избраните" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:357 -msgid "Add all currently selected objects as members" -msgstr "Добавяне на всички текущо обекти като членове" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:363 -msgid "Remove Selected" -msgstr "Изтриване на избраното" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:364 -msgid "Remove all currently selected objects from relation" -msgstr "Изтриване на всички текущи избрани обекти от релацията" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381 msgid "Remove the member in the current table row from this relation" msgstr "Изтриване на члена от текущия ред на таблицата от тази релация" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394 msgid "Download Members" msgstr "Сваляне членове" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:406 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395 msgid "Download all incomplete ways and nodes in relation" msgstr "Сваляне всички непълни пътища и възли от релацията" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:415 -msgid "Basic" -msgstr "Основен" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:453 #, java-format msgid "Members: {0}" msgstr "Членове: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:587 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:461 +#, java-format +msgid "Relation Editor: {0}" +msgstr "Редактор релации: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:585 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 msgid "There were conflicts during import." msgstr "Възникнаха конфликти при импортване." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593 msgid "Error parsing server response." msgstr "Грешка при разбор на отговора на сървъра." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:600 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:594 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:598 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -1118,9 +1146,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:345 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 msgid "Error" msgstr "Грешка" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:599 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597 msgid "Cannot connect to server." msgstr "Невъзможно да се установи връзка със сървъра." @@ -1157,5 +1185,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:128 msgid "Reload all currently selected objects and refresh the list." -msgstr "Презареждане на всички текущо избрани обекти и опресняване на списъка." +msgstr "" +"Презареждане на всички текущо избрани обекти и опресняване на списъка." #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:134 @@ -1283,5 +1312,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:94 @@ -1291,5 +1320,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 msgid "" @@ -1355,16 +1384,24 @@ msgstr "Избрано: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +msgid "Open an editor for the selected relation" +msgstr "Отвори редактор за избраната релация" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +msgid "Delete the selected relation" +msgstr "Изтриване на избраната релация" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 #: trans_presets.java:2904 msgid "Relations" msgstr "Релации" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 msgid "Open a list of all relations." msgstr "Отваряне списък с всички релации." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 @@ -1372,17 +1409,9 @@ msgstr "Нов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 msgid "Create a new relation" msgstr "Създай нова релация" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open an editor for the selected relation" -msgstr "Отвори редактор за избраната релация" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -msgid "Delete the selected relation" -msgstr "Изтриване на избраната релация" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:130 #, java-format msgid "Relations: {0}" @@ -1410,47 +1439,47 @@ msgstr "Списък промени: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +msgid "Resolve" +msgstr "Разрешаване" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +msgid "Open a merge dialog of all selected items in the list above." +msgstr "Отваряне диалог за сливане на избраните обекти от горния списък." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Conflict" msgstr "Конфликт" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 msgid "Merging conflicts." msgstr "Разрешяване конфликти." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67 -msgid "Resolve" -msgstr "Разрешаване" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:68 -msgid "Open a merge dialog of all selected items in the list above." -msgstr "Отваряне диалог за сливане на избраните обекти от горния списък." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:105 -msgid "Please select something from the conflict list." -msgstr "Моля, изберете нещо от списъка с конфликти." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Resolve Conflicts" msgstr "Разрешаване на конфликти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +msgid "Solve Conflict" +msgstr "Разрешаване конфликт" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 #, java-format msgid "Conflicts: {0}" msgstr "Конфликти: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Conflicts" msgstr "Конфликти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 msgid "conflict" msgstr "конфликт" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 msgid "background" msgstr "фон" @@ -1474,5 +1503,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 msgid "Customize Color" @@ -1480,5 +1509,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1488,5 +1517,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1495,5 +1524,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:326 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:152 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -1513,5 +1542,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:265 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 #, java-format msgid "Audio synchronized at point {0}." @@ -1519,5 +1548,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232 msgid "Unable to synchronize in layer being played." msgstr "Невъзможно да се синхронизира в слоя, който се изпълнява." @@ -1541,5 +1570,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:958 msgid "desc" msgstr "опис." @@ -1561,5 +1590,5 @@ msgstr "Грешка показване URL" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -1569,5 +1598,5 @@ "асоцииран саундтрак прослушвате." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -1577,85 +1606,41 @@ "върху точка от следа, където искате да синхронизирате." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224 msgid "Unable to create new audio marker." msgstr "Невъзможно да се създаде нов аудио-маркер." #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 msgid "Convert to data layer" msgstr "Преобразувай в слой данни" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:725 -msgid "" -"Upload of unprocessed GPS data as map data is considered harmful." -"
If you want to upload traces, look here:" -msgstr "" -"Качването на необработени GPS данни в картата се смята за вредно." -"
Ако искате да качвате следи, погледнете тук:" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:645 +msgid "" +"Upload of unprocessed GPS data as map data is considered " +"harmful.
If you want to upload traces, look here:" +msgstr "" +"Качването на необработени GPS данни в картата се смята за " +"вредно.
Ако искате да качвате следи, погледнете тук:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:646 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:747 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:448 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:667 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "Converted from: {0}" msgstr "Преобразувано от: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612 -msgid "Upload this trace..." -msgstr "Качи този маршрут" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:616 -msgid "" -"This functionality has been added only recently. Please
use with " -"care and check if it works as expected." -msgstr "" -"Тази функционалност беше добавена наскоро. Моля
използвайте " -"внимателно и проверявайте дали работи както се очаква." - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:102 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:107 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:626 -msgid "Upload track filtered by JOSM" -msgstr "Качване на следа, филтрирана от JOSM" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:103 -#, java-format -msgid "Upload raw file: {0}" -msgstr "Качване необработен файл: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:108 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:627 -msgid "Upload raw file: " -msgstr "Качване необработен файл: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640 -msgid "Description:" -msgstr "Описание:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:123 -msgid "Tags:" -msgstr "Маркери:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:129 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:648 -msgid "GPX-Upload" -msgstr "GPX-Качване" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:229 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:217 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113 msgid "gps point" msgstr "GPS точка" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 #: trans_presets.java:1795 trans_presets.java:1801 trans_presets.java:1807 #: trans_presets.java:1813 trans_presets.java:1819 trans_presets.java:1825 @@ -1675,5 +1660,5 @@ msgstr[1] "следи" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 msgid "point" msgid_plural "points" @@ -1681,5 +1666,5 @@ msgstr[1] "точки" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 #, java-format msgid "a track with {0} point" @@ -1688,5 +1673,5 @@ msgstr[1] "следа с {0} точки" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} consists of {1} track" @@ -1695,5 +1680,5 @@ msgstr[1] "{0} се състои от {1} следи" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} point" @@ -1702,25 +1687,25 @@ msgstr[1] "{0} точки" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117 msgid "Customize line drawing" msgstr "Настройка рисуването на линии" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:296 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 msgid "Use global settings." msgstr "Използвай глобалните настройки." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 msgid "Draw lines between points for this layer." msgstr "Чертай линии между точките на този слой." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:298 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123 msgid "Do not draw lines between points for this layer." msgstr "Не чертай линии между точките на този слой." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:135 msgid "Select line drawing options" @@ -1754,5 +1739,5 @@ msgstr "Изображения JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290 #, java-format msgid "{0} track, " @@ -1761,5 +1746,5 @@ msgstr[1] "{0} следи, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 #, java-format msgid "{0} route, " @@ -1768,5 +1753,5 @@ msgstr[1] "{0} маршрути, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 #, java-format msgid "{0} waypoint" @@ -1775,55 +1760,51 @@ msgstr[1] "{0} точки на интерес" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #, java-format msgid "Name: {0}" msgstr "Название: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "Description: {0}" msgstr "Описание: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 msgid "Timespan: " msgstr "Времеви интервал: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Length: " msgstr "Дължина: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:642 -msgid "Tags (keywords in GPX):" -msgstr "Маркери (ключови думи в GPX):" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:655 msgid "time" msgstr "време" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:780 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:679 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:700 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 msgid "Download from OSM along this track" msgstr "Свали от OSM по дължина на тази следа" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:686 msgid "Download everything within:" msgstr "Свали всичко в пределите на:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 #, java-format msgid "{0} meters" msgstr "{0} метри" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:692 msgid "Maximum area per request:" msgstr "Максимална област за една заявка:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 #, java-format msgid "{0} sq km" msgstr "{0} кв. км." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787 #, java-format msgid "" @@ -1834,14 +1815,14 @@ "Продължаване?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:844 #, java-format msgid "Audio markers from {0}" msgstr "Аудио маркери от {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 msgid "No GPX track available in layer to associate audio with." msgstr "Няма GPX следа в слоя за да асоциираме звук с нея." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "" "Some waypoints with timestamps from before the start of the track were " @@ -1851,5 +1832,5 @@ "пропуснати." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -1959,19 +1940,19 @@ msgstr "Въведенето време не може да бъде използвано." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:140 msgid "outside downloaded area" msgstr "извън областта за сваляне" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 #, java-format msgid "{0} consists of:" msgstr "{0} се състои от:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:353 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:347 #, java-format msgid " ({0} deleted.)" msgstr " ({0} изтрити.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:445 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 msgid "Convert to GPX layer" msgstr "Преобразувай в слой GPX" @@ -1999,37 +1980,37 @@ msgstr "Невъзможен записът на отметките." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 msgid "The geographic longitude at the mouse pointer." msgstr "Географската дължина на показалеца на мишката." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The name of the object at the mouse pointer." msgstr "Название на обекта сочен от показалеца на мишката." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 msgid "The geographic latitude at the mouse pointer." msgstr "Географска ширина на показалеца на мишката." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The angle between the previous and the current way segment." msgstr "Ъгъл между предишния и текущия сегмент от пътя" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The (compass) heading of the line segment being drawn." msgstr "Направлението на създавания линеен сегмент." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The length of the new way segment being drawn." msgstr "Дължина на новосъздавания линеен сегмент." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:160 msgid "(no object)" msgstr "(няма обект)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:62 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:56 msgid "Color" msgstr "Цвят" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:57 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107 #: trans_presets.java:56 trans_presets.java:92 trans_presets.java:130 @@ -2130,27 +2111,36 @@ msgstr "Име" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:118 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:112 #, java-format msgid "Paint style {0}: {1}" msgstr "Стил на изобразяване {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 msgid "Choose" msgstr "Изберете" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 msgid "Please select a color." msgstr "Моля, изберете цвят" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 #, java-format msgid "Choose a color for {0}" msgstr "Изберете цвят за {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +msgid "Set to default" +msgstr "Задай по подразбиране" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:172 +msgid "Set all to default" +msgstr "Задай всички да са по подразбиране" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:184 msgid "Colors used by different objects in JOSM." msgstr "Цветове, използвани от различни обекти в JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:171 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:198 msgid "Colors" msgstr "Цветове" @@ -2185,7 +2175,7 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45 msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transfered in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." +"WARNING: The password is stored in plain text in the preferences " +"file.
The password is transfered in plain text to the server, encoded in " +"the URL.
Do not use a valuable Password." msgstr "" "ВНИМАНИЕ: Паролата се съхранява в обиковен текст във файла с " @@ -2193,18 +2183,18 @@ "включена в URL адрес.
Не използвайте ценна парола." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44 msgid "Sort presets menu" msgstr "Сортиране меню шаблони" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46 msgid "Enable built-in defaults" msgstr "Използване на вградените настройки" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:58 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69 msgid "Tagging preset source" msgstr "Източник на шаблони за маркиране" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:156 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 @@ -2212,5 +2202,5 @@ msgstr "Моля, изберете ред за редактиране" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500 @@ -2219,26 +2209,26 @@ msgstr "Моля, изберете ред за изтриване." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89 -msgid "" -"The sources (URL or filename) of tagging preset definition files. See http://" -"josm.openstreetmap.de/wiki/TaggingPresets for help." +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88 +msgid "" +"The sources (URL or filename) of tagging preset definition files. See " +"http://josm.openstreetmap.de/wiki/TaggingPresets for help." msgstr "" "Източник (URL или име файл) на файлове с дефиниции на шаблони за маркиране. " "Вижте http://josm.openstreetmap.de/wiki/TaggingPresets за подробности." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89 msgid "Add a new tagging preset source to the list." msgstr "Добавяне на нов източник на шаблони за маркиране към списъка." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 msgid "Delete the selected source from the list." msgstr "Изтриване на източник от списъка" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:94 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93 msgid "Tagging Presets" msgstr "Шаблони за маркиране" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97 msgid "Tagging preset sources" msgstr "Източници на шаблони за маркиране" @@ -2252,6 +2242,6 @@ msgstr "При запис, оставяй резервни копия на файловете завършващи с ~" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:141 @@ -2259,34 +2249,34 @@ msgstr "Разширения" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 msgid "Configure available plugins." msgstr "Настройка на достъпните разширения." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43 msgid "Download List" msgstr "Свали списък" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:80 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51 msgid "Update" msgstr "Обновяване" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:60 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 msgid "Configure Sites..." msgstr "Настройване сайтове..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add either site-josm.xml or Wiki Pages." msgstr "Добавяне или на site-josm.xml, или на Wiki страници." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99 msgid "Please select an entry." msgstr "Моля, изберете елемент." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 msgid "Configure Plugin Sites" msgstr "Настройка сайтове за разширения" @@ -2476,9 +2466,9 @@ msgstr "Калибровка на звукозаписа" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "Display Settings" msgstr "Настройки на дисплея" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "" "Various settings that influence the visual representation of the whole " @@ -2486,56 +2476,65 @@ msgstr "Различни настройки, влияещи на външния вид на програмата." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings" msgstr "Настройки на връзката" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings for the OSM server." msgstr "Параметри на връзката с OSM сървъра." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Map Settings" msgstr "Настройки на картата" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Settings for the map projection and data interpretation." msgstr "Параметри на проекцията на картата и интерпретацията на данните." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Audio Settings" msgstr "Аудио настройки" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Settings for the audio player and audio markers." msgstr "Параметри за звуковия плейър и звуковите маркери." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97 msgid "You have to restart JOSM for some settings to take effect." msgstr "" "Трябва да рестартирате JOSM, за да може изменените настройки да подействат." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:25 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 msgid "Draw lines between raw gps points." msgstr "Съединявай с линии точките от GPS следите." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:27 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 msgid "Force lines if no segments imported." msgstr "Изобразвай линии, даже и ако не са импортирани сегменти." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:28 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 msgid "Draw large GPS points." msgstr "Изобразявай големи GPS точките." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 -msgid "Color tracks by velocity." -msgstr "Оцветявай точките в следите според скоростта." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34 +msgid "Velocity (red = slow, green = fast)" +msgstr "Скорост (червено = бавно, зелено = бързо)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 +msgid "Dilution of Position (red = high, green = low, if available)" +msgstr "" +"Неточност на позицията (червено = висока, зелено = ниска, ако е приложимо)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 +msgid "Single Color (can be customized for named layers)" +msgstr "Единствен цвят (може да се настройва за наименувани слоеве)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:1346 msgid "Car" msgstr "Автомобил" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:309 trans_presets.java:635 trans_presets.java:833 #: trans_presets.java:842 trans_presets.java:851 trans_presets.java:864 @@ -2547,5 +2546,5 @@ msgstr "Вело" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:310 trans_presets.java:637 trans_presets.java:832 #: trans_presets.java:841 trans_presets.java:850 trans_presets.java:863 @@ -2556,45 +2555,45 @@ msgstr "Пеш" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 msgid "Draw Direction Arrows" msgstr "Изобразвай направлението със стрелки" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 msgid "Fast drawing (looks uglier)" msgstr "Бързо изрисуване (изглежда по-зле)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180 msgid "Only interesting direction hints (e.g. with oneway tag)." msgstr "" "Само интересните указатели на посока (примерно, при еднопосочни пътища)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:186 msgid "Only on the head of a way." msgstr "Само в началото на път." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44 msgid "Draw segment order numbers" msgstr "Показвай поредния номер на сегментите" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45 msgid "Draw boundaries of downloaded data" msgstr "Изобразвай границите на свалените данни." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46 msgid "Draw virtual nodes in select mode" msgstr "Изобразявай виртуални възли в режим на избор." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47 msgid "Draw inactive layers in other color" msgstr "Изобразявай неактивните слоеве в друг цвят" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 msgid "Smooth map graphics (antialiasing)" msgstr "Изглаждане на линиите (антиалиасинг)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 msgid "" "If your gps device draws too few lines, select this to draw lines along your " @@ -2604,5 +2603,5 @@ "за да се съединяват точките с линии." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:71 msgid "" "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines." @@ -2611,24 +2610,25 @@ "се рисуват всички линии." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73 msgid "Maximum length (meters)" msgstr "Максимална дължина (в метри)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:77 msgid "" "Force drawing of lines if the imported data contain no line information." msgstr "Изобразвай линии, даже ако не е импортирана информация за линии." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:84 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89 msgid "Draw direction arrows for lines, connecting GPS points." msgstr "Изобразвай стрелки по посоката на линиите, съединяващи GPS точки." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90 -msgid "Draw the direction arrows using table lookups instead of complex math." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95 +msgid "" +"Draw the direction arrows using table lookups instead of complex math." msgstr "" "Изобразвай стрелки с посоката, използвайки таблици вместо математически " "изчисления." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:96 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:101 msgid "" "Don't draw arrows if they are not at least this distance away from the last " @@ -2637,13 +2637,33 @@ "Не рисувай стрелки, ако те се не са поне на това разстояние една от друга." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104 msgid "Minimum distance (pixels)" msgstr "Минимално разстояние (в пиксели)" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:109 -msgid "Choose the hue for the track color by the velocity at that point." -msgstr "Изберете нюанс на цвета в зависимост на скоростта в точката." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116 +msgid "Draw larger dots for the GPS points." +msgstr "Рисуване на по-големи GPS точките." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136 +msgid "" +"All points and track segments will have the same color. Can be customized in " +"Layer Manager." +msgstr "" +"Всички точки и сегменти от следи ще имат еднакъв цвят. Може да се настройва " +"в мениджър слоеве." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137 +msgid "Colors points and track segments by velocity." +msgstr "Оцветяване точките от следите според скоростта." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:138 +msgid "" +"Colors points and track segments by dilution of position (HDOP). Your " +"capture device needs to logs that information." +msgstr "" +"Оцветява точките и сегменти от следи според неточността на позицията (HDOP). " +"Вашият приемник трябва да поддържа запис на този тип информация." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143 msgid "Allows to tune the track coloring for different average speeds." msgstr "" @@ -2651,29 +2671,30 @@ "скорости." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122 -msgid "Draw larger dots for the GPS points." -msgstr "Рисуване на по-големи GPS точките." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148 +msgid "Track and Point Coloring" +msgstr "Оцветяване на следата" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 msgid "GPS Points" msgstr "GPS Точки" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175 msgid "Draw direction hints for way segments." msgstr "Показване на направлението на сегментите на пътя." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:163 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192 msgid "Draw the order numbers of all segments within their way." msgstr "Показване поредните номера на всички сегменти на пътя." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:168 -msgid "Apply antialiasing to the map view resulting in a smoother appearance." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:197 +msgid "" +"Apply antialiasing to the map view resulting in a smoother appearance." msgstr "Приложи изглаждане върху картата." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202 msgid "Draw the boundaries of data loaded from the server." msgstr "Изобразяване границата на областа, свалена от сървъра." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:178 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:207 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" @@ -2681,9 +2702,9 @@ "на пътища." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212 msgid "Draw the inactive data layers in a different color." msgstr "Изобразяване неактивните слоеве с данни в други цветове." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219 msgid "OSM Data" msgstr "OSM Данни" @@ -2795,6 +2816,6 @@ "a menu entry of button for the first time. So some of your changes may " "become active even without restart --- but also without collistion handling. " -"This is another reason to restart JOSM after making any changes here." -"

" +"This is another reason to restart JOSM after making any changes " +"here.

" msgstr "" "

Освен това, бързите клавиши се активират, когато действията се " @@ -2812,8 +2833,9 @@ "key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also " "there will be 'keys' listed that correspond to a shortcut on your keyboard " -"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/" -"Semicolon on US keyboards, '.'/Period on German keyboards, ...) instead. Not " -"doing so may result in conflicts, as there is no way for JOSM to know that " -"Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...

" +"(e.g. ':'/Colon). Please also do not use them, use the base key " +"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) " +"instead. Not doing so may result in conflicts, as there is no way for JOSM " +"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US " +"keyboard...

" msgstr "" "

Може да забележите, че в списъка за избор на клавиши на следващата " @@ -2828,6 +2850,6 @@ "клавиатура, '.'/Точка на Немска клавуатура, ...). Ако не спазвате това, може " "да настъпят конфликти, тъй като за JOSM няма начин да знае, че Ctrl+Shift+; " -"и Ctrl+: представляват всъщност една и съща комбинация на US клавиатура..." +"и Ctrl+: представляват всъщност една и съща комбинация на US " +"клавиатура...

" #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:177 @@ -2856,6 +2878,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183 msgid "" -"

The pseudo-modifier 'disabled' will disable the shortcut when encountered." -"

" +"

The pseudo-modifier 'disabled' will disable the shortcut when " +"encountered.

" msgstr "" "

Псевдо-модификатор 'изключено' ще изключва бърза клавишна комбинация.

" @@ -2926,67 +2948,67 @@ msgstr "Група модификатори" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:231 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:236 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:250 msgid "layer not in list." msgstr "слоя не е в списъка." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." msgstr "Не е намерен превод за локал {0}. Връщане към {1}." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "usage" msgstr "използване" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 msgid "options" msgstr "опции" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 msgid "Show this help" msgstr "Показване на тази помощ" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Standard unix geometry argument" msgstr "Стандартен параметри на unix геометрия" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 msgid "Download the bounding box" msgstr "Сваляне на област в предала на рамка" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 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:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Open file (as raw gps, if .gpx)" msgstr "Отваряне на файл (како GPS данни, ако е .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 msgid "Download the bounding box as raw gps" msgstr "Сваляне на област от рамка, като GPS данни" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Select with the given search" msgstr "Избор с даденото търсене" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 msgid "Don't launch in fullscreen mode" msgstr "Не пускай в пълноекранен режим" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 msgid "Reset the preferences to default" msgstr "Възстановяване на параметрите по подразбиране" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 msgid "Set the language." msgstr "Избор език." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 msgid "examples" msgstr "примери" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -2996,21 +3018,21 @@ "че зареждате данни преди --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 msgid "Instead of --download= you may specify osm://\n" msgstr "Вместо --download= може да укажете osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 msgid "Activating updated plugins" msgstr "Активиране обновените разширения" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 msgid "Loading early plugins" msgstr "Зареждане на ранните разширения" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Setting defaults" msgstr "Настройки по умълчание" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171 msgid "Loading plugins" msgstr "Зареждане на разширения" @@ -3044,6 +3066,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:108 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:164 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:162 #: trans_presets.java:308 trans_presets.java:309 trans_presets.java:310 #: trans_presets.java:311 trans_presets.java:312 trans_presets.java:313 @@ -3060,5 +3082,5 @@ msgstr "неизвестно" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:66 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 #, java-format msgid "" @@ -3068,25 +3090,25 @@ "Внимание - заявено е зареждане на модул {0}. Този модул не се изисква вече." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 #, java-format msgid "Plugin requires JOSM update: {0}." msgstr "За работа на модула е нужна по-нова версия на JOSM: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "Разширение {0} се изисква от разширение {1}, но не беше открито." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 #, java-format msgid "Plugin not found: {0}." msgstr "Модулът не е открит: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Последно обновление на модула преди повече от {0} дни." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 msgid "" "(You can change the number of days after which this warning appears
by " @@ -3094,20 +3116,21 @@ msgstr "" "(Може да промените броя дни преди да се появи това предупреждение " -"отново
чрез задаването на конфигурационната опция 'pluginmanager." -"warntime'.)" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 +"отново
чрез задаването на конфигурационната опция " +"'pluginmanager.warntime'.)" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 msgid "Disable plugin" msgstr "Изключване на разширение" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" -msgstr "Невозможно зареждането на модул {0}. Да се премахне ли от настройките?" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +msgstr "" +"Невозможно зареждането на модул {0}. Да се премахне ли от настройките?" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -3117,5 +3140,5 @@ "право да презаписва текущите." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 #, java-format msgid "" @@ -3125,10 +3148,10 @@ "\"{0}\"." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Съгласно информацията в разширението, автора е {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:262 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -3137,9 +3160,9 @@ "за грешка." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 msgid "Should the plugin be disabled?" msgstr "Разширението да бъде ли изключено?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:278 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -3149,5 +3172,5 @@ "да изключим разширенето." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -3157,6 +3180,6 @@ "JOSM за този проблем." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:322 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:181 msgid "no description available" msgstr "няма описание" @@ -3168,5 +3191,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 msgid "Update Plugins" msgstr "Обновяване разширения" @@ -3202,5 +3225,5 @@ "Разширение {0} изглежда повредено или не може да бъде свалено автоматично." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 #, java-format msgid "Downloaded plugin information from {0} site" @@ -3209,13 +3232,13 @@ msgstr[1] "Сваляне на информация за разширението от {0} сайта" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 msgid "No plugin information found." msgstr "Информация за разширението не е намерена." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:76 msgid "All installed plugins are up to date." msgstr "Всички инсталирани разширения са последна версия." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 #, java-format msgid "" @@ -3228,9 +3251,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:105 msgid "Download missing plugins" msgstr "Сваляне на липсващи разширения" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:106 #, java-format msgid "" @@ -3243,22 +3266,22 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 msgid "Download Plugins" msgstr "Зареждане на разширенията" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:170 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:168 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Версия {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:176 msgid "Plugin bundled with JOSM" msgstr "Разширения доставяни с JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208 msgid "Plugin already exists" msgstr "Разширението вече съществува" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:211 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:209 #, java-format msgid "" @@ -3273,15 +3296,15 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 msgid "Delete and Download" msgstr "Изтриване и Зареждане" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:222 #, java-format msgid "Error deleting plugin file: {0}" msgstr "Грешка при изтриването на файл на разширение: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:281 #, java-format msgid "Error reading plugin information file: {0}" @@ -3348,10 +3371,10 @@ msgstr "Изтриване {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:165 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 msgid "Conflicting relation" msgstr "Конфликтиращи релации" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 #, java-format msgid "" @@ -3362,5 +3385,5 @@ "Изтриване от релацията?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:166 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 #, java-format msgid "" @@ -3377,7 +3400,7 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:349 msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" +"You are about to delete nodes outside of the area you have " +"downloaded.
This can cause problems because other objects (that you don't " +"see) might use them.
Do you really want to delete?" msgstr "" "Вие се каните да изтриете възли, намиращи се извън зоната, която сте свалили " @@ -3423,5 +3446,6 @@ #, java-format msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "Файла с предпочитания е повреден. Възстановяване от старо копие в {0}." +msgstr "" +"Файла с предпочитания е повреден. Възстановяване от старо копие в {0}." #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 @@ -3509,124 +3533,135 @@ msgstr "Невъзможно да се заредят предпочитанията от сървъра." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:232 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "Път, обознаващ граница на област, не е затворен." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:426 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:428 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "мултиполигонен път ''{0}'' не е затворен." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:527 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:765 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:776 msgid "Empty member in relation." msgstr "В релацията има празен член." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:767 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:531 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "В релацията има член ''{0}'', който е бил изтрит." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:547 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Пътя ''{0}'' е с по-малко от две точки." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:552 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:549 msgid "More than one \"from\" way found." msgstr "Повече от един път \"от\" са намерени." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:558 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555 msgid "More than one \"to\" way found." msgstr "Повече от един път \"до\" са намерени." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:561 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 +msgid "More than one \"via\" found." +msgstr "Повече от един \"през\" са открити." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 #, java-format msgid "Unknown role ''{0}''." msgstr "Неизвестна роля ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Неизвестен тип членство за ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 msgid "No \"from\" way found." msgstr "Не е намерен път \"от\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 msgid "No \"to\" way found." msgstr "Не е намерен път \"до\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -msgid "No \"via\" node found." -msgstr "Не е намерен възел \"през\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +msgid "No \"via\" node or way found." +msgstr "Не е открит възел или път \"през\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "Пътят \"от\" не започва или не завършва във възел \"през\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:636 -#, java-format -msgid "The \"{0}\" way must contain at least 2 nodes." -msgstr "Пътят \"{0}\" трябва да съдържа поне два възела." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:731 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +msgid "The \"to\" way doesn't start or end at a \"via\" node." +msgstr "Пътят \"до\" не започва или свършва във възел \"през\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:620 +msgid "The \"from\" way doesn't start or end at the \"via\" way." +msgstr "Пътят \"от\" не започва или свършва във възел \"през\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:624 +msgid "The \"to\" way doesn't start or end at the \"via\" way." +msgstr "Пътят \"до\" не започва или свършва в път \"през\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:742 #, java-format msgid "Style for restriction {0} not found." msgstr "Стил за ограничение {0} не е намерен." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Няма подходяща роля ''{0}'' за Път ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Не-Път ''{0}'' в мултиполигон." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:847 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:858 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Липсва външен път за мултиполигон ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Пресичане между пътища ''{0}'' и ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:949 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Вътрешният път ''{0}'' се намира отвън." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:987 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:998 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "Стилът за вътрешния път ''{0}'' се равнява на мултиполигон." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1012 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1023 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Стилът за външния път ''{0}'' се разминава." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1195 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1206 msgid "untagged" msgstr "немаркиран" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1196 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207 msgid "text" msgstr "текст" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" msgstr "неактивен" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:94 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:181 @@ -3634,15 +3669,15 @@ msgstr "избран" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" msgstr "немаркиран път" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 msgid "incomplete way" msgstr "незавършен път" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 msgid "highlight" -msgstr "" +msgstr "подчертай" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -3662,5 +3697,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:113 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:89 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:77 msgid "incomplete" @@ -3690,15 +3725,15 @@ msgstr[1] "{0} членове" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 msgid "Duplicate" msgstr "Дублиране" +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 +msgid "Duplicate selection by copy and immediate paste." +msgstr "" +"Създай копие на селектираните обекти чрез копиране и незабавно поставяне." + #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 -msgid "Duplicate selection by copy and immediate paste." -msgstr "" -"Създай копие на селектираните обекти чрез копиране и незабавно поставяне." - -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 @@ -3707,5 +3742,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -3777,7 +3812,11 @@ msgstr "Показване на историческа информация за OSM обекти." -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:57 -msgid "Please select at least one node, way or relation." -msgstr "Моля, изберете поне една точка, линия или релация." +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:60 +msgid "" +"Please select at least one node, way or relation. Only already uploaded " +"elements have a history." +msgstr "" +"Моля изберете поне една точка, път или релация. Само вече качени елементи " +"имат история." #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 @@ -3799,7 +3838,7 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/TerracerAction.java:47 @@ -3938,5 +3977,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:123 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:314 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:315 msgid "Enter values for all conflicts." msgstr "Въведете стойности за всички конфликти." @@ -3944,5 +3983,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 msgid "Solve Conflicts" msgstr "Разрешаване на конфликти" @@ -4078,5 +4117,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #, java-format @@ -4103,17 +4142,23 @@ msgstr[1] "Избраните точки не са в средата на път." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125 -msgid "" -"There is more than one way using the node(s) you selected. Please select the " +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 +msgid "" +"There is more than one way using the node you selected. Please select the " "way also." -msgstr "" -"Има повече от един път, които използват точката(ите), които сте избрали. " -"Моля изберете и път също." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133 +msgid_plural "" +"There is more than one way using the nodes you selected. Please select the " +"way also." +msgstr[0] "" +"Съществува повече от един път използващи точката, която сте избрали. Моля " +"изберете и пътя." +msgstr[1] "" +"Съществува повече от един път използващи точките, която сте избрали. Моля " +"изберете и пътя." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137 msgid "The selected nodes do not share the same way." msgstr "Избраните точки не се явяват част от един и същ път." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -4121,6 +4166,6 @@ msgstr[1] "Избраният път не съдържа избраните точки" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229 msgid "You must select two or more nodes to split a circular way." msgstr "" @@ -4128,5 +4173,5 @@ "път." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -4136,5 +4181,5 @@ "средата на пътя.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 msgid "" "A role based relation membership was copied to all new ways.\n" @@ -4144,5 +4189,5 @@ "Трябва да проверите това и при необходимост да внесете корекции." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:296 #, java-format msgid "Split way {0} into {1} parts" @@ -4450,5 +4495,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 msgid "Use | or OR to combine with logical or" -msgstr "Използвайте | или OR за да обедините в логическо \"ИЛИ\"" +msgstr "" +"Използвайте | или OR за да обедините в логическо \"ИЛИ\"" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 @@ -4479,5 +4525,6 @@ #, java-format msgid "Nothing removed from selection by searching for ''{0}''" -msgstr "Нищо не е премахнато от селекцията в резултат на търсенето за ''{0}''" +msgstr "" +"Нищо не е премахнато от селекцията в резултат на търсенето за ''{0}''" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 @@ -4537,5 +4584,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 msgid "Align Nodes in Circle" msgstr "Подреди точките в кръг" @@ -4549,5 +4596,5 @@ msgstr "Някои от точките са (почти) на една права" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 msgid "Please select at least four nodes." msgstr "Моля изберете поне четири точки." @@ -4616,4 +4663,34 @@ msgstr "Възникна грешка при възстановяване на резервно копие." +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "Показване статус" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "" +"Show status report with useful information that can be attached to bugs" +msgstr "" +"Показва отчет на статуса с полезна информация, която може да бъде свързана с " +"грешката." + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "Помощ: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92 +msgid "Status Report" +msgstr "Статус Репорт" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +msgid "Copy to clipboard and close" +msgstr "Копиране в буфера за обмен и затварянеч" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 +msgid "Close" +msgstr "Затваряне" + #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 @@ -4625,13 +4702,13 @@ msgstr "Повтаряне на последното отменено действие." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:44 msgid "Delete Mode" msgstr "Режим на изтриване" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:46 msgid "Delete nodes or ways." msgstr "Изтриване на точки или линии." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:84 @@ -4642,5 +4719,5 @@ msgstr "Режим: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:130 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -4653,6 +4730,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:87 msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." +"Drag play head and release near track to play audio from there; " +"SHIFT+release to synchronize audio at that point." msgstr "" "Влачете позицията на просвирване и пуснете близо до следата за да " @@ -4669,24 +4746,24 @@ msgstr "Създаване на области" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 msgid "Extrude Way" msgstr "Изтегляне на линии" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:252 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:416 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:430 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Отпуснете бутона на мишката за да изберете обектите в правоъгълника." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 msgid "Draw a rectangle of the desired size, then release the mouse button." msgstr "" "Нарисувайте правоъгълник от желания размер и отпуснете бутона на мишката." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:420 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:434 msgid "Release the mouse button to stop rotating." msgstr "Отпуснете бутона на мишката за да спрете въртенето." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 msgid "Drag a way segment to make a rectangle." msgstr "Нарисувай сегмент от път за да се образува правоъгълник." @@ -4754,14 +4831,14 @@ msgstr "Избиране, преместване и завъртане на обекти" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:191 msgid "Add and move a virtual new node to way" msgstr "Добавяне и преместване на виртуален нов възел към път" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:220 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:223 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 msgid "Cannot move objects outside of the world." msgstr "Невъзможно да се премества обектите извън границите на света." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:418 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:432 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -4770,5 +4847,5 @@ "най-близката точка." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:422 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:436 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to remove); Shift-" @@ -4847,32 +4924,32 @@ msgstr "Обедини {0} точки" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Orthogonalize Shape" msgstr "Ортогонализиране" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "" "Преместване на точките, така че аглите между линиите да са 90 или 270 градуса" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 msgid "Only two nodes allowed" msgstr "Само два точки е позволено да бъдат избрани" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 msgid "Selection must consist only of ways." msgstr "Селекцията трябва да се състои само от линии." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 msgid "Please select one or more closed ways of at least four nodes." msgstr "" "Моля, изберете един или повече затворени пътя, състоящи се от поне 4 точки." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 msgid "Please select ways with almost right angles to orthogonalize." msgstr "Моля изберете пътища с почти прави ъгли за ортогонализация." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -4884,9 +4961,9 @@ "за да не се появява повече това предупреждение.
Желаете ли да продължите?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "Only one node selected" msgstr "Само една точка е избрана" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 msgid "Orthogonalize" msgstr "Ортогонализиране" @@ -4937,5 +5014,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101 -msgid "Please select exactly three nodes or one way with exactly three nodes." +msgid "" +"Please select exactly three nodes or one way with exactly three nodes." msgstr "Моля, изберете точно три точки или един сегмент с три точки." @@ -4944,52 +5022,72 @@ msgstr "Точките не са разположени по кръг" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../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:71 +msgid "Update Data" +msgstr "Обновяване на данните" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" +"Обновяване на текущия слой с данни от сървъра (презареждане на данните)" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:72 +#, java-format +msgid "" +"This action will require {0} individual download requests. Do you wish to " +"continue?" +msgstr "" +"Това действие ще изисква {0} индивидуални запитвания за сваляне. Желаете ли " +"да продължите?" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 msgid "Open Location..." msgstr "Отваряне на местоположение…" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 msgid "Open an URL." msgstr "Отваряне на връзка URL." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 msgid "Separate Layer" msgstr "На отделен слой" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 msgid "Enter URL to download:" msgstr "Въведете URL за сваляне:" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 msgid "Download Location" msgstr "Местоположение на изтеглянето" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 msgid "Download URL" msgstr "URL за сваляне" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 msgid "Add Node..." msgstr "Добавяне на точка..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 msgid "Add a node by entering latitude and longitude." msgstr "Добавяне на точка чрез въвеждане на нейната широчина и дължина." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 msgid "Enter the coordinates for the new node." msgstr "Въведете координати за новата точка." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 msgid "Use decimal degrees." msgstr "Използване на десетични градуси." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 msgid "Negative values denote Western/Southern hemisphere." msgstr "Отрицателни стойности обозначават западното/южното полукълбо" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 #: ../plugins/livegps/livegps/LiveGpsDialog.java:54 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93 @@ -4998,5 +5096,5 @@ msgstr "Геогр. Ширина:" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 #: ../plugins/livegps/livegps/LiveGpsDialog.java:56 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96 @@ -5039,14 +5137,14 @@ msgstr "Премества обектите {0}" +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "Overwrite" msgstr "Презаписване" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "File exists. Overwrite?" msgstr "Файлът съществъва. Да го подменя ли?" @@ -5065,43 +5163,48 @@ msgstr "Моля, изберете нещо за копиране." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Разсъедини пътища" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "Дублиране на точки, които се използват от няколко линии." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 msgid "This node is not glued to anything else." msgstr "Тази точка не е свързана с към нещо друго." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 msgid "None of these nodes are glued to anything else." msgstr "Никой от тези точки не са прикрепени за нещо друго." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of this way's nodes are glued to anything else." msgstr "Нито една от тези тези линии не е прикрепена за други" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 msgid "The current selection cannot be used for unglueing." msgstr "Текущато избраните обекти не може да се разсъединят." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "Select either:" msgstr "Изберете един от вариантите:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +msgid "* One tagged node, or" +msgstr "* Един маркиран възел, или" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "* One node that is used by more than one way, or" msgstr "* Една точка, която се използва от няколко линии, или" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 -msgid "* One node that is used by more than one way and one of those ways, or" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +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:104 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -5109,5 +5212,5 @@ "* Една линия, която има точки, които се използват от няколко линии, или" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -5116,5 +5219,5 @@ "няколко линии." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -5127,10 +5230,14 @@ "дублирани възли и всички възли ще бъдат избрани." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:160 +msgid "Unglued Node" +msgstr "Незапелен възел" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:373 #, java-format msgid "Dupe into {0} nodes" msgstr "Дублирай в {0} точки" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:320 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:397 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -5233,5 +5340,5 @@ msgstr "Отменяне на последното действие." -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 msgid "No Shortcut" msgstr "Няма бърза клавишна комбинация" @@ -5253,13 +5360,13 @@ msgstr "OpenStreetMap данни" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:29 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:28 msgid "Downloading GPS data" msgstr "Сваляне на GPS данни" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:41 msgid "Downloaded GPX Data" msgstr "Свалени GPX данни" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:71 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:69 msgid "Raw GPS data" msgstr "Изходни GPS данни" @@ -5476,5 +5583,6 @@ #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 msgid "Open only files that are visible in current view." -msgstr "Отваряне само на файлове, които са видими в текущата област на екрана." +msgstr "" +"Отваряне само на файлове, които са видими в текущата област на екрана." #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:55 @@ -5487,5 +5595,6 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169 -msgid "Header contains several values and cannot be mapped to a single string" +msgid "" +"Header contains several values and cannot be mapped to a single string" msgstr "" "Заглавната част съдържа няколко стойности и не може да бъде представена с " @@ -5543,5 +5652,6 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96 msgid "Open the OpenStreetBugs window and activate the automatic download" -msgstr "Отворяне на OpenStreetBugs прозорец и активирай автоматичното сваляне" +msgstr "" +"Отворяне на OpenStreetBugs прозорец и активирай автоматичното сваляне" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114 @@ -5846,5 +5956,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69 -msgid "Maximum number of segments allowed in each generated way. Default 250." +msgid "" +"Maximum number of segments allowed in each generated way. Default 250." msgstr "Максимален брой сегменти в създаваните линии. По подразбиране 250." @@ -5867,6 +5978,7 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72 msgid "" -"Accuracy of Douglas-Peucker line simplification, measured in degrees." -"
Lower values give more nodes, and more accurate lines. Default 0.0003." +"Accuracy of Douglas-Peucker line simplification, measured in " +"degrees.
Lower values give more nodes, and more accurate lines. Default " +"0.0003." msgstr "" "Точност на алгоритъма на Douglas-Peucker за опростяване на линии, измервана " @@ -6519,6 +6631,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:509 msgid "" -"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." -"org/index.php/User:JLS/speller) or tag checking data files." +"The sources (URL or filename) of spell check (see " +"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking " +"data files." msgstr "" "Източници на правила (URL или име на файл) за правописна проверка (see " @@ -6735,5 +6848,6 @@ #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107 msgid "Duplicate hotkey for button '{0}' - button will be ignored!" -msgstr "Дублирането на бърз клавиш за бутона '{0}' - бутона ще бъде игнориран!" +msgstr "" +"Дублирането на бърз клавиш за бутона '{0}' - бутона ще бъде игнориран!" #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85 @@ -6985,6 +7099,6 @@ msgstr "Добавяне на нов слой" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:40 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:43 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 #, java-format @@ -6992,19 +7106,32 @@ msgstr "Сваляне {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:51 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:55 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 msgid "Contacting WMS Server..." msgstr "Свързване с WMS Сървър..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157 msgid "Create buildings" msgstr "Създаване на сгради" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 msgid "CadastreGrabber: Illegal url." msgstr "CadastreGrabber: Невалидно url." + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +msgid "" +"To avoid cadastre WMS overload,\n" +"building import size is limited to 1 km2 max." +msgstr "" +"За да избегенете претоварване на cadastre WMS,\n" +"размера на импорта на сгради е ограничен до 1 km2 макс." + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +msgid "Please, enable auto-sourcing and check cadastre millesime." +msgstr "Моля, включете авто-източниците и проверете cadastre millesime." #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78 @@ -7026,5 +7153,22 @@ msgstr "Кадастър: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:128 +msgid "Cadastre" +msgstr "Кадастър" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:139 +msgid "Auto sourcing" +msgstr "Авто-определяне източници" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164 +msgid "Invalid projection" +msgstr "Невалидна проекция" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 +#, java-format +msgid "Change the projection to {0} first." +msgstr "Променете първо проекцията до {0}." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:169 msgid "" "To enable the cadastre WMS plugin, change\n" @@ -7033,12 +7177,4 @@ "За да включите кадастровия WMS plugin, променете\n" "проекцията на JOSM до Ламбертова и рестартирайте" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132 -msgid "Cadastre" -msgstr "Кадастър" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 -msgid "Auto sourcing" -msgstr "Авто-определяне източници" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20 @@ -7113,9 +7249,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:43 msgid "" -"More than one WMS layer present.\n" -"Select one of them first, then retry." -msgstr "" -"Повече от един WMS слой са налични.\n" -"Първо изберете някой от тях, след което пробвайте отново." +"More than one WMS layer present\n" +"Select one of them first, then retry" +msgstr "" +"Има повече от един WMS слой. Изберете\n" +"един от тях първо, после опитайте отново." #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:19 @@ -7123,5 +7259,5 @@ msgstr "Зареждане на местоположението от кеша (само ако той е включен)" -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136 #, java-format @@ -7131,13 +7267,13 @@ msgstr[1] "Опростяване на път (премахнати {0} точки)" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61 msgid "Extract SVG ViewBox..." msgstr "Екстракт SVG ViewBox..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65 msgid "Extract best fitting boundary..." msgstr "Екстракт най-добре съвпадаща граница..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:120 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126 msgid "Create boundary" msgstr "Създаване на граница" @@ -7173,15 +7309,15 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 msgid "Save WMS layer to file" msgstr "Запис на WMS слоя във файл" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "Load WMS layer from file" msgstr "Зареждане на WMS слой от файл" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -7189,5 +7325,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 msgid "File Format Error" msgstr "Грешка във формата на файла" @@ -7195,5 +7331,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 msgid "Error loading file" msgstr "Грешка при зареждане на файла" @@ -7222,49 +7358,51 @@ msgstr "Грешка в кеширането на Ламбертовата зона" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 msgid "Replace original background by JOSM background color." msgstr "Замени оригиналния фон с фонов цвят от JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30 msgid "Reverse grey colors (for black backgrounds)." msgstr "Обърни сивите цветове (за черни фонове)." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 msgid "Set background transparent." msgstr "Заване на прозрачен фон." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34 msgid "Draw boundaries of downloaded data." msgstr "Обозначване на границите на зона със свалени данни." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Enable automatic caching." msgstr "Включване автоматично кеширане." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 msgid "Max. cache size (in MB)" msgstr "Макс. размер на кеша (в MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:53 -msgid "" -"A special handler of the french cadastre wms at www.cadastre.gouv." -"fr

Please read the Terms and Conditions of Use here (in french): " -"
http://www.cadastre.gouv.fr/scpc/html/" -"CU_01_ConditionsGenerales_fr.html
before any upload of data created " -"by this plugin." -msgstr "" -"Специален доставчик на френски кадастров wms на www.cadastre.gouv." -"fr

Моля прочетете правилата и условията за ползване оттук (на " -"френски):
http://www.cadastre.gouv.fr/scpc/html/" -"CU_01_ConditionsGenerales_fr.html
преди да качвате каквито и да са " -"данни създадени с това разширение." - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:58 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:55 +msgid "" +"A special handler of the french cadastre wms at " +"www.cadastre.gouv.fr

Please read the Terms and Conditions of Use here " +"(in french):
" +"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " +"
before any upload of data created by this plugin." +msgstr "" +"Специален доставчик на френски кадастров wms на " +"www.cadastre.gouv.fr

Моля прочетете правилата и условията за ползване " +"оттук (на френски):
" +"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " +"
преди да качвате каквито и да са данни създадени с това разширение." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 msgid "French cadastre WMS" msgstr "Френски кадастров WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -7272,10 +7410,10 @@ "източници е включено" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65 msgid "Source" msgstr "Източник" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -7284,28 +7422,43 @@ "Замени оригиналния бял фон с фоновия цвят определен в настройките на JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 -msgid "" -"Invert the original texts from black to white (and all intermediate greys)." -msgstr "" -"Обръщане на оригиналния текст от черно към бяло (и всички нюанси на сивото)." - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +msgid "" +"Invert the original black and white colors (and all intermediate greys). " +"Useful for texts on dark backgrounds." +msgstr "" +"Размени оригиналните цветове черно-бяло (и всички междинни сиви). Полезно за " +"текстове на тъмни фонове." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Allows multiple layers stacking" msgstr "Позволяване на подреждане в няколко слоя" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:99 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" "Задаване прозрачност на WMS слоевете. Дясния е матов, левия - прозрачен." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Рисувай правоъгълник около зареденните от WMS сървър данни." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:113 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 msgid "Image grab multiplier:" msgstr "Множител при улавяне на изображения:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:162 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:125 +msgid "Grab smaller images (higher quality but use more memory)" +msgstr "Взимане по-малки изображения (по-високо качество, но повече памет)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +msgid "Fixed size square (default is 100m)" +msgstr "Фиксирана площ (по подразбиране 100m2)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +msgid "Fixed size (from 25 to 1000 meters)" +msgstr "Фиксирана размер (от 25 до 1000 метра)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -7422,5 +7575,5 @@ msgstr "Не са открити пресичания. Нищо не е променяно." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:254 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:255 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -7569,7 +7722,7 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:203 msgid "" -"Take a photo of your GPS receiver while it displays the time." -"
Display that photo here.
And then, simply capture the time you read " -"on the photo and select a timezone
" +"Take a photo of your GPS receiver while it displays the " +"time.
Display that photo here.
And then, simply capture the time you " +"read on the photo and select a timezone
" msgstr "" "Снимайте вашия GPS приемник, докато той показва времето.
Покажете " @@ -7639,5 +7792,6 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:484 -msgid "I can take a picture of my GPS receiver.
Can this help?" +msgid "" +"I can take a picture of my GPS receiver.
Can this help?" msgstr "" "Мога да фотографирам екрана на моя GPS приемник.
Това може ли да " @@ -7685,5 +7839,5 @@ msgstr "Невалидна часова зона" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #, java-format msgid "" @@ -7694,14 +7848,14 @@ "Очакван формат: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:579 msgid "Invalid offset" msgstr "Невалидно отместване" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:641 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:643 #, java-format msgid "Found {0} matchs of {1} in GPX track {2}" msgstr "Открити {0} съвпадения на {1} в GPX следа {2}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:642 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:644 msgid "GPX Track loaded" msgstr "GPX Следата е заредена" @@ -7709,5 +7863,5 @@ #: ../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/UploadDataGui.java:79 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 msgid "Upload Traces" msgstr "Качване на следи" @@ -7717,58 +7871,72 @@ msgstr "Качване на следи на openstreetmap.org" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 -msgid "Upload GPX track" -msgstr "Качване на GPX следа" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71 +msgid "Upload Trace" +msgstr "Качване на следа" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Public" msgstr "Публична" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 msgid "Selected makes your trace public in openstreetmap.org" msgstr "Избрано така прави вашата следа публичка в openstreetmap.org" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Description" msgstr "Описание" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:123 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 msgid "Tags" msgstr "Маркери" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:182 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:153 +#, java-format +msgid "Selected track: {0}" +msgstr "Избрана следа: {0}" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:176 msgid "Connecting..." msgstr "Свързване..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 -msgid "Uploading GPX track..." -msgstr "Качване на GPX следа..." - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:214 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:199 +msgid "Upload cancelled" +msgstr "Качването е отменено" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:209 +msgid "Error while uploading" +msgstr "Грешка при качване" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "Качване на GPX данни беше успешно" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:227 -msgid "Error while uploading" -msgstr "Грешка при качване" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:235 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +msgid "Upload failed. Server returned the following message: " +msgstr "Качването неуспешно. Сървърът върна следното съобщение: " + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 +#, java-format +msgid "Uploading GPX track: {0}% ({1} of {2})" +msgstr "Качване GPX следа: {0}% ({1} of {2})" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "Не е придоставено описание. Моля напишете някакво." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:252 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "Няма избран GPX слой. Не може да се качи следа." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:241 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "Не е посочено потребителско име." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:244 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "Не е посочена парола." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "Качване на GPX следа" @@ -7991,15 +8159,15 @@ msgstr "Автоматично сваляне" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS слой ({0}), автоматично сваляне в мащаб {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS слой ({0}), сваляне в мащаб {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -8008,17 +8176,17 @@ "разделителната способност." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:232 msgid "Download visible tiles" msgstr "Сваляне на видимите квадранти" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241 msgid "Change resolution" msgstr "Смяна разделителна способност" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:253 msgid "Reload erroneous tiles" msgstr "Презареждане грешни квадранти" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:264 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:271 msgid "Alpha channel" msgstr "Алфа канал" @@ -9479,5 +9647,5 @@ #: trans_presets.java:754 trans_presets.java:769 trans_presets.java:1309 msgid "traffic_signals" -msgstr "сфетофар" +msgstr "светофар" #: trans_presets.java:754 trans_presets.java:769 trans_presets.java:1309 @@ -12913,15 +13081,53 @@ msgstr "до път" +#~ msgid "Please select something from the conflict list." +#~ msgstr "Моля, изберете нещо от списъка с конфликти." + #~ msgid "" -#~ "This is the basic relation editor which allows you to change the " -#~ "relation's tags as well as the members. In addition to this we should " -#~ "have a smart editor that detects the type of relationship and limits your " -#~ "choices in a sensible way." +#~ "This is the basic relation editor which allows you to change the relation's " +#~ "tags as well as the members. In addition to this we should have a smart " +#~ "editor that detects the type of relationship and limits your choices in a " +#~ "sensible way." #~ msgstr "" -#~ "Това е базов редактор за релации, който позволява да променяте маркерите " -#~ "на релацията и нейните членове. В допълнение на това ще е хубаво да имаме " +#~ "Това е базов редактор за релации, който позволява да променяте маркерите на " +#~ "релацията и нейните членове. В допълнение на това ще е хубаво да имаме " #~ "\"умен\" редактор, разбиращ от типа на релациите и ограничаващ избора по " #~ "подходящ начин." +#~ msgid "Upload this trace..." +#~ msgstr "Качи този маршрут" + +#~ msgid "" +#~ "This functionality has been added only recently. Please
use with " +#~ "care and check if it works as expected." +#~ msgstr "" +#~ "Тази функционалност беше добавена наскоро. Моля
използвайте " +#~ "внимателно и проверявайте дали работи както се очаква." + +#~ msgid "Upload track filtered by JOSM" +#~ msgstr "Качване на следа, филтрирана от JOSM" + +#~ msgid "Upload raw file: " +#~ msgstr "Качване необработен файл: " + +#~ msgid "Description:" +#~ msgstr "Описание:" + +#~ msgid "Tags (keywords in GPX):" +#~ msgstr "Маркери (ключови думи в GPX):" + +#~ msgid "GPX-Upload" +#~ msgstr "GPX-Качване" + +#, java-format +#~ msgid "Upload raw file: {0}" +#~ msgstr "Качване необработен файл: {0}" + +#~ msgid "Tags:" +#~ msgstr "Маркери:" + +#~ msgid "Choose the hue for the track color by the velocity at that point." +#~ msgstr "Изберете нюанс на цвета в зависимост на скоростта в точката." + #~ msgid "Highway Exit" #~ msgstr "Магистрален изход" @@ -12947,2 +13153,9 @@ #~ msgid "Ref" #~ msgstr "Ref" + +#, java-format +#~ msgid "The \"{0}\" way must contain at least 2 nodes." +#~ msgstr "Пътят \"{0}\" трябва да съдържа поне два възела." + +#~ msgid "Upload GPX track" +#~ msgstr "Качване на GPX следа" Index: /applications/editors/josm/i18n/po/cs.po =================================================================== --- /applications/editors/josm/i18n/po/cs.po (revision 13832) +++ /applications/editors/josm/i18n/po/cs.po (revision 13833) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-15 22:03+0100\n" -"PO-Revision-Date: 2009-02-14 15:36+0000\n" -"Last-Translator: vrabcak \n" +"POT-Creation-Date: 2009-02-21 16:35+0100\n" +"PO-Revision-Date: 2009-02-20 18:08+0000\n" +"Last-Translator: Martin Petricek \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" @@ -16,8 +16,8 @@ "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-02-15 20:40+0000\n" +"X-Launchpad-Export-Date: 2009-02-22 20:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 #, java-format msgid "" @@ -30,5 +30,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 msgid "" "This action will have no shortcut.\n" @@ -38,5 +38,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -47,5 +47,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Tip: Klávesové zkratky lze změnit v nastavení.)" @@ -56,17 +56,17 @@ #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 msgid "Information" msgstr "Informace" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Do nothing" msgstr "Nedělat nic" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Report Bug" msgstr "Nahlásit chybu" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 msgid "" "An unexpected exception occurred.\n" @@ -80,18 +80,18 @@ "verzi JOSM, prosím editovaný přiložte soubor k nahlášení chyby." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Unexpected Exception" msgstr "Neočekávaná výjimka" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 #, java-format msgid "Please report a ticket at {0}" msgstr "Prosíme oznamte chybu na {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "Popište (detailně) kroky, které vedly k chybě." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:78 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -100,9 +100,9 @@ "Zkuste aktualizovat na nejnovější verzi tohoto pluginu před hlášením chyby." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Be sure to include the following information:" msgstr "Prosíme, připojte následující informace:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75 msgid "(The text has already been copied to your clipboard.)" msgstr "(Text již byl zkopírován do schránky.)" @@ -116,5 +116,5 @@ msgstr "Chyba přehrávání zvuku" -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:94 @@ -122,5 +122,5 @@ msgstr "Kontaktuji OSM server..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:48 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:32 @@ -128,10 +128,10 @@ msgstr "Stahuji OSM data..." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 msgid "NullPointerException, possibly some missing tags." msgstr "NullPointerException, pravděpodobně chybí některé tagy." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83 msgid "Preparing data..." msgstr "Připravuji data..." @@ -161,48 +161,48 @@ msgstr "Stahuji body {0} až {1}..." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:164 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:168 msgid "Unknown version" msgstr "Neznámá verze" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 msgid "Found element in non-way." msgstr "Nalezen element mimo cestu." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 msgid " has zero ref" msgstr " má nulový ref" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 msgid "Found element in non-relation." msgstr "Nalezen tag mimo relaci." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:252 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250 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:294 msgid "Illegal object with id=0" msgstr "Neplatný objekt s id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Chybí povinný atribut \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 #, java-format msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +msgstr "Přeskakuji cestu, protože obsahuje neexistující uzel: {0}\n" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:502 msgid "Prepare OSM data..." msgstr "Připravuji OSM data..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:518 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:516 msgid "Ill-formed node id" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:280 +msgstr "Neplatné id uzlu" + +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:287 msgid "Parse error: invalid document structure for gpx document" msgstr "Chyba parsování: Chybná struktura GPX dokumentu" @@ -212,18 +212,18 @@ msgstr "Kontaktuji server..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 msgid "Provide a brief comment for the changes you are uploading:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118 +msgstr "Napište stručný komentář ke změnám, které nahráváte na server:" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 msgid "Commit comment" msgstr "Poslat komentář" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:164 +msgstr "{0}% ({1}/{2}), zbývá {3} . Nahrávám {4}: {5} (id: {6})" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64 @@ -233,34 +233,32 @@ msgstr "Stala se chyba : {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:192 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190 msgid "Opening changeset..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:226 +msgstr "Otevírám sadu změn..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224 msgid "Server does not support changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:246 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:428 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:609 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:184 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 +msgstr "Server nepodporuje sady změn" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607 msgid "Unknown host" msgstr "Neznámé jméno počítače" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282 msgid "Preparing..." msgstr "Připravuji..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:294 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292 msgid "Uploading..." msgstr "Nahrávám..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375 msgid "Closing changeset..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:652 +msgstr "Zavírám sadu změn..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650 msgid "Transfer aborted due to error (will wait for 5 seconds):" msgstr "Přenos přerušen kvůli chybě (čekám 5 sekund):" @@ -298,17 +296,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95 #: ../core/src/org/openstreetmap/josm/Main.java:348 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:29 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 @@ -321,11 +322,11 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:110 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -340,11 +341,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:186 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 msgid "Creating main GUI" msgstr "Vytvářím hlavní grafické rozhraní ( GUI )" #: ../core/src/org/openstreetmap/josm/Main.java:195 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:271 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:278 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:56 msgid "Help" @@ -357,5 +358,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:345 msgid "Hint: Some changes came from uploading new data to the server." -msgstr "" +msgstr "Nápověda: některé změny vznikly nahráním nových dat na server." #: ../core/src/org/openstreetmap/josm/Main.java:346 @@ -386,21 +387,21 @@ msgstr "Ignoruji poškozený soubor z URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109 msgid "min lat" msgstr "min šíř." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111 msgid "min lon" msgstr "min dél." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:117 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "max lat" msgstr "max šíř." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 msgid "max lon" msgstr "max dél." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:122 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -408,5 +409,5 @@ msgstr "URL z www.openstreetmap.org (adresu můžete vložit do pole níže)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:134 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130 msgid "Bounding Box" msgstr "Ohraničující box" @@ -442,6 +443,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:96 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:894 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:956 msgid "name" msgstr "jméno" @@ -474,5 +475,5 @@ msgstr "Zvětšení" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:107 msgid "" "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -480,5 +481,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:109 msgid "Slippy map" msgstr "Aktuální mapa" @@ -489,7 +490,7 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:605 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:602 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:89 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -509,5 +510,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380 msgid "Remove" msgstr "Odstranit" @@ -636,5 +637,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "any" -msgstr "" +msgstr "cokoliv" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 @@ -642,20 +643,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:109 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:186 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:198 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:108 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:191 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:203 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 msgid "Java OpenStreetMap Editor" msgstr "Java OpenStreetMap Editor" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:111 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:110 msgid "Message of the day not available" msgstr "Zprávu dne není možné zobrazit" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:200 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:205 msgid "Downloading \"Message of the day\"" msgstr "Stahuji zprávu dne" @@ -695,33 +696,33 @@ msgstr "Oddálit" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:234 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:474 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:512 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:383 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:380 msgid "More information about this feature" msgstr "Více informací o tomto přednastavení" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:393 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:390 msgid "Optional Attributes:" msgstr "Volitelné atributy:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:437 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Použít přednastavení \"{0}\" ze skupiny \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:438 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:435 #, java-format msgid "Use preset ''{0}''" msgstr "Použít přednastavení \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 msgid "way" @@ -731,11 +732,11 @@ msgstr[2] "cestami" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:214 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 msgid "node" msgid_plural "nodes" @@ -744,6 +745,6 @@ msgstr[2] "uzly" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:81 @@ -754,30 +755,30 @@ msgstr[2] "relace" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 msgid "closedway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:475 +msgstr "uzavřená cesta" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 #, java-format msgid "Unknown type: {0}" -msgstr "" +msgstr "Neznámý typ: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:549 +#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 +#, java-format +msgid "Could not read tagging preset source: {0}" +msgstr "Nelze načíst zdroj přednastavených tagů: {0}" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 -#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 -#, java-format -msgid "Could not read tagging preset source: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:555 #, java-format msgid "Error parsing {0}: " msgstr "Chyba parsování {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:572 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:569 #, java-format msgid "Elements of type {0} are supported." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +msgstr "Objekty typu {0} nejsou podporovány." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595 #, java-format msgid "Change {0} object" @@ -787,9 +788,17 @@ msgstr[2] "Změnit {0} objektů" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 msgid "Nothing selected!" msgstr "Nic není zvoleno!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 +msgid "Selection unsuitable!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +msgid "Apply Preset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 msgid "Change Properties" msgstr "Změnit vlastnosti" @@ -798,16 +807,16 @@ #, java-format msgid "Preset group ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:134 +msgstr "Skupina přednastavení ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:107 msgid "File" msgstr "Soubor" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:135 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:107 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:86 @@ -819,22 +828,22 @@ msgstr "Upravit" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 msgid "View" msgstr "Zobrazit" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:26 msgid "Tools" msgstr "Nástroje" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:141 msgid "Audio" msgstr "Zvuk" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:142 msgid "Presets" msgstr "Předvolby" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:40 @@ -846,18 +855,18 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:210 msgid "Wireframe View" msgstr "Drátový model" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212 msgid "Toggle Wireframe view" msgstr "Přepnout drátový model" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:28 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 msgid "Contacting the OSM server..." msgstr "Kontaktuji OSM server..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 #, java-format msgid "This will change up to {0} object." @@ -867,11 +876,11 @@ msgstr[2] "Toto změní až {0} objektů." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 msgid "An empty value deletes the key." msgstr "Prázdná hodnota smaže klíč" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66 @@ -881,7 +890,7 @@ msgstr "Klíč" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 @@ -890,10 +899,10 @@ msgstr "Hodnota" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333 msgid "Change values?" msgstr "Změnit hodnoty ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:257 #, java-format msgid "Change properties of up to {0} object" @@ -903,33 +912,33 @@ msgstr[2] "Změnit vlastnosti až {0} objektů." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 msgid "Please select a key" msgstr "Prosím zvolte klíč" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321 msgid "Please select a value" msgstr "Vyberte prosím hodnotu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:445 msgid "Please select the objects you want to change properties for." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +msgstr "Vyberte objekty, u kterých chcete změnit vlastnosti." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 msgid "Properties/Memberships" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +msgstr "Vlastnosti/Členství" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 msgid "Properties for selected objects." msgstr "Vlastnosti pro zvolené objekty" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97 @@ -941,58 +950,58 @@ msgstr "Přepnout: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 msgid "Member Of" msgstr "Člen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Role" msgstr "Role" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:559 msgid "Change relation" msgstr "Změnit relaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560 #, 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:564 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 msgid "Delete from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 +msgstr "Odstranit z relace" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:600 msgid "Add Properties" msgstr "Přidat vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 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:609 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 msgid "Edit Properties" msgstr "Upravit vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609 msgid "Edit the value of the selected key for all objects" msgstr "Změnit hodnotu zvoleného klíče pro všechny objekty" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 msgid "Delete Properties" msgstr "Smazat vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:77 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:293 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 @@ -1001,98 +1010,115 @@ msgstr "Smazat" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 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:763 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "Vlastnosti: {0} / Členství: {1}" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:769 msgid "Properties / Memberships" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205 +msgstr "Vlastnosti / Členství" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178 +msgid "Apply Changes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 msgid "Create new relation" msgstr "Vytvořit novou relaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208 msgid "Edit new relation" msgstr "Upravit novou relaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209 #, java-format msgid "Edit relation #{0}" msgstr "Upravit relaci #{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230 +msgid "Basic" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Occupied By" msgstr "Obsazeno" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311 msgid "Tags (empty value deletes tag)" msgstr "Tagy (prázdná hodnota vymaže tag)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313 msgid "Members" msgstr "Členové" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 +msgid "Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 msgid "Move the currently selected members up" -msgstr "Přidat všechny zvolené objekty mezi členy" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338 +msgstr "Přesunout zvolené prvky nahoru" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358 +msgid "Add Selected" +msgstr "Přidat vybrané" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359 +msgid "Add all currently selected objects as members" +msgstr "Přidat všechny zvolené objekty mezi prvky" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365 +msgid "Remove Selected" +msgstr "Odebrat označené" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366 +msgid "Remove all currently selected objects from relation" +msgstr "Odebere všechny označené objekty z relace" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 +msgid "Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 msgid "Move the currently selected members down" msgstr "Přesunout zvolenou vrstvu o řádek dolů." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356 -msgid "Add Selected" -msgstr "Přidat vybrané" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:357 -msgid "Add all currently selected objects as members" -msgstr "Přidat všechny zvolené objekty mezi členy" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:363 -msgid "Remove Selected" -msgstr "Odebrat označené" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:364 -msgid "Remove all currently selected objects from relation" -msgstr "Odebere všechny označené objekty z relace" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381 msgid "Remove the member in the current table row from this relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:405 +msgstr "Odstranit prvek v aktuálním řádku tabulky z relace" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394 msgid "Download Members" -msgstr "Stáhnout členy" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:406 +msgstr "Stáhnout prvky" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395 msgid "Download all incomplete ways and nodes in relation" msgstr "Stáhnout všechny nekompletní cesty a uzly v relaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:415 -msgid "Basic" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:453 #, java-format msgid "Members: {0}" msgstr "Členové: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:587 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:461 +#, java-format +msgid "Relation Editor: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:585 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 msgid "There were conflicts during import." msgstr "Vznikly konflikty během importu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593 msgid "Error parsing server response." msgstr "Chyba parsování odezvy serveru" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:600 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:594 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:598 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -1106,9 +1132,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:345 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 msgid "Error" msgstr "Chyba" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:599 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597 msgid "Cannot connect to server." msgstr "Nemohu se připojit na server." @@ -1193,5 +1219,7 @@ 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 menu." +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:220 @@ -1209,5 +1237,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 msgid "Delete Layer" -msgstr "" +msgstr "Smazat vrstvu" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 @@ -1229,5 +1257,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 msgid "Toggle visible state of the marker text and icons." -msgstr "" +msgstr "Přepnout viditelnost textu značek a ikon." #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 @@ -1265,8 +1293,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 msgid "Open a selection list window." -msgstr "" +msgstr "Otevřít okno s výběrem." #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:94 @@ -1276,5 +1304,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 msgid "" @@ -1343,16 +1371,24 @@ msgstr "Výběr: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +msgid "Open an editor for the selected relation" +msgstr "Otevřít editor pro zvolenou relaci" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +msgid "Delete the selected relation" +msgstr "Smazat vybrané relace" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 #: trans_presets.java:2904 msgid "Relations" msgstr "Relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 msgid "Open a list of all relations." msgstr "Otevřít seznam všech relací" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 @@ -1360,17 +1396,9 @@ msgstr "Nový" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 msgid "Create a new relation" msgstr "Vytvořit novou relaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open an editor for the selected relation" -msgstr "Otevřít editor pro zvolenou relaci" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -msgid "Delete the selected relation" -msgstr "Smazat vybrané relace" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:130 #, java-format msgid "Relations: {0}" @@ -1398,47 +1426,47 @@ msgstr "Zásobník příkazů: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +msgid "Resolve" +msgstr "Vyřešit" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +msgid "Open a merge dialog of all selected items in the list above." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Conflict" msgstr "Konflikt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 msgid "Merging conflicts." msgstr "Spojení konfliktů" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67 -msgid "Resolve" -msgstr "Vyřešit" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:68 -msgid "Open a merge dialog of all selected items in the list above." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:105 -msgid "Please select something from the conflict list." -msgstr "Zvolte něco ze seznamu konfliktů" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Resolve Conflicts" msgstr "Vyřešit konflikty" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +msgid "Solve Conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 #, java-format msgid "Conflicts: {0}" msgstr "Konflikty: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Conflicts" msgstr "Konflikty" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 msgid "conflict" msgstr "konflikt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 msgid "background" msgstr "pozadí" @@ -1459,9 +1487,10 @@ msgid "{0} consists of {1} marker" msgid_plural "{0} consists of {1} markers" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{0} se skládá z {1} značky" +msgstr[1] "{0} se skládá z {1} značek" +msgstr[2] "{0} se skládá z {1} značek" #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 msgid "Customize Color" @@ -1469,5 +1498,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1477,5 +1506,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1484,5 +1513,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:326 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:152 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -1500,5 +1529,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:265 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 #, java-format msgid "Audio synchronized at point {0}." @@ -1506,5 +1535,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232 msgid "Unable to synchronize in layer being played." msgstr "Není možno synchronizovat v již přehrávané vrstvě" @@ -1525,5 +1554,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:958 msgid "desc" msgstr "popis" @@ -1535,5 +1564,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 msgid "There was an error while trying to display the URL for this marker" -msgstr "" +msgstr "Při pokusu o zobrazení URL pro tuto značku došlo k chybě" #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 @@ -1545,5 +1574,5 @@ msgstr "Chyba při zobrazování URL" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -1551,5 +1580,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -1557,83 +1586,39 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224 msgid "Unable to create new audio marker." msgstr "Není možné vztvořit novou zvukovou značku" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 msgid "Convert to data layer" msgstr "Převést do datové vrstvy" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:725 -msgid "" -"Upload of unprocessed GPS data as map data is considered harmful." -"
If you want to upload traces, look here:" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:645 +msgid "" +"Upload of unprocessed GPS data as map data is considered " +"harmful.
If you want to upload traces, look here:" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:646 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:747 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:448 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:667 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "Converted from: {0}" msgstr "Převedeno z: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612 -msgid "Upload this trace..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:616 -msgid "" -"This functionality has been added only recently. Please
use with " -"care and check if it works as expected." -msgstr "" -"Tato funkce byla přidána nedávno. Prosíme,
používejte opatrně a " -"ujistěte se, že se chová tak, jak očekáváte." - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:102 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:107 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:626 -msgid "Upload track filtered by JOSM" -msgstr "Nahrát trasu filtrovanou JOSM" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:103 -#, java-format -msgid "Upload raw file: {0}" -msgstr "Nahrát soubor {0} se surovými daty" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:108 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:627 -msgid "Upload raw file: " -msgstr "Nahrát soubor surových dat: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640 -msgid "Description:" -msgstr "Popis:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:123 -msgid "Tags:" -msgstr "Značky:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:129 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:648 -msgid "GPX-Upload" -msgstr "Nahrání GPX" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:229 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:217 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113 msgid "gps point" msgstr "gps bod" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 #: trans_presets.java:1795 trans_presets.java:1801 trans_presets.java:1807 #: trans_presets.java:1813 trans_presets.java:1819 trans_presets.java:1825 @@ -1654,5 +1639,5 @@ msgstr[2] "stopy" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 msgid "point" msgid_plural "points" @@ -1661,5 +1646,5 @@ msgstr[2] "body" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 #, java-format msgid "a track with {0} point" @@ -1669,12 +1654,13 @@ msgstr[2] "stopy s {0} body" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} consists of {1} track" msgid_plural "{0} consists of {1} tracks" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +msgstr[0] "{0} se skládá z {1} trasy" +msgstr[1] "{0} se skládá z {1} tras" +msgstr[2] "{0} se skládá z {1} tras" + +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} point" @@ -1684,25 +1670,25 @@ msgstr[2] "{0} bodů" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117 msgid "Customize line drawing" msgstr "Přizpůsobit kreslení linií" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:296 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 msgid "Use global settings." msgstr "Použít globální nastavení." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 msgid "Draw lines between points for this layer." msgstr "Kreslit spojnice mezi body v této vrstvě" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:298 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123 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/RawGpsLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:135 msgid "Select line drawing options" @@ -1711,10 +1697,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 msgid "Markers From Named Points" -msgstr "" +msgstr "Značky z pojmenovaných bodů" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179 #, java-format msgid "Named Trackpoints from {0}" -msgstr "" +msgstr "Pojmenované body z {0}" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:186 @@ -1736,5 +1722,5 @@ msgstr "JPEG obrázky (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290 #, java-format msgid "{0} track, " @@ -1744,5 +1730,5 @@ msgstr[2] "{0} cesty, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 #, java-format msgid "{0} route, " @@ -1752,62 +1738,59 @@ msgstr[2] "{0} trasy, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 #, java-format msgid "{0} waypoint" msgid_plural "{0} waypoints" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 +msgstr[0] "{0} značka" +msgstr[1] "{0} značky" +msgstr[2] "{0} značek" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #, java-format msgid "Name: {0}" msgstr "Jméno: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "Description: {0}" msgstr "Popis: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 msgid "Timespan: " msgstr "Časové rozpětí: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Length: " msgstr "Délka: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:642 -msgid "Tags (keywords in GPX):" -msgstr "Značky (klíčová slova v GPX souboru)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:655 msgid "time" msgstr "čas" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:780 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:679 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:700 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 msgid "Download from OSM along this track" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 +msgstr "Stáhnout data z OSM podél této trasy" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:686 msgid "Download everything within:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769 +msgstr "Stáhnout vše v rozmezí:" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 #, java-format msgid "{0} meters" msgstr "{0} metrů" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:692 msgid "Maximum area per request:" msgstr "Maximální plocha na požadavek:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 #, java-format msgid "{0} sq km" msgstr "{0} čtverečních km" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787 #, java-format msgid "" @@ -1818,24 +1801,26 @@ "pokračovat?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:844 #, java-format msgid "Audio markers from {0}" msgstr "Audio značky z {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "" "Some waypoints with timestamps from before the start of the track were " "omitted." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1053 +msgstr "Některé značky s časem před začátkem trasy byly vynechány." + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " "time were omitted." msgstr "" +"Některé značky, které byly příliš daleko od trasy k rozumnému odhadu času, " +"byly vynechány." #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98 @@ -1929,9 +1914,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:495 msgid "GPS unit timezone (difference to photo)" -msgstr "" +msgstr "časové pásmo GPS jednotky (rozdíl oproti forografii)" #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:503 msgid "Synchronize Time with GPS Unit" -msgstr "" +msgstr "Synchronizace času s GPS přijímačem" #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:519 @@ -1940,19 +1925,19 @@ msgstr "Zadaný čas nemůže být rozparsován" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:140 msgid "outside downloaded area" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 +msgstr "mimo stažený areál" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 #, java-format msgid "{0} consists of:" msgstr "{0} se skládá z:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:353 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:347 #, java-format msgid " ({0} deleted.)" msgstr " ({0} smazáno.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:445 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 msgid "Convert to GPX layer" msgstr "Převédst do GPX vrstvy" @@ -1980,37 +1965,37 @@ msgstr "Nemohu zapsat do záložek." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 msgid "The geographic longitude at the mouse pointer." msgstr "Zeměpisná délka na místě kurzoru myši." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The name of the object at the mouse pointer." msgstr "Jméno objektu na místě kurzoru myši." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 msgid "The geographic latitude at the mouse pointer." msgstr "Zeměpisná šířka na místě kurzoru myši." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The angle between the previous and the current way segment." msgstr "Úhel mezi předchozím a současným úsekem cesty." +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +msgid "The (compass) heading of the line segment being drawn." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 -msgid "The (compass) heading of the line segment being drawn." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "Délka nového nakresleného segmentu trasy." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:160 msgid "(no object)" msgstr "(žádný objekt)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:62 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:56 msgid "Color" msgstr "Barva" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:57 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107 #: trans_presets.java:56 trans_presets.java:92 trans_presets.java:130 @@ -2111,27 +2096,36 @@ msgstr "Název" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:118 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:112 #, java-format msgid "Paint style {0}: {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148 +msgstr "Styl kreslení {0}: {1}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 msgid "Choose" msgstr "Vybrat" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 msgid "Please select a color." msgstr "Zvolte barvu." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 #, java-format msgid "Choose a color for {0}" msgstr "Zvolte barvu pro {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +msgid "Set to default" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:172 +msgid "Set all to default" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:184 msgid "Colors used by different objects in JOSM." msgstr "Barvy použité různými objekty v JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:171 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:198 msgid "Colors" msgstr "Barvy" @@ -2165,23 +2159,23 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45 msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transfered in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:45 +"WARNING: The password is stored in plain text in the preferences " +"file.
The password is transfered in plain text to the server, encoded in " +"the URL.
Do not use a valuable Password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44 msgid "Sort presets menu" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47 +msgstr "Setřídit nabídku s přednastaveními" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46 msgid "Enable built-in defaults" msgstr "Povolit vestavěné výchozí hodnoty" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:58 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69 msgid "Tagging preset source" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:68 +msgstr "Zdroj přednastavených tagů" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:156 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 @@ -2189,5 +2183,5 @@ msgstr "Zvolte řádek k editaci" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500 @@ -2196,26 +2190,26 @@ msgstr "Zvolte řádek k vymazání" +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88 +msgid "" +"The sources (URL or filename) of tagging preset definition files. See " +"http://josm.openstreetmap.de/wiki/TaggingPresets for help." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89 -msgid "" -"The sources (URL or filename) of tagging preset definition files. See http://" -"josm.openstreetmap.de/wiki/TaggingPresets for help." -msgstr "" +msgid "Add a new tagging preset source to the list." +msgstr "Přidat nový zdroj přednastavených tagů na seznam." #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 -msgid "Add a new tagging preset source to the list." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 msgid "Delete the selected source from the list." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:94 +msgstr "Smazat vybraný zdroj ze seznamu." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93 msgid "Tagging Presets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:98 +msgstr "Přednastavení tagů" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97 msgid "Tagging preset sources" -msgstr "" +msgstr "Zdroje přednastavení tagů" #: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21 @@ -2227,6 +2221,6 @@ msgstr "Při ukládání zanechávat záložní soubory končící znakem ~" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:141 @@ -2234,34 +2228,34 @@ msgstr "Pluginy" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 msgid "Configure available plugins." msgstr "Nastavení dostupných pluginů." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43 msgid "Download List" msgstr "Stáhnout seznam" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:80 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51 msgid "Update" msgstr "Aktualizovat" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:60 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 msgid "Configure Sites..." msgstr "Konfigurovat zařízení..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add either site-josm.xml or Wiki Pages." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99 msgid "Please select an entry." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +msgstr "Prosím, vyberte položku." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 msgid "Configure Plugin Sites" msgstr "" @@ -2383,5 +2377,5 @@ "Automatically make a marker layer from any waypoints when opening a GPX " "layer." -msgstr "" +msgstr "Automaticky vytvořit vrstvu se značkami při otevírání GPX vrstvy." #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:91 @@ -2437,9 +2431,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "Display Settings" msgstr "Nastavení zobrazení" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "" "Various settings that influence the visual representation of the whole " @@ -2447,55 +2441,63 @@ msgstr "Různá nastavení ovlivňující vzhled celého programu." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings" msgstr "Nastavení připojení" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings for the OSM server." msgstr "Nastavení připojení pro OSM server." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Map Settings" msgstr "Nastavení mapy" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Settings for the map projection and data interpretation." msgstr "Nastavení projekce mapy a interpretace dat." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Audio Settings" msgstr "Nastavení zvuku" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Settings for the audio player and audio markers." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97 msgid "You have to restart JOSM for some settings to take effect." msgstr "Některá nastavení se projeví až po restartování JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:25 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 msgid "Draw lines between raw gps points." msgstr "Vykreslovat spojnice mezi GPS body" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:27 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 msgid "Force lines if no segments imported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:28 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 msgid "Draw large GPS points." msgstr "Kreslit větší GPS body" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 -msgid "Color tracks by velocity." -msgstr "Obarvit trasy podle rychlostí" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34 +msgid "Velocity (red = slow, green = fast)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 +msgid "Dilution of Position (red = high, green = low, if available)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 +msgid "Single Color (can be customized for named layers)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:1346 msgid "Car" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +msgstr "Auto" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:309 trans_presets.java:635 trans_presets.java:833 #: trans_presets.java:842 trans_presets.java:851 trans_presets.java:864 @@ -2507,5 +2509,5 @@ msgstr "Cyklisté" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:310 trans_presets.java:637 trans_presets.java:832 #: trans_presets.java:841 trans_presets.java:850 trans_presets.java:863 @@ -2516,44 +2518,44 @@ msgstr "Pěší" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 msgid "Draw Direction Arrows" msgstr "Kreslit šipky ve směru jízdy" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 msgid "Fast drawing (looks uglier)" msgstr "Rychlé vykreslování (vypadá ošklivě)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180 msgid "Only interesting direction hints (e.g. with oneway tag)." msgstr "Jen zajímavé směry (např. jednosměrka)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:186 msgid "Only on the head of a way." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 +msgstr "Pouze na prvním úseku cesty." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44 msgid "Draw segment order numbers" msgstr "Vykreslit segmenty s pořadovými čísly" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45 msgid "Draw boundaries of downloaded data" msgstr "Vykreslit ohraničující box stažených dat" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46 msgid "Draw virtual nodes in select mode" msgstr "Vykreslovat virtuální uzly v modu výběru" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47 msgid "Draw inactive layers in other color" msgstr "Vykreslovat neaktivní vrstvy v jiných barvách" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 msgid "Smooth map graphics (antialiasing)" msgstr "Vyhlazené mapy (antialiasing)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 msgid "" "If your gps device draws too few lines, select this to draw lines along your " @@ -2561,5 +2563,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:71 msgid "" "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines." @@ -2568,22 +2570,24 @@ "kreslení všech linií." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73 msgid "Maximum length (meters)" msgstr "Maximální délka (metrů)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:77 msgid "" "Force drawing of lines if the imported data contain no line information." msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:84 +"Vynutit kreslení čar, pokud importovaná data neobsahují informace o čarách." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89 msgid "Draw direction arrows for lines, connecting GPS points." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90 -msgid "Draw the direction arrows using table lookups instead of complex math." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:96 +msgstr "Zobrazovat šipky pro čary spojující GPS body." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95 +msgid "" +"Draw the direction arrows using table lookups instead of complex math." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:101 msgid "" "Don't draw arrows if they are not at least this distance away from the last " @@ -2591,51 +2595,68 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104 msgid "Minimum distance (pixels)" msgstr "Minimální vzdálenost (pixelů)" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:109 -msgid "Choose the hue for the track color by the velocity at that point." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116 -msgid "Allows to tune the track coloring for different average speeds." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122 msgid "Draw larger dots for the GPS points." msgstr "Zobrazovat větší tečky pro GPS body." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136 +msgid "" +"All points and track segments will have the same color. Can be customized in " +"Layer Manager." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137 +msgid "Colors points and track segments by velocity." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:138 +msgid "" +"Colors points and track segments by dilution of position (HDOP). Your " +"capture device needs to logs that information." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143 +msgid "Allows to tune the track coloring for different average speeds." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148 +msgid "Track and Point Coloring" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 msgid "GPS Points" msgstr "GPS body" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175 msgid "Draw direction hints for way segments." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:163 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192 msgid "Draw the order numbers of all segments within their way." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:168 -msgid "Apply antialiasing to the map view resulting in a smoother appearance." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:197 +msgid "" +"Apply antialiasing to the map view resulting in a smoother appearance." msgstr "Aplikovat vyhlazování (antialiasing) v mapě pro jemnější zobrazení." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202 msgid "Draw the boundaries of data loaded from the server." msgstr "Zobrazovat hranice dat stažených ze serveru." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:178 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:207 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212 msgid "Draw the inactive data layers in a different color." msgstr "Zobrazovat neaktivní vrstvy dat jinou barvou." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219 msgid "OSM Data" -msgstr "" +msgstr "OSM data" #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:130 @@ -2646,5 +2667,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:300 msgid "Toolbar" -msgstr "" +msgstr "Panel nástrojů" #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:304 @@ -2654,9 +2675,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:343 msgid "Toolbar customization" -msgstr "" +msgstr "Upravení panelu nástrojů" #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344 msgid "Customize the elements on the toolbar." -msgstr "" +msgstr "Upravit prvky v panelu nástrojů." #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44 @@ -2741,6 +2762,6 @@ "a menu entry of button for the first time. So some of your changes may " "become active even without restart --- but also without collistion handling. " -"This is another reason to restart JOSM after making any changes here." -"

" +"This is another reason to restart JOSM after making any changes " +"here.

" msgstr "" @@ -2753,8 +2774,9 @@ "key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also " "there will be 'keys' listed that correspond to a shortcut on your keyboard " -"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/" -"Semicolon on US keyboards, '.'/Period on German keyboards, ...) instead. Not " -"doing so may result in conflicts, as there is no way for JOSM to know that " -"Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...

" +"(e.g. ':'/Colon). Please also do not use them, use the base key " +"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) " +"instead. Not doing so may result in conflicts, as there is no way for JOSM " +"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US " +"keyboard...

" msgstr "" @@ -2778,6 +2800,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183 msgid "" -"

The pseudo-modifier 'disabled' will disable the shortcut when encountered." -"

" +"

The pseudo-modifier 'disabled' will disable the shortcut when " +"encountered.

" msgstr "" @@ -2847,67 +2869,67 @@ msgstr "Skupiny modifikátorů" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:231 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:236 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:250 msgid "layer not in list." msgstr "vrstva není v seznamu" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "usage" msgstr "použití" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 msgid "options" msgstr "Možnosti" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 msgid "Show this help" msgstr "Zobrazí tuto nápovědu" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Standard unix geometry argument" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 msgid "Download the bounding box" msgstr "Stáhnout ohraničující box" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +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:141 -msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" +msgid "Download the bounding box as raw gps" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 -msgid "Open file (as raw gps, if .gpx)" +msgid "Select with the given search" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 -msgid "Download the bounding box as raw gps" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 -msgid "Select with the given search" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 msgid "Don't launch in fullscreen mode" msgstr "Nespouštět v celoobrazovkovém režimu" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 msgid "Reset the preferences to default" msgstr "Nastavit výchozí hodnoty" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 msgid "Set the language." msgstr "Nastavit jazyk." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 msgid "examples" msgstr "příklady" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -2915,21 +2937,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 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:161 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 msgid "Activating updated plugins" msgstr "Aktivuji aktualizované pluginy" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 msgid "Loading early plugins" msgstr "Načítám dřívější pluginy" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Setting defaults" msgstr "Nastavuji výchozí hodnoty" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171 msgid "Loading plugins" msgstr "Načítám pluginy" @@ -2964,6 +2986,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:108 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:164 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:162 #: trans_presets.java:308 trans_presets.java:309 trans_presets.java:310 #: trans_presets.java:311 trans_presets.java:312 trans_presets.java:313 @@ -2980,5 +3002,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:66 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 #, java-format msgid "" @@ -2989,25 +3011,25 @@ "potřebný." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 #, java-format msgid "Plugin requires JOSM update: {0}." msgstr "Následující plugin vyžaduje aktulizaci JOSM: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +msgstr "Plugin {0} je požadován pluginem {1}, ale nebyl nalezen." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 #, java-format msgid "Plugin not found: {0}." msgstr "Následující plugin nenalezen:{0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Pluginy byly naposledy aktualizovány před {0} dny." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 msgid "" "(You can change the number of days after which this warning appears
by " @@ -3015,17 +3037,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 msgid "Disable plugin" msgstr "Zakázat plugin" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Nemohu nahrát plugin {0}. Odstranit z nastavení?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -3035,5 +3057,5 @@ "jejich přepsání." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 #, java-format msgid "" @@ -3042,10 +3064,10 @@ "Nastala neočekávaná výjimka, která by mohla pocházet z pluginu ''{0}''." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Dle informací z pluginu je autor {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:262 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -3053,9 +3075,9 @@ "Zkuste aktualizovat na nejnovější verzi tohoto pluginu, než ohlásíte chybu." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 msgid "Should the plugin be disabled?" msgstr "Chcete plugin zakázat ?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:278 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -3065,5 +3087,5 @@ "programu." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -3073,6 +3095,6 @@ "JOSM." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:322 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:181 msgid "no description available" msgstr "není zádný popis" @@ -3084,5 +3106,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 msgid "Update Plugins" msgstr "Aktualizuj pluginy" @@ -3119,5 +3141,5 @@ "Plugin {0} se zdá být poškozen nebo jej není možné automaticky stáhnout." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 #, java-format msgid "Downloaded plugin information from {0} site" @@ -3126,13 +3148,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 msgid "No plugin information found." msgstr "Nenalezeny informace o pluginu" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:76 msgid "All installed plugins are up to date." msgstr "Všechny nainstalované pluginy jsou aktuální." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 #, java-format msgid "" @@ -3145,9 +3167,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:105 msgid "Download missing plugins" msgstr "Stáhnout chybějící pluginy" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:106 #, java-format msgid "" @@ -3160,22 +3182,22 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 msgid "Download Plugins" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:170 +msgstr "Stáhnout pluginy" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:168 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Verze {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:176 msgid "Plugin bundled with JOSM" msgstr "Plugin zahrnut v JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208 msgid "Plugin already exists" msgstr "Plugin již existuje" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:211 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:209 #, java-format msgid "" @@ -3186,15 +3208,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 msgid "Delete and Download" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224 +msgstr "Smazat a stáhnout" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:222 #, java-format msgid "Error deleting plugin file: {0}" msgstr "Chyba při mazání souboru pluginu: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:281 #, java-format msgid "Error reading plugin information file: {0}" @@ -3203,5 +3225,5 @@ #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 msgid "RemoveRelationMember" -msgstr "Odstranit Relační člen" +msgstr "Odstranit prvek relace" #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 @@ -3262,10 +3284,10 @@ msgstr "Smazat {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:165 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 msgid "Conflicting relation" msgstr "Konfliktní relace" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 #, java-format msgid "" @@ -3276,5 +3298,5 @@ "Smazat z relace?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:166 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 #, java-format msgid "" @@ -3291,11 +3313,11 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:349 msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" +"You are about to delete nodes outside of the area you have " +"downloaded.
This can cause problems because other objects (that you don't " +"see) might use them.
Do you really want to delete?" msgstr "" "Chystáte se smazat uzly mimo oblast, jež jste stáhli.
To může způsobit " -"problémy, protože jiné objekty (které nevidíte) je mohou používat." -"
Opravdu je chcete smazat?" +"problémy, protože jiné objekty (které nevidíte) je mohou " +"používat.
Opravdu je chcete smazat?" #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 @@ -3397,5 +3419,5 @@ #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96 msgid "Lambert Zone (Estonia)" -msgstr "" +msgstr "Lambertova zóna (Estonsko)" #: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36 @@ -3417,124 +3439,135 @@ msgstr "Nemohu nahrát předvolby ze serveru." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:232 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:426 +msgstr "Cesta se stylem plochy není uzavřená." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:428 #, 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:527 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:765 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:776 msgid "Empty member in relation." -msgstr "Prázdný člen v relaci." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:767 +msgstr "Prázdný prvek v relaci." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:531 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 #, java-format msgid "Deleted member ''{0}'' in relation." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:547 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 +msgstr "Odstraněn prvek ''{0}'' z relace." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 #, 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:552 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:549 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:558 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555 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:564 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:561 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 +msgid "More than one \"via\" found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 #, java-format msgid "Unknown role ''{0}''." msgstr "Neznámá role ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 #, java-format msgid "Unknown member type for ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584 +msgstr "Neznámý typ prvku pro ''{0}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 msgid "No \"from\" way found." msgstr "Nenazezena příchozí cesta \"from\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 msgid "No \"to\" way found." msgstr "Nenalezena odchozí cesta \"to\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -msgid "No \"via\" node found." -msgstr "Nenalezen \"via\" uzel." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +msgid "No \"via\" node or way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 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:619 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:636 -#, java-format -msgid "The \"{0}\" way must contain at least 2 nodes." -msgstr "Cesta \"{0}\" musí obsahovat alespoň dva uzly." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:731 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +msgid "The \"to\" way doesn't start or end at a \"via\" node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:620 +msgid "The \"from\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:624 +msgid "The \"to\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:742 #, 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:787 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Ne-cesta ''{0}'' v multipolygonu." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:847 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:858 #, 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:927 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 #, 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:938 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:949 #, 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:987 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:998 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1012 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1023 #, 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:1195 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1206 msgid "untagged" msgstr "nepopsaný" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1196 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207 msgid "text" msgstr "text" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" msgstr "neaktivní" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:94 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:181 @@ -3542,13 +3575,13 @@ msgstr "vybráno" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" msgstr "nepopsaná cesta" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 msgid "incomplete way" msgstr "nekompletní cesta" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 msgid "highlight" msgstr "" @@ -3570,5 +3603,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:113 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:89 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:77 msgid "incomplete" @@ -3595,18 +3628,18 @@ msgid "{0} member" msgid_plural "{0} members" -msgstr[0] "{0} člen" -msgstr[1] "{0} členů" -msgstr[2] "{0} členů" - -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +msgstr[0] "{0} prvek" +msgstr[1] "{0} prvky" +msgstr[2] "{0} prvků" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 msgid "Duplicate" msgstr "Duplikovat" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 msgid "Duplicate selection by copy and immediate paste." msgstr "Duplikovat výběr kopírováním a vložením." -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 @@ -3615,5 +3648,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -3647,5 +3680,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 msgid "Zoom Out" -msgstr "" +msgstr "Oddálit" #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 @@ -3684,7 +3717,9 @@ msgstr "Zobraz informace o historii cest a bodů v OSM" -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:57 -msgid "Please select at least one node, way or relation." -msgstr "Vyberte alespoň jeden uzel, cestu, nebo relaci." +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:60 +msgid "" +"Please select at least one node, way or relation. Only already uploaded " +"elements have a history." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 @@ -3706,7 +3741,7 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/TerracerAction.java:47 @@ -3733,9 +3768,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:124 msgid "Distribute Nodes" -msgstr "" +msgstr "Rozdělit uzly" #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 msgid "Distribute the selected nodes to equal distances along a line." -msgstr "" +msgstr "Rozdělit zvolené uzly ve stejné vzdálenosti podél přímky." #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68 @@ -3842,5 +3877,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:123 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:314 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:315 msgid "Enter values for all conflicts." msgstr "Zadej hodnoty pro všechny konflikty" @@ -3848,7 +3883,7 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 msgid "Solve Conflicts" -msgstr "" +msgstr "Vyřešit konflikty" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231 @@ -3882,13 +3917,13 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 msgid "OSM Server Files" -msgstr "" +msgstr "Soubory z OSM serveru" #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 msgid "GPX Files" -msgstr "" +msgstr "GPX soubory" #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28 msgid "NMEA-0183 Files" -msgstr "" +msgstr "NMEA-0183 soubory" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 @@ -3980,5 +4015,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #, java-format @@ -4002,19 +4037,23 @@ msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." +msgstr[0] "Zvolený uzel není uprostřed žádné cesty." +msgstr[1] "Zvolené uzly nejsou uprostřed žádné cesty." +msgstr[2] "Zvolené uzly nejsou uprostřed žádné cesty." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 +msgid "" +"There is more than one way using the node you selected. Please select the " +"way also." +msgid_plural "" +"There is more than one way using the nodes you selected. Please select the " +"way also." msgstr[0] "" msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125 -msgid "" -"There is more than one way using the node(s) you selected. Please select the " -"way also." -msgstr "" -"Existuje více cest využívajících tento uzel(y). Vyberte také jednu cestu." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137 msgid "The selected nodes do not share the same way." msgstr "Zvolené uzly nesdílejí stejnou cestu." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -4023,10 +4062,10 @@ msgstr[2] "Označené cesty neobsahují vybrané uzly." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229 msgid "You must select two or more nodes to split a circular way." msgstr "Musíte zvolit dva nebo více uzlů pro rozdělění kruhové cesty." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -4036,5 +4075,5 @@ "cesty.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 msgid "" "A role based relation membership was copied to all new ways.\n" @@ -4042,5 +4081,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:296 #, java-format msgid "Split way {0} into {1} parts" @@ -4076,9 +4115,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81 msgid "Nothing selected to zoom to." -msgstr "Není zvoleno nic co by se mohlo přiblížit" +msgstr "Není zvoleno nic co by se dalo přiblížit" #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81 msgid "No conflicts to zoom to" -msgstr "Není žádný konflikt co by se mohl přiblížit" +msgstr "Není žádný konflikt, na který by se mohlo přiblížit" #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 @@ -4134,5 +4173,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Upload Changes" -msgstr "" +msgstr "Nahrát změny na server" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 @@ -4316,5 +4355,6 @@ msgid "" "type: - type of the object (node, way, relation)" -msgstr "type: - typ objektu (node, way, relation)" +msgstr "" +"type: - typ objektu (node, way, relation)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 @@ -4344,5 +4384,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 msgid "untagged - all untagged objects" -msgstr "" +msgstr "untagged - všechny objekty bez tagů" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 @@ -4361,5 +4401,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 msgid "Start Search" -msgstr "" +msgstr "Začít hledání" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:170 @@ -4433,5 +4473,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 msgid "Align Nodes in Circle" msgstr "Seřadit uzly do kruhu" @@ -4445,5 +4485,5 @@ msgstr "Některé z uzlů jsou (skoro) v přímce" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 msgid "Please select at least four nodes." msgstr "Vyberte minimálně 4 uzly" @@ -4465,9 +4505,9 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "The document contains no data." -msgstr "" +msgstr "Dokument neobsahuje žádná data." #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "Save anyway" -msgstr "" +msgstr "Přesto uložit" #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90 @@ -4479,5 +4519,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "Reject Conflicts and Save" -msgstr "" +msgstr "Zamítnout konflikty a uložit" #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 @@ -4508,4 +4548,32 @@ msgstr "Během obnovení zálohy došlo k chybě." +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "" +"Show status report with useful information that can be attached to bugs" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92 +msgid "Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +msgid "Copy to clipboard and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 +msgid "Close" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 @@ -4517,13 +4585,13 @@ msgstr "Vrátit zpět poslední vrácenou akci" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:44 msgid "Delete Mode" msgstr "Režim mazání" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:46 msgid "Delete nodes or ways." msgstr "Smaž body nebo cesty" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:84 @@ -4532,7 +4600,7 @@ #, java-format msgid "Mode: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +msgstr "Režim: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:130 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -4544,6 +4612,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:87 msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." +"Drag play head and release near track to play audio from there; " +"SHIFT+release to synchronize audio at that point." msgstr "" @@ -4557,23 +4625,23 @@ msgstr "Vytvořit plochy" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 msgid "Extrude Way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:252 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:416 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:430 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Pusť myší tlačítko k vybrání obejktů v obdélníku" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 msgid "Draw a rectangle of the desired size, then release the mouse button." msgstr "Nakresli obdélník požadované velikosti a pak pusť myší tlačítko." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:420 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:434 msgid "Release the mouse button to stop rotating." msgstr "Pusť myší tlačítko k zastavení otaáčení" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 msgid "Drag a way segment to make a rectangle." msgstr "" @@ -4641,19 +4709,19 @@ msgstr "Zvol, posuň a otáčej objekty" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:191 msgid "Add and move a virtual new node to way" msgstr "Přidat a posunout nový virtuální uzel do cesty" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:220 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:223 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 msgid "Cannot move objects outside of the world." msgstr "Nemohu přesouvat objekty mimo svět." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:418 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:432 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:422 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:436 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to remove); Shift-" @@ -4703,5 +4771,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:148 msgid "Merge nodes with different memberships?" -msgstr "Spojit uzly s různými relačními členy ?" +msgstr "Spojit uzly s různými členství v relaci?" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:149 @@ -4709,13 +4777,15 @@ "The selected nodes have differing relation memberships. Do you still want " "to merge them?" -msgstr "Zvolené uzly mají rozdílné relační členy. Stále je chcete spojit ?" +msgstr "" +"Zvolené uzly mají rozdílné členství v relaci. Chcete je přesto spojit ?" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 msgid "Merge Anyway" -msgstr "" +msgstr "Přesto sloučit" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239 msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "Nemohu spojit uzly: Smazala by se tak cesta, která je stále používána." +msgstr "" +"Nemohu spojit uzly: Smazala by se tak cesta, která je stále používána." #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:277 @@ -4724,30 +4794,30 @@ msgstr "Spojit {0} uzly" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Orthogonalize Shape" msgstr "Ortogonalizovat tvar" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 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:60 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 msgid "Only two nodes allowed" msgstr "Povoleny pouze dva uzly" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 msgid "Selection must consist only of ways." msgstr "Výběr se musí skládat pouze z cest" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 msgid "Please select one or more closed ways of at least four nodes." msgstr "Vyberte jednu nebo více uzavřených cest s alespoň čtyřmi uzly." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 msgid "Please select ways with almost right angles to orthogonalize." msgstr "Vyberte cesty s téměř pravými úhly pro ortogonalizaci." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -4756,9 +4826,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "Only one node selected" msgstr "Vybrán pouze jeden uzel" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 msgid "Orthogonalize" msgstr "Ortogonalizovat" @@ -4772,10 +4842,10 @@ #, java-format msgid "Toggles the global setting ''{0}''." -msgstr "" +msgstr "Zapnout/Vypnout globální nastavení ''{0}''." #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 msgid "Zoom In" -msgstr "" +msgstr "Přiblížit" #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 @@ -4809,5 +4879,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101 -msgid "Please select exactly three nodes or one way with exactly three nodes." +msgid "" +"Please select exactly three nodes or one way with exactly three nodes." msgstr "Prosím vyberte přesně tři body, nebo jednu o třech bodech." @@ -4816,52 +4887,69 @@ msgstr "Tyto uzly nejsou v kruhu" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../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:71 +msgid "Update Data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:72 +#, java-format +msgid "" +"This action will require {0} individual download requests. Do you wish to " +"continue?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 msgid "Open Location..." msgstr "Otevřít z umístění..." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 msgid "Open an URL." msgstr "Otevřít soubor." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 msgid "Separate Layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 msgid "Enter URL to download:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:63 +msgstr "Zadejte URL ke stažení:" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 msgid "Download Location" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 msgid "Download URL" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:73 +msgstr "URL ke stažení" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 msgid "Add Node..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 +msgstr "Přidat uzel..." + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 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:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 msgid "Enter the coordinates for the new node." msgstr "Zadejte souřadnice nového uzlu." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 msgid "Use decimal degrees." msgstr "Použijte desetinné stupně." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 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:62 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 #: ../plugins/livegps/livegps/LiveGpsDialog.java:54 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93 @@ -4870,5 +4958,5 @@ msgstr "Zeměpisná šířka" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 #: ../plugins/livegps/livegps/LiveGpsDialog.java:56 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96 @@ -4911,14 +4999,14 @@ msgstr "Přesunutí objektů {0}" +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "Overwrite" msgstr "Přepsat" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "File exists. Overwrite?" msgstr "Soubor již existuje. Chcete jej přepsat ?" @@ -4937,43 +5025,48 @@ msgstr "Prosím zvol něco ke kopírování" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Rozpojit cesty" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "Zduplikovat uzly používané více cestami." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 msgid "This node is not glued to anything else." msgstr "Tento uzel není přilepen k ničemu jinému." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 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:90 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 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:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 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:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "Select either:" msgstr "Vyberte buď:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +msgid "* One tagged node, or" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 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:103 -msgid "* One node that is used by more than one way and one of those ways, or" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +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:104 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -4982,5 +5075,5 @@ "nebo" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -4989,5 +5082,5 @@ "cestě." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -5000,10 +5093,14 @@ "své vlastní kopie a všechny uzly budou vybrány." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:160 +msgid "Unglued Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:373 #, java-format msgid "Dupe into {0} nodes" msgstr "Duplikovat do {0} uzlů" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:320 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:397 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -5069,5 +5166,5 @@ #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 msgid "Play/Pause" -msgstr "" +msgstr "Přehrát/Pauza" #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 @@ -5104,7 +5201,7 @@ msgstr "Vrátit poslední akci." -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 msgid "No Shortcut" -msgstr "" +msgstr "Beze zkratky" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:39 @@ -5124,13 +5221,13 @@ msgstr "OpenStreetMap data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:29 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:28 msgid "Downloading GPS data" msgstr "Stahuji GPS data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:41 msgid "Downloaded GPX Data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:71 +msgstr "Stažená GPX data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:69 msgid "Raw GPS data" msgstr "Surová GPS data" @@ -5197,5 +5294,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119 msgid "Roles in relations referring to" -msgstr "" +msgstr "Role v relaci odkazující na" #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135 @@ -5310,5 +5407,5 @@ #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:341 msgid "No GPX data layer found." -msgstr "" +msgstr "Nenalezena vrstva s GPX daty." #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:53 @@ -5316,5 +5413,5 @@ #, java-format msgid "Error parsing {0}: {1}" -msgstr "" +msgstr "Chyba při čtení {0}: {1}" #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80 @@ -5351,5 +5448,6 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169 -msgid "Header contains several values and cannot be mapped to a single string" +msgid "" +"Header contains several values and cannot be mapped to a single string" msgstr "" @@ -5438,5 +5536,5 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:112 msgid "Remote Control has been asked to load data from the API." -msgstr "" +msgstr "Dálkové ovládání bylo požádáno o nahrání dat z API." #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:113 @@ -5453,25 +5551,25 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:212 msgid "Confirm Remote Control action" -msgstr "" +msgstr "Potvrdit akci dálkového ovládání" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:209 msgid "Remote Control has been asked to import data from the following URL:" -msgstr "" +msgstr "Dálkové ovládání bylo požádáno o import dat z následujícího URL:" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 msgid "load data from API" -msgstr "" +msgstr "nahrání dat z API" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 msgid "change the selection" -msgstr "" +msgstr "změna výběru" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "change the viewport" -msgstr "" +msgstr "změna pohledu" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "confirm all Remote Control actions manually" -msgstr "" +msgstr "potvrzovat ručně všechny akce Dálkového ovládání" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 @@ -5504,21 +5602,21 @@ #: ../plugins/terracer/src/terracer/TerracerAction.java:47 msgid "Terrace a building" -msgstr "" +msgstr "Řada budov" #: ../plugins/terracer/src/terracer/TerracerAction.java:45 msgid "Creates individual buildings from a long building." -msgstr "" +msgstr "Vytvoří jednotlivé budovy z dlouhého bloku budov." #: ../plugins/terracer/src/terracer/TerracerAction.java:72 msgid "How many buildings are in the terrace?" -msgstr "" +msgstr "Kolik domů je v řadě?" #: ../plugins/terracer/src/terracer/TerracerAction.java:91 msgid "Select a single, closed way of four nodes." -msgstr "" +msgstr "Vyberte jednu uzavřenou cestu se čtyřmi uzly." #: ../plugins/terracer/src/terracer/TerracerAction.java:155 msgid "Terrace" -msgstr "" +msgstr "Řada domů" #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:39 @@ -5589,5 +5687,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 msgid "Downloading image tile..." -msgstr "" +msgstr "Stahuji dlaždici..." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 @@ -5663,17 +5761,17 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48 msgid "Resolution of Landsat tiles (pixels per degree)" -msgstr "" +msgstr "Rozlišení dlaždic Landsat (pixelů na stupeň)" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50 msgid "Size of Landsat tiles (pixels)" -msgstr "" +msgstr "Velikost dlaždic Landsat (pixelů)" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52 msgid "Shift all traces to east (degrees)" -msgstr "" +msgstr "Posunout všechny trasy na východ (stupňů)" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54 msgid "Shift all traces to north (degrees)" -msgstr "" +msgstr "Posunout všechny trasy na sever (stupňů)" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56 @@ -5683,5 +5781,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58 msgid "Tag ways as" -msgstr "" +msgstr "Tagovat cesty jako" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60 @@ -5702,6 +5800,8 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69 -msgid "Maximum number of segments allowed in each generated way. Default 250." -msgstr "Maximální počet úseků v každé vygenerované cestě. Výchozí hodnota 250." +msgid "" +"Maximum number of segments allowed in each generated way. Default 250." +msgstr "" +"Maximální počet úseků v každé vygenerované cestě. Výchozí hodnota 250." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70 @@ -5719,6 +5819,7 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72 msgid "" -"Accuracy of Douglas-Peucker line simplification, measured in degrees." -"
Lower values give more nodes, and more accurate lines. Default 0.0003." +"Accuracy of Douglas-Peucker line simplification, measured in " +"degrees.
Lower values give more nodes, and more accurate lines. Default " +"0.0003." msgstr "" @@ -5727,16 +5828,19 @@ "Resolution of Landsat tiles, measured in pixels per degree. Default 4000." msgstr "" +"Rozlišení dlaždic Landsatu, měřeno v pixelech na stupeň. Výchozí hodnota " +"4000." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74 msgid "Size of one landsat tile, measured in pixels. Default 2000." msgstr "" +"Velikost jedné dlaždice z Landsatu, v pixelech. Výchozí hodnota 2000." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75 msgid "Offset all points in East direction (degrees). Default 0." -msgstr "" +msgstr "Posun všech bodů východním směrem (stupňů). Výchozí hodnota 0." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76 msgid "Offset all points in North direction (degrees). Default 0." -msgstr "" +msgstr "Posun všech bodů severním směrem (stupňů). Výchozí hodnota 0." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77 @@ -5869,13 +5973,13 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 msgid "Validation errors" -msgstr "" +msgstr "Chyby kontroly" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 msgid "Open the validation window." -msgstr "" +msgstr "Otevřít okno s výsledkem kontroly." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 msgid "Zoom to problem" -msgstr "" +msgstr "Přiblížit na problém" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 @@ -5921,5 +6025,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:194 msgid "Ignoring elements" -msgstr "" +msgstr "Ignoruji elementy" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 @@ -5948,5 +6052,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:13 msgid "validation error" -msgstr "chyba validace" +msgstr "chyba kontroly" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:15 @@ -5956,5 +6060,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:15 msgid "validation warning" -msgstr "varování validace" +msgstr "varování kontroly" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:17 @@ -5964,13 +6068,13 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:17 msgid "validation other" -msgstr "ostatní validace" +msgstr "ostatní kontroly" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:68 msgid "Use ignore list." -msgstr "" +msgstr "Používat seznam výjimek." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:69 msgid "Use the ignore list to suppress warnings." -msgstr "" +msgstr "Používat seznam výjimek pro potlačení varování." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72 @@ -5994,5 +6098,6 @@ "An OSM data validator that checks for common errors made by users and editor " "programs." -msgstr "Kontrolor OSM dat, hledající běžné chyby udělané uživateli a programy." +msgstr "" +"Kontrolor OSM dat, hledající běžné chyby udělané uživateli a programy." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:91 @@ -6002,5 +6107,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:89 msgid "No validation errors" -msgstr "" +msgstr "Žádné chyby při kontrole" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:56 @@ -6241,5 +6346,6 @@ msgid "" "This test checks for ways with similar names that may have been misspelled." -msgstr "Tento test kontroluje cesty na podobnost jmen, kdy může jít o překlep." +msgstr "" +"Tento test kontroluje cesty na podobnost jmen, kdy může jít o překlep." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21 @@ -6260,5 +6366,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 msgid "This test checks for untagged nodes that are not part of any way." -msgstr "Tento test hledá neotagované uzly, které nejsou součástí žádné cesty." +msgstr "" +"Tento test hledá neotagované uzly, které nejsou součástí žádné cesty." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:140 @@ -6359,6 +6466,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:509 msgid "" -"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." -"org/index.php/User:JLS/speller) or tag checking data files." +"The sources (URL or filename) of spell check (see " +"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking " +"data files." msgstr "" @@ -6417,13 +6525,13 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 msgid "Fix properties" -msgstr "" +msgstr "Opravit vlastnosti" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765 msgid "Could not find element type" -msgstr "" +msgstr "Nelze najít typ elementu" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:782 msgid "Could not find warning level" -msgstr "" +msgstr "Nelze najít úroveň varování" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:791 @@ -6444,5 +6552,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 msgid "This test checks that there are no nodes at the very same location." -msgstr "Tento test kontroluje, jestli dva body nejsou na přesně stejné pozici." +msgstr "" +"Tento test kontroluje, jestli dva body nejsou na přesně stejné pozici." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:108 @@ -6452,5 +6561,5 @@ #: ../plugins/livegps/livegps/LiveGpsLayer.java:25 msgid "LiveGPS layer" -msgstr "" +msgstr "LiveGPS vrstva" #: ../plugins/livegps/livegps/LiveGpsPlugin.java:41 @@ -6483,5 +6592,5 @@ #: ../plugins/livegps/livegps/LiveGpsPlugin.java:82 msgid "LiveGPS" -msgstr "" +msgstr "LiveGPS" #: ../plugins/livegps/livegps/LiveGpsAcquirer.java:128 @@ -6506,9 +6615,9 @@ #: ../plugins/livegps/livegps/LiveGpsDialog.java:46 msgid "Live GPS" -msgstr "" +msgstr "Live GPS" #: ../plugins/livegps/livegps/LiveGpsDialog.java:45 msgid "Show GPS data." -msgstr "" +msgstr "Zobrazovat GPS data." #: ../plugins/livegps/livegps/LiveGpsDialog.java:50 @@ -6526,5 +6635,5 @@ #: ../plugins/livegps/livegps/LiveGpsDialog.java:60 msgid "Course" -msgstr "" +msgstr "Kurz" #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46 @@ -6590,74 +6699,74 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:67 msgid "Load Tile" -msgstr "" +msgstr "Nahrát dlaždici" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80 msgid "Show Tile Status" -msgstr "" +msgstr "Zobrazit stav dlaždice" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:93 msgid "Request Update" -msgstr "" +msgstr "Vyžádat aktualizaci" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:106 msgid "Load All Tiles" -msgstr "" +msgstr "Nahrát všechny dlaždice" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:117 msgid "Increase zoom" -msgstr "" +msgstr "Zvětšit přiblížení" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 msgid "Decrease zoom" -msgstr "" +msgstr "Zmenšit přiblížení" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:395 msgid "image not loaded" -msgstr "" +msgstr "obrázek nebyl nahrán" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:76 msgid "error loading metadata" -msgstr "" +msgstr "chyba při nahrávání metadat" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:90 #, java-format msgid "requested: {0}" -msgstr "" +msgstr "požadováno: {0}" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:94 msgid "error requesting update" -msgstr "" +msgstr "chyba při poždavku na aktualizaci" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:28 msgid "autozoom" -msgstr "" +msgstr "automatické přiblížení" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29 msgid "autoload tiles" -msgstr "" +msgstr "automaticky stahovat dlaždice" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35 msgid "SlippyMap" -msgstr "" +msgstr "SlippyMap" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35 msgid "Settings for the SlippyMap plugin." -msgstr "" +msgstr "Nastavení pro plugin SlippyMap." #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43 msgid "Tile Sources" -msgstr "" +msgstr "Zdroj dlaždic" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48 msgid "Auto zoom: " -msgstr "" +msgstr "Automatické přiblížení: " #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53 msgid "Autoload Tiles: " -msgstr "" +msgstr "Automaticky stahovat dlaždice: " #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58 msgid "Max zoom lvl: " -msgstr "" +msgstr "Max. úroveň přiblížení: " #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81 @@ -6772,4 +6881,7 @@ "plugin/" msgstr "" +"Nelze nahrát knihovnu rxtxSerial. Pokud potřebujete pomoc s její instalací, " +"zkuste Globalsat homepage na http://www.raphael-mack.de/josm-globalsat-gpx-" +"import-plugin/" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 @@ -6780,5 +6892,5 @@ #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." -msgstr "" +msgstr "Importovat data z Globalsat Datalogger DG100 do GPX vrstvy." #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 @@ -6796,9 +6908,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:38 msgid "Open a layer first (GPX, OSM, cache)" -msgstr "" +msgstr "Nejdříve otevřete vrstvu (GPX, OSM, cache)" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 msgid "Add a new layer" -msgstr "" +msgstr "Přidat novou vrstvu" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52 @@ -6814,27 +6926,38 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:70 msgid "Add new layer" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:40 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:45 +msgstr "Přidat novou vrstvu" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:43 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 #, java-format msgid "Downloading {0}" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:53 +msgstr "Stahuji {0}" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:51 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:55 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 msgid "Contacting WMS Server..." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:132 +msgstr "Kontaktuji WMS server..." + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157 msgid "Create buildings" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 msgid "CadastreGrabber: Illegal url." +msgstr "CadastreGrabber: Neplatné URL." + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +msgid "" +"To avoid cadastre WMS overload,\n" +"building import size is limited to 1 km2 max." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" @@ -6845,28 +6968,37 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:83 msgid "Add \"source=...\" to elements?" -msgstr "" +msgstr "Přidat \"source=...\" k objektům?" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23 msgid "Download Image from french Cadastre WMS" -msgstr "" +msgstr "Stáhnout obrázek z WMS francouzského katastru" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23 #, java-format msgid "Cadastre: {0}" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:108 +msgstr "Katastr: {0}" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:128 +msgid "Cadastre" +msgstr "Katastr" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:139 +msgid "Auto sourcing" +msgstr "Automatické zdrojování" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164 +msgid "Invalid projection" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 +#, java-format +msgid "Change the projection to {0} first." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:169 msgid "" "To enable the cadastre WMS plugin, change\n" "the JOSM projection to Lambert and restart" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132 -msgid "Cadastre" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 -msgid "Auto sourcing" msgstr "" @@ -6878,5 +7010,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 msgid "Only on vectorized layers" -msgstr "" +msgstr "Pouze na vektorizovaných vrstvách" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:20 @@ -6886,17 +7018,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:16 msgid "Lambert Zone 1 cache file (.1)" -msgstr "" +msgstr "Cache soubor pro Lambertovu zónu 1 (.1)" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 msgid "Lambert Zone 2 cache file (.2)" -msgstr "" +msgstr "Cache soubor pro Lambertovu zónu 2 (.2)" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 msgid "Lambert Zone 3 cache file (.3)" -msgstr "" +msgstr "Cache soubor pro Lambertovu zónu 3 (.3)" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 msgid "Lambert Zone 4 cache file (.4)" -msgstr "" +msgstr "Cache soubor pro Lambertovu zónu 4 (.4)" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:65 @@ -6909,5 +7041,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:283 msgid "Choose from..." -msgstr "" +msgstr "Vyberte z..." #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:292 @@ -6921,13 +7053,13 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 msgid "Set manually the Lambert zone (e.g. for locations between two zones)" -msgstr "" +msgstr "Nastavit Lambertovu zónu ručně (např. pro místo mezi dvěmi zónami)" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 msgid "Zone" -msgstr "" +msgstr "Zóna" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 msgid "Lambert zone" -msgstr "" +msgstr "Lambertova zóna" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19 @@ -6939,6 +7071,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:43 msgid "" -"More than one WMS layer present.\n" -"Select one of them first, then retry." +"More than one WMS layer present\n" +"Select one of them first, then retry" msgstr "" @@ -6947,5 +7079,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136 #, java-format @@ -6956,15 +7088,15 @@ msgstr[2] "Zjednodušení cesty (odstranění {0} uzlů)" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61 msgid "Extract SVG ViewBox..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65 msgid "Extract best fitting boundary..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:120 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126 msgid "Create boundary" -msgstr "" +msgstr "Vytvořit hranice" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81 @@ -6977,9 +7109,9 @@ #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" -msgstr "" +msgstr "WMS vrstva ({0}), nahráno {1} dlaždic" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 msgid "Is not vectorized." -msgstr "" +msgstr "Není vektorizovaný." #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 @@ -6990,5 +7122,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 msgid "Is vectorized." -msgstr "" +msgstr "Je vektorizovaný." #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 @@ -6998,15 +7130,15 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 msgid "Save WMS layer to file" msgstr "Uložit WMS vrstvu do souboru" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "Load WMS layer from file" msgstr "Nahrát WMS vrstvu ze souboru" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -7014,5 +7146,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 msgid "File Format Error" msgstr "Chyba formátu souboru" @@ -7020,5 +7152,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 msgid "Error loading file" msgstr "Chyba při nahrávání souboru" @@ -7030,8 +7162,10 @@ "Create a new one." msgstr "" +"Nepodporovná verze cache souboru; nalezeno {0}, očekáváno {1}\n" +"Vytvořte nový soubor." #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527 msgid "Cache Format Error" -msgstr "" +msgstr "Chyba formátu cache" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542 @@ -7039,91 +7173,110 @@ msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" +"Lambertova zóna {0} v cache nekompatibilní se současnou Lambertovou zónou {1}" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:544 msgid "Cache Lambert Zone Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29 +msgstr "Chyba Lambertovy zóny v cache" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 msgid "Replace original background by JOSM background color." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31 +msgstr "Nahradit původní pozadí pozadím nastaveným v JOSM." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30 msgid "Reverse grey colors (for black backgrounds)." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 +msgstr "Obrácené stupně šedi (pro černá pozadí)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 msgid "Set background transparent." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35 +msgstr "Nastavit průhledné pozadí." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34 msgid "Draw boundaries of downloaded data." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgstr "Zobrazovat hranice stažených dat." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Enable automatic caching." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:48 +msgstr "Zapnout automatické cachování." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 msgid "Max. cache size (in MB)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:53 -msgid "" -"A special handler of the french cadastre wms at www.cadastre.gouv." -"fr

Please read the Terms and Conditions of Use here (in french): " -"
http://www.cadastre.gouv.fr/scpc/html/" -"CU_01_ConditionsGenerales_fr.html
before any upload of data created " -"by this plugin." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:58 +msgstr "Max. velikost cache (v MB)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:55 +msgid "" +"A special handler of the french cadastre wms at " +"www.cadastre.gouv.fr

Please read the Terms and Conditions of Use here " +"(in french):
" +"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " +"
before any upload of data created by this plugin." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 msgid "French cadastre WMS" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 +msgstr "WMS francouzského katastru" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +"Hodnota klíče \"source\" pokud je zapnuto automatické zdrojování" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65 msgid "Source" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 +msgstr "Zdroj" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "" "Replace the original white background by the backgound color defined in JOSM " "preferences." msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 -msgid "" -"Invert the original texts from black to white (and all intermediate greys)." +"Nahradit původní bílé pozadí barvou pozadí nastavenou v nastavení JOSM." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +msgid "" +"Invert the original black and white colors (and all intermediate greys). " +"Useful for texts on dark backgrounds." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 +msgid "Allows multiple layers stacking" msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 -msgid "Allows multiple layers stacking" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:99 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:113 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 msgid "Image grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:162 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:125 +msgid "Grab smaller images (higher quality but use more memory)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +msgid "Fixed size square (default is 100m)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +msgid "Fixed size (from 25 to 1000 meters)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 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/WMSAdjustAction.java:34 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27 msgid "Adjust WMS" -msgstr "" +msgstr "Upravit WMS" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35 @@ -7141,66 +7294,68 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40 msgid "Jump To Position" -msgstr "" +msgstr "Skok na pozici" #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40 msgid "Opens a dialog that allows to jump to a specific location" -msgstr "" +msgstr "Otevře dialog umožňující skočit na zadané místo" #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:65 msgid "Enter Lat/Lon to jump to position." -msgstr "" +msgstr "Zadejte šířku/délku místa kam skočit." #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:67 msgid "You can also paste an URL from www.openstreetmap.org" -msgstr "" +msgstr "Můžete též vložit URL z www.openstreetmap.org" #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:99 msgid "Zoom (in metres)" -msgstr "" +msgstr "Přiblížení (v metrech)" #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "URL" -msgstr "" +msgstr "URL" #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 msgid "Jump there" -msgstr "" +msgstr "Skočit tam" #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112 msgid "Jump to Position" -msgstr "" +msgstr "Skok na místo" #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:124 msgid "Could not parse Latitude, Longitude or Zoom. Please check." -msgstr "" +msgstr "Nelze rozpoznat šířku, délku nebo přiblížení. Prosím, zkontrolujte." #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:124 msgid "Unable to parse Lon/Lat" -msgstr "" +msgstr "Nelze rozpoznat šířku/délku" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:113 msgid "Join overlapping Areas" -msgstr "" +msgstr "Spojit překrývající se plochy" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" -msgstr "" +msgstr "Spojí plochy, které se navzájem překrývají" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124 msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." msgstr "" +"TOTO JE EXPERIMENTÁLNÍ. Uložte svoji práci a ověřte výsledek před nahráním " +"na server." #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125 msgid "Continue anyway" -msgstr "" +msgstr "Přesto pokračovat" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:147 msgid "Only up to two areas can be joined at the moment." -msgstr "" +msgstr "Aktuálně lze sloučit maximálně pouze dvě plochy." #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:152 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." -msgstr "" +msgstr "\"{0}\" není uzavřená plocha a tedy nelze spojit." #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:169 @@ -7211,23 +7366,28 @@ "Are you really sure to continue?" msgstr "" +"Zvolené cesty mají uzly mimo hranice stažené oblasti.\n" +"Toto může vést k nechtěnému smazání používaných uzlů.\n" +"Opravdu chcete pokračovat?" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:172 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:67 msgid "Please abort if you are not sure" -msgstr "" +msgstr "Prosíme přerušte, pokud si nejste jisti" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:186 msgid "Please select at least one closed way the should be joined." -msgstr "" +msgstr "Vyberte alespoň jednu uzavřenou cestu k připojení." #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:194 msgid "No intersections found. Nothing was changed." -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:254 +msgstr "Nenalezen průsečík. Nic nebylo změněno." + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:255 msgid "" "Some of the ways were part of relations that have been modified. Please " "verify no errors have been introduced." msgstr "" +"Některé z cest byly prvky relací, které byly změněny. Prosíme, ověřte, zda " +"tímto nedošlo ke vzniku chyb." #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 @@ -7237,5 +7397,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 msgid "Delete unnecessary nodes from a way." -msgstr "" +msgstr "Smazat nepotřebné uzly z cesty." #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:82 @@ -7313,5 +7473,5 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:254 msgid "Correlate to GPX" -msgstr "" +msgstr "Korelovat vůči GPX" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:273 @@ -7369,8 +7529,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:203 msgid "" -"Take a photo of your GPS receiver while it displays the time." -"
Display that photo here.
And then, simply capture the time you read " -"on the photo and select a timezone
" -msgstr "" +"Take a photo of your GPS receiver while it displays the " +"time.
Display that photo here.
And then, simply capture the time you " +"read on the photo and select a timezone
" +msgstr "" +"Vyfotografujte váš GPS přijímač když ukazuje čas.
Zobrazte zde jeho " +"fotografii.
Poté zapište čas zobrazený na fotografii a vyberte časové " +"pásmo
" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:221 @@ -7388,5 +7551,5 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:256 msgid "I'm in the timezone of: " -msgstr "" +msgstr "Jsem v časovém pásmu: " #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:319 @@ -7401,5 +7564,5 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:367 msgid "Synchronize time from a photo of the GPS receiver" -msgstr "" +msgstr "Synchronizovat čas z fotografie GPS přijímače" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:378 @@ -7408,4 +7571,6 @@ "Please use the requested format" msgstr "" +"Chyba při čtení data.\n" +"Prosíme, použijte požadvaný formát" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:380 @@ -7415,5 +7580,5 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:423 msgid "" -msgstr "" +msgstr "" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:429 @@ -7427,12 +7592,13 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:450 msgid "Timezone: " -msgstr "" +msgstr "Časové pásmo: " #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:472 msgid "Offset:" -msgstr "" +msgstr "Posun:" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:484 -msgid "I can take a picture of my GPS receiver.
Can this help?" +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?" @@ -7451,17 +7617,17 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:530 msgid "Not yet tagged images" -msgstr "" +msgstr "Neotagované obrázky" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:549 msgid "Correlate images with GPX track" -msgstr "" +msgstr "Korelovat obrázky s GPX trasou" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 msgid "You should select a GPX track" -msgstr "" +msgstr "Měli byste vybrat GPX trasu" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:558 msgid "No selected GPX track" -msgstr "" +msgstr "Není vybrána GPX trasa" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:565 @@ -7471,10 +7637,12 @@ "Expected format: {0}" msgstr "" +"Chyba při čtení časového pásma.\n" +"Očekávaný formát: {0}" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:566 msgid "Invalid timezone" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 +msgstr "Nepatné časové pásmo" + +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #, java-format msgid "" @@ -7483,14 +7651,14 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:579 msgid "Invalid offset" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:641 +msgstr "Neplatný posun" + +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:643 #, java-format msgid "Found {0} matchs of {1} in GPX track {2}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:642 +msgstr "Nalezeno {0} výskytů {1} v GPX trase {2}" + +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:644 msgid "GPX Track loaded" msgstr "Nahrána GPX trasa" @@ -7498,68 +7666,82 @@ #: ../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/UploadDataGui.java:79 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 msgid "Upload Traces" -msgstr "" +msgstr "Nahrát trasy na server" #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 msgid "Uploads traces to openstreetmap.org" -msgstr "" +msgstr "Nahraje trasy na openstreetmap.org" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71 +msgid "Upload Trace" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +msgid "Public" +msgstr "Veřejné" #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 -msgid "Upload GPX track" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -msgid "Public" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 msgid "Selected makes your trace public in openstreetmap.org" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:120 +msgstr "Při zvolení budou vaše trasy veřejné na openstreetmap.org" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Description" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:123 +msgstr "Popis" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 msgid "Tags" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:182 +msgstr "Značky" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:153 +#, java-format +msgid "Selected track: {0}" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:176 msgid "Connecting..." -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 -msgid "Uploading GPX track..." -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:214 +msgstr "Připojuji se..." + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:199 +msgid "Upload cancelled" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:209 +msgid "Error while uploading" +msgstr "Chyba při nahrávání na server" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:227 -msgid "Error while uploading" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:235 +msgstr "Nahrání GPX dat na server proběhlo úspěšně" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +msgid "Upload failed. Server returned the following message: " +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 +#, java-format +msgid "Uploading GPX track: {0}% ({1} of {2})" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:252 +msgstr "Není zadán žádný popisek. Prosíme, zadejte jej." + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:241 +msgstr "Není vybrána GPX vrstva. Nelze nahrát trasu na server." + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:244 +msgstr "Není zadáno uživatelské jméno." + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +msgstr "Není zadáno heslo." + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" -msgstr "" +msgstr "Nahrávám GPX trasu na server" #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67 @@ -7602,5 +7784,5 @@ #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:75 msgid "Show Author Panel" -msgstr "" +msgstr "Zobrazit panel autorů" #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:95 @@ -7622,9 +7804,9 @@ #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:145 msgid "Please select some data" -msgstr "" +msgstr "Vyberte nějaká data" #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:149 msgid "Please choose a user using the author panel" -msgstr "" +msgstr "Vyberte uživatele v panelu autorů" #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:162 @@ -7674,5 +7856,6 @@ #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:153 msgid "Check the selected site(s) for new plugins or updates." -msgstr "Kontrolovat zvolenou stránku(stránky) pro nové pluginy a aktualizace." +msgstr "" +"Kontrolovat zvolenou stránku(stránky) pro nové pluginy a aktualizace." #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:155 @@ -7693,4 +7876,6 @@ "the preferences." msgstr "" +"Firefox nenalezen. Nastavte spustitelný soubor firefoxu na stránce Nastavení " +"mapy v nastavení." #: ../plugins/osmarender/src/OsmarenderPlugin.java:121 @@ -7725,4 +7910,6 @@ "This may lead to wrong coordinates." msgstr "" +"Projekce ''{0}'' v URL a současná projekce ''{1}'' jsou jiné.\n" +"Toto může vést ke špatným souřadnicím." #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:133 @@ -7732,5 +7919,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:149 msgid "Open a blank WMS layer to load data from a file" -msgstr "" +msgstr "K nahrání dat ze souboru otevřete nejprve prázdnou WMS vrstvu" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 @@ -7776,42 +7963,43 @@ msgstr "Automatické stahování" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:112 +msgstr "WMS vrstva ({0}), automatické stahování v přiblížení {1}" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164 +msgstr "WMS vrstva ({0}), stahování v přiblížení {1}" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +"Požadovaná plocha je příliš velká. Přibližte pohled nebo změňte rozlišení." + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:232 msgid "Download visible tiles" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +msgstr "Nahrát viditelné dlaždice" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241 msgid "Change resolution" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +msgstr "Změnit rozlišení" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:253 msgid "Reload erroneous tiles" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:264 +msgstr "Znovu nahrát chybné dlaždice" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:271 msgid "Alpha channel" -msgstr "" +msgstr "Alfa kanál" #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:53 msgid "Exception occurred" -msgstr "" +msgstr "Nastala výjimka" #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28 msgid "Adjust the position of the selected WMS layer" -msgstr "" +msgstr "Upravit pozici zvolené WMS vrstvy" #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20 @@ -7856,9 +8044,9 @@ #: ../plugins/grid/src/grid/GridLayer.java:192 msgid "Grid origin location" -msgstr "" +msgstr "Pozice počátku mřížky" #: ../plugins/grid/src/grid/GridLayer.java:197 msgid "Grid rotation" -msgstr "" +msgstr "Otočení mřížky" #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -8118,9 +8306,9 @@ #: trans_style.java:1354 msgid "pier" -msgstr "" +msgstr "molo" #: trans_style.java:1362 msgid "pipeline" -msgstr "" +msgstr "potrubí" #: trans_style.java:1445 trans_style.java:1453 trans_style.java:1461 @@ -8363,5 +8551,5 @@ #: trans_wms.java:9 msgid "NPE Maps (Tim)" -msgstr "" +msgstr "NPE Mapy (Tim)" #: trans_wms.java:14 @@ -8416,25 +8604,25 @@ #: trans_validator.java:51 msgid "cycleway with tag bicycle" -msgstr "" +msgstr "\"cycleway\" (cyklostezka) s tagem \"bicycle\"" #: trans_validator.java:52 msgid "footway with tag foot" -msgstr "" +msgstr "\"footway\" (pěšina) s tagem \"foot\"" #: trans_validator.java:55 msgid "separate cycleway as lane on a cycleway" -msgstr "" +msgstr "Navíc cyklostezka jako pruh na cyklostezce" #: trans_validator.java:56 msgid "barrier used on a way" -msgstr "" +msgstr "tag \"barrier\" (překážka) použitý na cestě" #: trans_validator.java:59 msgid "maxspeed used for footway" -msgstr "" +msgstr "\"footway\" (pěšina) s tagem \"maxspeed\"" #: trans_validator.java:61 msgid "layer tag with + sign" -msgstr "" +msgstr "tag \"layer\" se znaménkem +" #: trans_validator.java:63 @@ -8556,4 +8744,6 @@ "request a smaller area, or use planet.osm" msgstr "" +"Maximální velikost hranice oblasti je 0.25 a váš požadavek byl příliš velký. " +"Vyžádejte si menší plochu, nebo použijte planet.osm" #: specialmessages.java:9 @@ -8719,5 +8909,5 @@ #: trans_presets.java:1287 trans_presets.java:1463 trans_presets.java:1504 msgid "Width (meters)" -msgstr "" +msgstr "Šířka (metrů)" #: trans_presets.java:217 @@ -8945,13 +9135,13 @@ #: trans_presets.java:322 msgid "Max. Height (meters)" -msgstr "" +msgstr "Max. výška (metrů)" #: trans_presets.java:323 msgid "Max. Width (meters)" -msgstr "" +msgstr "Max. šířka (metrů)" #: trans_presets.java:324 msgid "Max. Length (meters)" -msgstr "" +msgstr "Max. délka (metrů)" #: trans_presets.java:326 @@ -8999,5 +9189,5 @@ #: trans_presets.java:364 msgid "Edit a Tunnel" -msgstr "" +msgstr "Upravit tunel" #: trans_presets.java:378 @@ -9019,9 +9209,9 @@ #: trans_presets.java:402 msgid "Bridleway" -msgstr "" +msgstr "Cesta pro koně" #: trans_presets.java:404 msgid "Edit a Bridleway" -msgstr "" +msgstr "Upravit cestu pro koně" #: trans_presets.java:420 @@ -9068,20 +9258,20 @@ #: trans_presets.java:573 trans_presets.java:594 trans_presets.java:615 msgid "gravel" -msgstr "" +msgstr "štěrk" #: trans_presets.java:510 trans_presets.java:531 trans_presets.java:552 #: trans_presets.java:573 trans_presets.java:594 trans_presets.java:615 msgid "ground" -msgstr "" +msgstr "země" #: trans_presets.java:510 trans_presets.java:531 trans_presets.java:552 #: trans_presets.java:573 trans_presets.java:594 trans_presets.java:615 msgid "grass" -msgstr "" +msgstr "tráva" #: trans_presets.java:510 trans_presets.java:531 trans_presets.java:552 #: trans_presets.java:573 trans_presets.java:594 trans_presets.java:615 msgid "sand" -msgstr "" +msgstr "písek" #: trans_presets.java:518 @@ -9135,9 +9325,9 @@ #: trans_presets.java:633 msgid "Snowmobile" -msgstr "" +msgstr "Sněžný skůtr" #: trans_presets.java:636 msgid "Ski" -msgstr "" +msgstr "Lyže" #: trans_presets.java:651 @@ -9228,5 +9418,5 @@ #: trans_presets.java:754 msgid "Pedestrian crossing type" -msgstr "" +msgstr "Typ přechodu pro chodce" #: trans_presets.java:754 trans_presets.java:769 trans_presets.java:1309 @@ -9292,5 +9482,5 @@ #: trans_presets.java:764 msgid "Pedestrian Crossing" -msgstr "" +msgstr "Přechod pro chodce" #: trans_presets.java:767 @@ -9304,13 +9494,13 @@ #: trans_presets.java:775 msgid "Mini-roundabout" -msgstr "" +msgstr "Malý kruhový objezd" #: trans_presets.java:780 msgid "Direction" -msgstr "" +msgstr "Směr" #: trans_presets.java:780 msgid "clockwise" -msgstr "" +msgstr "po směru hodinových ručiček" #: trans_presets.java:782 @@ -9489,5 +9679,5 @@ #: trans_presets.java:977 msgid "Wall" -msgstr "" +msgstr "Zeď" #: trans_presets.java:980 @@ -9925,9 +10115,9 @@ #: trans_presets.java:1339 trans_presets.java:1426 msgid "Station" -msgstr "" +msgstr "Stanice" #: trans_presets.java:1340 msgid "Edit a Station" -msgstr "" +msgstr "Upravit stanici" #: trans_presets.java:1347 @@ -10029,9 +10219,9 @@ #: trans_presets.java:1429 msgid "Edit Station" -msgstr "" +msgstr "Upravit stanici" #: trans_presets.java:1434 msgid "UIC-Reference" -msgstr "" +msgstr "UIC-Reference" #: trans_presets.java:1437 @@ -10157,17 +10347,17 @@ #: trans_presets.java:1548 msgid "Chalet" -msgstr "" +msgstr "Horská chata" #: trans_presets.java:1550 msgid "Edit Chalet" -msgstr "" +msgstr "Upravit horskou chatu" #: trans_presets.java:1554 msgid "Hostel" -msgstr "" +msgstr "Hostel" #: trans_presets.java:1556 msgid "Edit Hostel" -msgstr "" +msgstr "Upravit hostel" #: trans_presets.java:1560 @@ -10421,9 +10611,9 @@ #: trans_presets.java:1668 msgid "Picnic Site" -msgstr "" +msgstr "Místo na piknik" #: trans_presets.java:1669 msgid "Edit Picnic Site" -msgstr "" +msgstr "Upravit místo na piknik" #: trans_presets.java:1675 @@ -10558,5 +10748,5 @@ #: trans_presets.java:1777 msgid "australian_football" -msgstr "" +msgstr "australský fotbal" #: trans_presets.java:1750 trans_presets.java:1759 trans_presets.java:1768 @@ -10578,20 +10768,20 @@ #: trans_presets.java:1777 msgid "bowls" -msgstr "" +msgstr "bowls" #: trans_presets.java:1750 trans_presets.java:1759 trans_presets.java:1768 #: trans_presets.java:1777 msgid "canoe" -msgstr "" +msgstr "kanoistika" #: trans_presets.java:1750 trans_presets.java:1759 trans_presets.java:1768 #: trans_presets.java:1777 msgid "climbing" -msgstr "" +msgstr "lezení" #: trans_presets.java:1750 trans_presets.java:1759 trans_presets.java:1768 #: trans_presets.java:1777 msgid "cricket" -msgstr "" +msgstr "kriket" #: trans_presets.java:1750 trans_presets.java:1759 trans_presets.java:1768 @@ -10603,5 +10793,5 @@ #: trans_presets.java:1777 msgid "croquet" -msgstr "" +msgstr "kroket" #: trans_presets.java:1750 trans_presets.java:1759 trans_presets.java:1768 @@ -10613,15 +10803,15 @@ #: trans_presets.java:1777 msgid "dog_racing" -msgstr "" +msgstr "závody psů" #: trans_presets.java:1750 trans_presets.java:1759 trans_presets.java:1768 #: trans_presets.java:1777 msgid "equestrian" -msgstr "" +msgstr "krasojízda" #: trans_presets.java:1750 trans_presets.java:1759 trans_presets.java:1768 #: trans_presets.java:1777 msgid "football" -msgstr "" +msgstr "fotbal" #: trans_presets.java:1750 trans_presets.java:1759 trans_presets.java:1768 @@ -10643,5 +10833,5 @@ #: trans_presets.java:1777 msgid "horse_racing" -msgstr "" +msgstr "dostihy" #: trans_presets.java:1750 trans_presets.java:1759 trans_presets.java:1768 @@ -10828,25 +11018,25 @@ #: trans_presets.java:1815 msgid "Climbing" -msgstr "" +msgstr "Horolezení" #: trans_presets.java:1816 msgid "Edit Climbing" -msgstr "" +msgstr "Upravit horolezení" #: trans_presets.java:1821 msgid "Canoeing" -msgstr "" +msgstr "Kanoistika" #: trans_presets.java:1822 msgid "Edit Canoeing" -msgstr "" +msgstr "Upravit kanoistiku" #: trans_presets.java:1827 msgid "Cycling" -msgstr "" +msgstr "Cyklistika" #: trans_presets.java:1828 msgid "Edit Cycling" -msgstr "" +msgstr "Upravit cyklistiku" #: trans_presets.java:1833 @@ -10860,9 +11050,9 @@ #: trans_presets.java:1839 msgid "Equestrian" -msgstr "" +msgstr "Krasojízda" #: trans_presets.java:1840 msgid "Edit Equestrian" -msgstr "" +msgstr "Upravit krasojízdu" #: trans_presets.java:1845 @@ -10884,25 +11074,25 @@ #: trans_presets.java:1857 msgid "Motor Sports" -msgstr "" +msgstr "Motorové sporty" #: trans_presets.java:1858 msgid "Edit Motor Sports" -msgstr "" +msgstr "Upravit motorové sporty" #: trans_presets.java:1863 msgid "Skating" -msgstr "" +msgstr "Bruslení" #: trans_presets.java:1864 msgid "Edit Skating" -msgstr "" +msgstr "Upravit bruslení" #: trans_presets.java:1869 msgid "Skateboard" -msgstr "" +msgstr "Skateboard" #: trans_presets.java:1870 msgid "Edit Skateboard" -msgstr "" +msgstr "Upravit Skateboard" #: trans_presets.java:1875 @@ -10924,5 +11114,5 @@ #: trans_presets.java:1886 msgid "Piste type" -msgstr "" +msgstr "Typ sjezdovky" #: trans_presets.java:1886 @@ -10940,25 +11130,25 @@ #: trans_presets.java:1887 msgid "Difficulty" -msgstr "" +msgstr "Obtížnost" #: trans_presets.java:1887 msgid "novice" -msgstr "" +msgstr "pro začátečníky" #: trans_presets.java:1887 msgid "easy" -msgstr "" +msgstr "jednoduchá" #: trans_presets.java:1887 msgid "intermedia" -msgstr "" +msgstr "střední" #: trans_presets.java:1887 msgid "advance" -msgstr "" +msgstr "pro pokročilé" #: trans_presets.java:1887 msgid "expert" -msgstr "" +msgstr "pro experty" #: trans_presets.java:1887 @@ -10988,17 +11178,17 @@ #: trans_presets.java:1905 msgid "Football" -msgstr "" +msgstr "Fotbal" #: trans_presets.java:1906 msgid "Edit Football" -msgstr "" +msgstr "Upravit fotbal" #: trans_presets.java:1911 msgid "Australian Football" -msgstr "" +msgstr "Australský fotbal" #: trans_presets.java:1912 msgid "Edit Australian Football" -msgstr "" +msgstr "Upravit australský fotbal" #: trans_presets.java:1917 @@ -11028,5 +11218,5 @@ #: trans_presets.java:1933 msgid "golf_course" -msgstr "" +msgstr "golfové hřiště" #: trans_presets.java:1935 @@ -11040,17 +11230,17 @@ #: trans_presets.java:1941 msgid "Bowls" -msgstr "" +msgstr "Bowls" #: trans_presets.java:1942 msgid "Edit Bowls" -msgstr "" +msgstr "Upravit Bowls" #: trans_presets.java:1947 msgid "Cricket" -msgstr "" +msgstr "Kriket" #: trans_presets.java:1948 msgid "Edit Cricket" -msgstr "" +msgstr "Upravit kriket" #: trans_presets.java:1953 @@ -11064,9 +11254,9 @@ #: trans_presets.java:1959 msgid "Croquet" -msgstr "" +msgstr "Kroket" #: trans_presets.java:1960 msgid "Edit Croquet" -msgstr "" +msgstr "Upravit kroket" #: trans_presets.java:1965 @@ -11796,13 +11986,13 @@ #: trans_presets.java:2352 msgid "Vending machine" -msgstr "" +msgstr "Prodejní automat" #: trans_presets.java:2354 msgid "Edit a Vending_machine" -msgstr "" +msgstr "Upravit prodejní automat" #: trans_presets.java:2356 msgid "Vending products" -msgstr "" +msgstr "Prodávané produkty" #: trans_presets.java:2356 @@ -11860,5 +12050,5 @@ #: trans_presets.java:2356 msgid "telephone_vouchers" -msgstr "" +msgstr "telefonní karty" #: trans_presets.java:2356 @@ -11900,9 +12090,9 @@ #: trans_presets.java:2379 msgid "Florist" -msgstr "" +msgstr "Květinářství" #: trans_presets.java:2381 msgid "Edit Florist" -msgstr "" +msgstr "Upravit květinářství" #: trans_presets.java:2385 @@ -11916,33 +12106,33 @@ #: trans_presets.java:2390 msgid "Beverages" -msgstr "" +msgstr "Nápoje" #: trans_presets.java:2391 msgid "Edit Beverages Shop" -msgstr "" +msgstr "Upravit obchod s nápoji" #: trans_presets.java:2395 msgid "Computer" -msgstr "" +msgstr "Počítače" #: trans_presets.java:2396 msgid "Edit Computer Shop" -msgstr "" +msgstr "Upravit obchod s počítači" #: trans_presets.java:2400 msgid "Electronics" -msgstr "" +msgstr "Elektronika" #: trans_presets.java:2401 msgid "Edit Electronics Shop" -msgstr "" +msgstr "Upravit obchod s elektronikou" #: trans_presets.java:2405 msgid "Hifi" -msgstr "" +msgstr "Hifi" #: trans_presets.java:2406 msgid "Edit Hifi Shop" -msgstr "" +msgstr "Upravit obchod s hifi" #: trans_presets.java:2410 @@ -11956,9 +12146,9 @@ #: trans_presets.java:2415 msgid "Garden Centre" -msgstr "" +msgstr "Zahradní centrum" #: trans_presets.java:2417 msgid "Edit Garden Centre" -msgstr "" +msgstr "Upravit zahradní centrum" #: trans_presets.java:2421 @@ -11988,9 +12178,9 @@ #: trans_presets.java:2438 msgid "Hairdresser" -msgstr "" +msgstr "Kadeřnictví" #: trans_presets.java:2439 msgid "Edit Hairdresser" -msgstr "" +msgstr "Upravit Kadeřnictví" #: trans_presets.java:2443 @@ -12000,13 +12190,13 @@ #: trans_presets.java:2444 msgid "Edit Shoe Shop" -msgstr "" +msgstr "Upravit obchod s obuví" #: trans_presets.java:2448 msgid "Toys" -msgstr "" +msgstr "Hračky" #: trans_presets.java:2449 msgid "Edit Toy Shop" -msgstr "" +msgstr "Upravit obchod s hračkami" #: trans_presets.java:2453 @@ -12020,17 +12210,17 @@ #: trans_presets.java:2458 msgid "Dry Cleaning" -msgstr "" +msgstr "Čistírna" #: trans_presets.java:2460 msgid "Edit Dry Cleaning" -msgstr "" +msgstr "Upravit čistírnu" #: trans_presets.java:2464 msgid "Laundry" -msgstr "" +msgstr "Prádelna" #: trans_presets.java:2466 msgid "Edit Laundry" -msgstr "" +msgstr "Upravit prádelnu" #: trans_presets.java:2470 @@ -12044,17 +12234,17 @@ #: trans_presets.java:2476 msgid "sports" -msgstr "" +msgstr "Sportovní potřeby" #: trans_presets.java:2477 msgid "Edit Sports Shop" -msgstr "" +msgstr "Upravit obchod se sportovními pořebami" #: trans_presets.java:2481 msgid "optician" -msgstr "" +msgstr "Optika" #: trans_presets.java:2482 msgid "Edit Optician" -msgstr "" +msgstr "Upravit optiku" #: trans_presets.java:2488 @@ -12372,33 +12562,33 @@ #: trans_presets.java:2720 msgid "Nature Reserve" -msgstr "" +msgstr "Přírodní rezervace" #: trans_presets.java:2721 msgid "Edit Nature Reserve" -msgstr "" +msgstr "Upravit přírodní rezervaci" #: trans_presets.java:2725 msgid "Farmyard" -msgstr "" +msgstr "Farma" #: trans_presets.java:2728 msgid "Edit Farmyard Landuse" -msgstr "" +msgstr "Upravit farmu" #: trans_presets.java:2733 msgid "Farmland" -msgstr "" +msgstr "Zemědělská půda" #: trans_presets.java:2734 msgid "Edit Farmland Landuse" -msgstr "" +msgstr "Upravit zemědělskou půdu" #: trans_presets.java:2739 msgid "Meadow" -msgstr "" +msgstr "Louka" #: trans_presets.java:2740 msgid "Edit Meadow Landuse" -msgstr "" +msgstr "Upravit louku" #: trans_presets.java:2745 @@ -12412,9 +12602,9 @@ #: trans_presets.java:2751 msgid "Allotments" -msgstr "" +msgstr "Zahrádkářská kolonie" #: trans_presets.java:2752 msgid "Edit Allotments Landuse" -msgstr "" +msgstr "Upravit zahrádkářskou kolonii" #: trans_presets.java:2757 @@ -12484,9 +12674,9 @@ #: trans_presets.java:2808 msgid "Cemetery" -msgstr "" +msgstr "Hřbitov" #: trans_presets.java:2810 msgid "Edit Cemetery Landuse" -msgstr "" +msgstr "Upravit hřbitov" #: trans_presets.java:2817 @@ -12564,9 +12754,9 @@ #: trans_presets.java:2873 msgid "Military" -msgstr "" +msgstr "Vojenský prostor" #: trans_presets.java:2874 msgid "Edit Military Landuse" -msgstr "" +msgstr "Upravit vojenský prostor" #: trans_presets.java:2880 @@ -12604,69 +12794,72 @@ #: trans_presets.java:2905 msgid "Multipolygon" -msgstr "" +msgstr "Multipolygon" #: trans_presets.java:2909 msgid "Edit a Multipolygon" -msgstr "" +msgstr "Upravit multipolygon" #: trans_presets.java:2915 msgid "outer segment" -msgstr "" +msgstr "vnější část" #: trans_presets.java:2916 msgid "inner segment" -msgstr "" +msgstr "vnitřní část" #: trans_presets.java:2919 msgid "Turn restriction" -msgstr "" +msgstr "Zákaz odbočení" #: trans_presets.java:2922 msgid "Edit a Turn Restriction" -msgstr "" +msgstr "Upravit zákaz odbočení" #: trans_presets.java:2924 msgid "Restriction" -msgstr "" +msgstr "Omezení" #: trans_presets.java:2924 msgid "no_left_turn" -msgstr "" +msgstr "zákaz odbočení vlevo" #: trans_presets.java:2924 msgid "no_right_turn" -msgstr "" +msgstr "zákaz odbočení vpravo" #: trans_presets.java:2924 msgid "no_straight_on" -msgstr "" +msgstr "zákaz jízdy rovně" #: trans_presets.java:2924 msgid "no_u_turn" -msgstr "" +msgstr "zákaz otáčení" #: trans_presets.java:2924 msgid "only_right_turn" -msgstr "" +msgstr "pouze odbočení vpravo" #: trans_presets.java:2924 msgid "only_left_turn" -msgstr "" +msgstr "pouze odbočení vlevo" #: trans_presets.java:2924 msgid "only_straight_on" -msgstr "" +msgstr "pouze jízda rovně" #: trans_presets.java:2929 msgid "from way" -msgstr "" +msgstr "z cesty" #: trans_presets.java:2930 msgid "via node or way" -msgstr "" +msgstr "přes uzel nebo cestu" #: trans_presets.java:2931 msgid "to way" -msgstr "" +msgstr "na cestu" + +#~ msgid "Please select something from the conflict list." +#~ msgstr "Zvolte něco ze seznamu konfliktů" #~ msgid "OSM History Information" @@ -12676,4 +12869,36 @@ #~ msgstr "Zvolte objekty, u kterých chcete změnit vlastnosti" +#~ msgid "Upload this trace..." +#~ msgstr "Nahrát na server tuto trasu..." + +#~ msgid "" +#~ "This functionality has been added only recently. Please
use with " +#~ "care and check if it works as expected." +#~ msgstr "" +#~ "Tato funkce byla přidána nedávno. Prosíme,
používejte opatrně a " +#~ "ujistěte se, že se chová tak, jak očekáváte." + +#~ msgid "Upload track filtered by JOSM" +#~ msgstr "Nahrát trasu filtrovanou JOSM" + +#~ msgid "Upload raw file: " +#~ msgstr "Nahrát soubor surových dat: " + +#~ msgid "Description:" +#~ msgstr "Popis:" + +#~ msgid "Tags (keywords in GPX):" +#~ msgstr "Značky (klíčová slova v GPX souboru)" + +#~ msgid "GPX-Upload" +#~ msgstr "Nahrání GPX" + +#, java-format +#~ msgid "Upload raw file: {0}" +#~ msgstr "Nahrát soubor {0} se surovými daty" + +#~ msgid "Tags:" +#~ msgstr "Značky:" + #~ msgid "Unknown type" #~ msgstr "Neznámý typ" @@ -12682,4 +12907,5 @@ #~ msgstr "NullPointerException, pravděpodobně chybí některé tagy." +#, java-format #~ msgid "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..." #~ msgstr "Nahrávání {0} {1} (id: {2}) {3}% {4}/{5} ({6} zbývá)..." @@ -12694,4 +12920,5 @@ #~ msgstr "Poskytovatel" +#, java-format #~ msgid "Version: {0}
Last change at {1}" #~ msgstr "Verze: {0}
Poslední změna v {1}" @@ -12709,10 +12936,13 @@ #~ msgstr "SurveyorPlugin" +#, java-format #~ msgid "Version {0} - Last change at {1}" #~ msgstr "Verze {0} - poslední změna v {1}" +#, java-format #~ msgid "Data error: lat value \"{0}\" is out of bounds." #~ msgstr "Chyba dat: zeměpisná šířka \"{0}\" je mimo rozsah." +#, java-format #~ msgid "Data error: lon value \"{0}\" is out of bounds." #~ msgstr "Chyba dat: zeměpisná délka \"{0}\" je mimo rozsah." @@ -12729,2 +12959,9 @@ #~ msgid "bus" #~ msgstr "autobus" + +#, java-format +#~ msgid "The \"{0}\" way must contain at least 2 nodes." +#~ msgstr "Cesta \"{0}\" musí obsahovat alespoň dva uzly." + +#~ msgid "Upload GPX track" +#~ msgstr "Nahrát GPX trasu na server" Index: /applications/editors/josm/i18n/po/da.po =================================================================== --- /applications/editors/josm/i18n/po/da.po (revision 13832) +++ /applications/editors/josm/i18n/po/da.po (revision 13833) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-15 22:03+0100\n" -"PO-Revision-Date: 2009-02-12 22:44+0000\n" +"POT-Creation-Date: 2009-02-21 16:35+0100\n" +"PO-Revision-Date: 2009-02-18 12:24+0000\n" "Last-Translator: Peter Brodersen \n" "Language-Team: Danish \n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-02-15 20:40+0000\n" +"X-Launchpad-Export-Date: 2009-02-22 20:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 #, java-format msgid "" @@ -30,5 +30,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 msgid "" "This action will have no shortcut.\n" @@ -38,5 +38,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -47,5 +47,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Tip: Du kan redigere genveje i indstillingerne.)" @@ -56,17 +56,17 @@ #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 msgid "Information" msgstr "Oplysninger" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Do nothing" msgstr "Foretag intet" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Report Bug" msgstr "Rapportér fejl" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 msgid "" "An unexpected exception occurred.\n" @@ -80,19 +80,19 @@ "udgave af JOSM, kan du hjælpe ved at sende en fejlrapport." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Unexpected Exception" msgstr "Uventet handling" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 #, java-format msgid "Please report a ticket at {0}" msgstr "Send venligst en fejlrapport på {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" "Beskriv de trin, du foretog for at få fejlen (så detaljeret som muligt)!" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:78 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -102,9 +102,9 @@ "indsender en fejlrapport." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Be sure to include the following information:" msgstr "Husk at nævne følgende informationer:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75 msgid "(The text has already been copied to your clipboard.)" msgstr "(teksten er allerede kopieret til til din udklipsholder.)" @@ -118,5 +118,5 @@ msgstr "Fejl ved lydafspilning" -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:94 @@ -124,5 +124,5 @@ msgstr "Kontakter OSM-serveren..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:48 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:32 @@ -130,10 +130,10 @@ msgstr "Downloader OSM-data..." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 msgid "NullPointerException, possibly some missing tags." msgstr "NullPointerException, måske på grund af manglende tags." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83 msgid "Preparing data..." msgstr "Forbereder data..." @@ -162,35 +162,35 @@ msgstr "Henter punkter {0} til {1}..." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:164 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:168 msgid "Unknown version" msgstr "Ukendt version" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 msgid "Found element in non-way." msgstr "Fandt -element i en ikke-vej" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 msgid " has zero ref" msgstr " har nul ref" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 msgid "Found element in non-relation." msgstr "Fandt -element i en ikke-relation." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:252 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250 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:294 msgid "Illegal object with id=0" msgstr "Ugyldigt objekt med id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Mangler obligatorisk attribut \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 #, java-format msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" @@ -198,13 +198,13 @@ "Ignorerer en vej fordi den inkluderer et punkt, som ikke eksisterer: {0}\n" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:502 msgid "Prepare OSM data..." msgstr "Forbereder OSM-data..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:518 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:516 msgid "Ill-formed node id" msgstr "Defekt id for punkt" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:280 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:287 msgid "Parse error: invalid document structure for gpx document" msgstr "Fejl ved fortolkning: ulovlig datastruktur for gpx-dokument" @@ -214,18 +214,18 @@ msgstr "Forbinder til server..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 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/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 msgid "Commit comment" msgstr "Indsend kommentar" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" msgstr "{0}% ({1}/{2}), {3} tilbage. Uploader {4}: {5} (id: {6})" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64 @@ -235,34 +235,32 @@ msgstr "En fejl opstod: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:192 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190 msgid "Opening changeset..." msgstr "Åbner rettesæt..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:226 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224 msgid "Server does not support changesets" msgstr "Serveren undersøtter ikke rettesæt" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:246 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:428 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:609 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:184 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607 msgid "Unknown host" msgstr "Ukendt vært" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282 msgid "Preparing..." msgstr "Forbereder..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:294 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292 msgid "Uploading..." msgstr "Uploader..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375 msgid "Closing changeset..." msgstr "Lukker rettesæt..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:652 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650 msgid "Transfer aborted due to error (will wait for 5 seconds):" msgstr "Overførsel er afbrudt grundet en fejl (venter i fem sekunder)" @@ -300,17 +298,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95 #: ../core/src/org/openstreetmap/josm/Main.java:348 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:29 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 @@ -323,11 +324,11 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:110 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -342,11 +343,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:186 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 msgid "Creating main GUI" msgstr "Skaber hovedgrænsefladen" #: ../core/src/org/openstreetmap/josm/Main.java:195 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:271 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:278 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:56 msgid "Help" @@ -372,9 +373,9 @@ #: ../core/src/org/openstreetmap/josm/Main.java:348 msgid "Save and Exit" -msgstr "" +msgstr "Gem og afslut" #: ../core/src/org/openstreetmap/josm/Main.java:348 msgid "Discard and Exit" -msgstr "" +msgstr "Smid væk og afslut" #: ../core/src/org/openstreetmap/josm/Main.java:374 @@ -388,21 +389,21 @@ msgstr "Ignorerer defekt fil-URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109 msgid "min lat" msgstr "min. bredde" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111 msgid "min lon" msgstr "min. længde" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:117 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "max lat" msgstr "max bredde" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 msgid "max lon" msgstr "max længde" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:122 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -412,5 +413,5 @@ "området)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:134 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130 msgid "Bounding Box" msgstr "Omkransende område" @@ -446,6 +447,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:96 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:894 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:956 msgid "name" msgstr "navn" @@ -478,5 +479,5 @@ msgstr "zoom" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:107 msgid "" "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -486,5 +487,5 @@ "flyt musen. Vælg: Klik" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:109 msgid "Slippy map" msgstr "Flytbart kort" @@ -495,7 +496,7 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:605 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:602 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:89 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -515,5 +516,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380 msgid "Remove" msgstr "Fjern" @@ -568,5 +569,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:103 msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -msgstr "Du kan bruge musen eller Ctrl+piletaster/./ for at zoome og panorere." +msgstr "" +"Du kan bruge musen eller Ctrl+piletaster/./ for at zoome og panorere." #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104 @@ -658,20 +660,20 @@ msgstr "Hvis angivet, nulstil konfigurationen i stedet for at indlæse den." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:109 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:186 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:198 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:108 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:191 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:203 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 msgid "Java OpenStreetMap Editor" msgstr "Java OpenStreetMap Editor" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:111 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:110 msgid "Message of the day not available" msgstr "Dagens besked er ikke tilgængelig" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:200 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:205 msgid "Downloading \"Message of the day\"" msgstr "Henter \"Dagens besked\"" @@ -711,33 +713,33 @@ msgstr "Zoom ud" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:234 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:474 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:512 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:383 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:380 msgid "More information about this feature" msgstr "Mere information om denne feature" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:393 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:390 msgid "Optional Attributes:" msgstr "Valgfri attributter:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:437 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Brug forudindstilling \"{0}\" af gruppe \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:438 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:435 #, java-format msgid "Use preset ''{0}''" msgstr "Brug forudindstilling \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 msgid "way" @@ -746,11 +748,11 @@ msgstr[1] "veje" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:214 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 msgid "node" msgid_plural "nodes" @@ -758,6 +760,6 @@ msgstr[1] "noder" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:81 @@ -767,14 +769,14 @@ msgstr[1] "relationer" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:475 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 #, java-format msgid "Unknown type: {0}" msgstr "Ukendt type: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:549 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 #, java-format @@ -782,15 +784,15 @@ msgstr "Kunne ikke læse den forudindstillede kilde til tagging: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:555 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 #, java-format msgid "Error parsing {0}: " msgstr "Fejl ved fortolkning af {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:572 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:569 #, 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:607 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595 #, java-format msgid "Change {0} object" @@ -799,9 +801,17 @@ msgstr[1] "Ret {0} objekter" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 msgid "Nothing selected!" msgstr "Intet er valgt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 +msgid "Selection unsuitable!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +msgid "Apply Preset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 msgid "Change Properties" msgstr "Ret egenskaber" @@ -812,14 +822,14 @@ msgstr "Forudindstillet gruppe \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:107 msgid "File" msgstr "Filer" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:135 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:107 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:86 @@ -831,22 +841,22 @@ msgstr "Rediger" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 msgid "View" msgstr "Vis" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:26 msgid "Tools" msgstr "Funktioner" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:141 msgid "Audio" msgstr "Lyd" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:142 msgid "Presets" msgstr "Forudindstillinger" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:40 @@ -858,18 +868,18 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:210 msgid "Wireframe View" msgstr "Trådnet-visning" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212 msgid "Toggle Wireframe view" msgstr "Skift trådnet-visning" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:28 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 msgid "Contacting the OSM server..." msgstr "Kontakter OSM-serveren..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 #, java-format msgid "This will change up to {0} object." @@ -878,11 +888,11 @@ msgstr[1] "Dette vil ændre på op til {0} objekter." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 msgid "An empty value deletes the key." msgstr "En tom værdi vil slette nøglen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66 @@ -892,7 +902,7 @@ msgstr "Nøgle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 @@ -901,10 +911,10 @@ msgstr "Værdi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333 msgid "Change values?" msgstr "Ret værdier?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:257 #, java-format msgid "Change properties of up to {0} object" @@ -913,33 +923,33 @@ msgstr[1] "Ret egenskaber for op til {0} objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 msgid "Please select a key" msgstr "Vælg venligst en nøgle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321 msgid "Please select a value" msgstr "Vælg venligst en værdi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:445 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:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 msgid "Properties/Memberships" msgstr "Egenskaber/medlemsskaber" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 msgid "Properties for selected objects." msgstr "Egenskaber for valgte objekter." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97 @@ -951,58 +961,58 @@ msgstr "Skift: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 msgid "Member Of" msgstr "Medlem af" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Role" msgstr "Rolle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:559 msgid "Change relation" msgstr "Skift relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560 #, 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:564 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 msgid "Delete from relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:600 msgid "Add Properties" msgstr "Tilføj egenskaber" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 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:609 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 msgid "Edit Properties" msgstr "Rediger egenskaber" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609 msgid "Edit the value of the selected key for all objects" msgstr "Ret værdien for den valgte nøgle for alle objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 msgid "Delete Properties" msgstr "Fjern egenskaber" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:77 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:293 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 @@ -1011,98 +1021,115 @@ msgstr "Fjern" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 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:766 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:763 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Egenskaber: {0} / Medlemskaber: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:769 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 msgid "Properties / Memberships" msgstr "Egenskaber / Medlemskaber" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178 +msgid "Apply Changes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 msgid "Create new relation" msgstr "Opret ny relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208 msgid "Edit new relation" msgstr "Ret ny relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209 #, java-format msgid "Edit relation #{0}" msgstr "Ret relation #{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230 +msgid "Basic" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Occupied By" msgstr "Optaget af" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311 msgid "Tags (empty value deletes tag)" msgstr "Tags (tom værdi fjerner tag)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313 msgid "Members" msgstr "Medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 +msgid "Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 msgid "Move the currently selected members up" msgstr "Flyt det nuværende valgte medlem op" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358 +msgid "Add Selected" +msgstr "Tilføj valgte" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359 +msgid "Add all currently selected objects as members" +msgstr "Tilføj alle valgte objekter som medlemmer" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365 +msgid "Remove Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366 +msgid "Remove all currently selected objects from relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 +msgid "Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 msgid "Move the currently selected members down" msgstr "Flyt det nuværende valgte medlem ned" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356 -msgid "Add Selected" -msgstr "Tilføj valgte" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:357 -msgid "Add all currently selected objects as members" -msgstr "Tilføj alle valgte objekter som medlemmer" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:363 -msgid "Remove Selected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:364 -msgid "Remove all currently selected objects from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381 msgid "Remove the member in the current table row from this relation" msgstr "Fjern medlemmet i den nuværende tabelrække fra denne relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394 msgid "Download Members" msgstr "Hent medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:406 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395 msgid "Download all incomplete ways and nodes in relation" msgstr "Hent alle ufuldstændige veje og punkter der er forbundet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:415 -msgid "Basic" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:453 #, java-format msgid "Members: {0}" msgstr "Medlemmer: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:587 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:461 +#, java-format +msgid "Relation Editor: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:585 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 msgid "There were conflicts during import." msgstr "Der var konflikter ved import." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593 msgid "Error parsing server response." msgstr "Fejl i fortolkning af server-svar." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:600 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:594 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:598 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -1116,9 +1143,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:345 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 msgid "Error" msgstr "Fejl" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:599 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597 msgid "Cannot connect to server." msgstr "Kan ikke forbinde til serveren." @@ -1277,5 +1304,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:94 @@ -1285,5 +1312,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 msgid "" @@ -1349,16 +1376,24 @@ msgstr "Valgt: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +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:67 +msgid "Delete the selected relation" +msgstr "Slet de nvalgte relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 #: trans_presets.java:2904 msgid "Relations" msgstr "Relationer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 msgid "Open a list of all relations." msgstr "Åbn en liste over alle relationer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 @@ -1366,17 +1401,9 @@ msgstr "Ny" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 msgid "Create a new relation" msgstr "Opret en ny relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -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:90 -msgid "Delete the selected relation" -msgstr "Slet de nvalgte relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:130 #, java-format msgid "Relations: {0}" @@ -1404,49 +1431,49 @@ msgstr "Kommando-stak: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +msgid "Resolve" +msgstr "Løs" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +msgid "Open a merge dialog of all selected items in the list above." +msgstr "" +"Åben en fletnings-dialogboks for alle valgte elementer i den ovenstående " +"liste." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Conflict" msgstr "Konflikt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 msgid "Merging conflicts." msgstr "Sammenfletnings-konflikter." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67 -msgid "Resolve" -msgstr "Løs" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:68 -msgid "Open a merge dialog of all selected items in the list above." -msgstr "" -"Åben en fletnings-dialogboks for alle valgte elementer i den ovenstående " -"liste." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:105 -msgid "Please select something from the conflict list." -msgstr "Vælg noget fra listen over konflikter." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Resolve Conflicts" msgstr "Udred konflikter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +msgid "Solve Conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 #, java-format msgid "Conflicts: {0}" msgstr "Konflikter: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Conflicts" msgstr "Konflikter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 msgid "conflict" msgstr "konflikt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 msgid "background" msgstr "baggrund" @@ -1470,5 +1497,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 msgid "Customize Color" @@ -1476,5 +1503,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1484,5 +1511,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1491,5 +1518,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:326 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:152 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -1509,5 +1536,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:265 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 #, java-format msgid "Audio synchronized at point {0}." @@ -1515,5 +1542,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232 msgid "Unable to synchronize in layer being played." msgstr "Kan ikke synkronisere i det afspillede lag." @@ -1534,5 +1561,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:958 msgid "desc" msgstr "beskrivelse" @@ -1554,5 +1581,5 @@ msgstr "Fejl ved visning af URL" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -1560,5 +1587,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -1566,18 +1593,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224 msgid "Unable to create new audio marker." msgstr "Kan ikke sætte ny audio-markør" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 msgid "Convert to data layer" msgstr "Konvertér til datalag" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:725 -msgid "" -"Upload of unprocessed GPS data as map data is considered harmful." -"
If you want to upload traces, look here:" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:645 +msgid "" +"Upload of unprocessed GPS data as map data is considered " +"harmful.
If you want to upload traces, look here:" msgstr "" "Upload af ubehandlet GPS-data som kortdata betragtes som skadeligt " @@ -1585,66 +1612,22 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:646 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:747 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:448 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:667 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "Converted from: {0}" msgstr "Konverteret fra: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612 -msgid "Upload this trace..." -msgstr "Upload denne trace..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:616 -msgid "" -"This functionality has been added only recently. Please
use with " -"care and check if it works as expected." -msgstr "" -"Denne funktionalitet er først nyligt blevet tilføjet. Brug
venligst " -"varsomt og tjek om den virker som forventet." - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:102 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:107 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:626 -msgid "Upload track filtered by JOSM" -msgstr "Upload spor filtreret af JOSM" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:103 -#, java-format -msgid "Upload raw file: {0}" -msgstr "Upload rå fil: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:108 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:627 -msgid "Upload raw file: " -msgstr "Upload rå fil: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640 -msgid "Description:" -msgstr "Beskrivelse:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:123 -msgid "Tags:" -msgstr "Tags:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:129 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:648 -msgid "GPX-Upload" -msgstr "GPX-Upload" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:229 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:217 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113 msgid "gps point" msgstr "gps-punkt" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 #: trans_presets.java:1795 trans_presets.java:1801 trans_presets.java:1807 #: trans_presets.java:1813 trans_presets.java:1819 trans_presets.java:1825 @@ -1664,5 +1647,5 @@ msgstr[1] "spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 msgid "point" msgid_plural "points" @@ -1670,5 +1653,5 @@ msgstr[1] "punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 #, java-format msgid "a track with {0} point" @@ -1677,5 +1660,5 @@ msgstr[1] "et spor med {0} punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} consists of {1} track" @@ -1684,5 +1667,5 @@ msgstr[1] "{0} består af {1} spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} point" @@ -1691,25 +1674,25 @@ msgstr[1] "{0} punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117 msgid "Customize line drawing" msgstr "Tilpas linjetegning" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:296 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 msgid "Use global settings." msgstr "Brug globale indstillinger." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 msgid "Draw lines between points for this layer." msgstr "Tegn linjer mellem punkter for dette lag." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:298 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123 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/RawGpsLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:135 msgid "Select line drawing options" @@ -1743,5 +1726,5 @@ msgstr "JPEG-billeder (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290 #, java-format msgid "{0} track, " @@ -1750,5 +1733,5 @@ msgstr[1] "{0} spor, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 #, java-format msgid "{0} route, " @@ -1757,5 +1740,5 @@ msgstr[1] "{0} ruter, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 #, java-format msgid "{0} waypoint" @@ -1764,55 +1747,51 @@ msgstr[1] "{0} punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #, java-format msgid "Name: {0}" msgstr "Navn: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "Description: {0}" msgstr "Beskrivelse: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 msgid "Timespan: " msgstr "Tidshorisont: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Length: " msgstr "Længde: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:642 -msgid "Tags (keywords in GPX):" -msgstr "Tags (nøgleord i GPX):" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:655 msgid "time" msgstr "tid" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:780 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:679 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:700 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 msgid "Download from OSM along this track" msgstr "Hent fra OSM langs dette spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:686 msgid "Download everything within:" msgstr "Hent alt inden for:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 #, java-format msgid "{0} meters" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:692 msgid "Maximum area per request:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 #, java-format msgid "{0} sq km" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787 #, java-format msgid "" @@ -1823,14 +1802,14 @@ "du
at fortsætte?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:844 #, java-format msgid "Audio markers from {0}" msgstr "Lyd-markører fra {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "" "Some waypoints with timestamps from before the start of the track were " @@ -1838,5 +1817,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -1944,19 +1923,19 @@ msgstr "Den indtastede tid kunne ikke forstås." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:140 msgid "outside downloaded area" msgstr "uden for det hentede område" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 #, java-format msgid "{0} consists of:" msgstr "{0} består af:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:353 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:347 #, java-format msgid " ({0} deleted.)" msgstr " ({0} slettet.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:445 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 msgid "Convert to GPX layer" msgstr "Konvertér til GPX-lag" @@ -1984,37 +1963,37 @@ msgstr "Kunne ikke gemme bogmærke." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 msgid "The geographic longitude at the mouse pointer." msgstr "Den geografiske længdegrad ved musemarkøren." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The name of the object at the mouse pointer." msgstr "Navnet på objektet ved musemarkøren." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 msgid "The geographic latitude at the mouse pointer." msgstr "Den geografiske breddegrad ved musemarkøren." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The angle between the previous and the current way segment." msgstr "Vinklen mellem det forrige og det nuværende vejstykke." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The (compass) heading of the line segment being drawn." msgstr "(Kompas)retningen af det tegnede linjestykke." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The length of the new way segment being drawn." msgstr "Længden af det nytegnede vejstykke." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:160 msgid "(no object)" msgstr "(intet objekt)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:62 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:56 msgid "Color" msgstr "Farve" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:57 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107 #: trans_presets.java:56 trans_presets.java:92 trans_presets.java:130 @@ -2115,27 +2094,36 @@ msgstr "Navn" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:118 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:112 #, java-format msgid "Paint style {0}: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 msgid "Choose" msgstr "Vælg" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 msgid "Please select a color." msgstr "Vælg venligst en farve." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 #, java-format msgid "Choose a color for {0}" msgstr "Vælg en farve for {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +msgid "Set to default" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:172 +msgid "Set all to default" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:184 msgid "Colors used by different objects in JOSM." msgstr "Farver brugt af forskellige objekter i JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:171 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:198 msgid "Colors" msgstr "Farver" @@ -2170,7 +2158,7 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45 msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transfered in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." +"WARNING: The password is stored in plain text in the preferences " +"file.
The password is transfered in plain text to the server, encoded in " +"the URL.
Do not use a valuable Password." msgstr "" "ADVARSEL: Kodeordet er gemt i klar tekst.
Det bliver sendt i klar " @@ -2178,18 +2166,18 @@ "kodeord." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44 msgid "Sort presets menu" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46 msgid "Enable built-in defaults" msgstr "Bug indbyggede standarter" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:58 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69 msgid "Tagging preset source" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:156 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 @@ -2197,5 +2185,5 @@ msgstr "Vælg venligst rækken, der skal rettes." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500 @@ -2204,24 +2192,24 @@ msgstr "Vælg venligst rækken, der skal slettes" +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88 +msgid "" +"The sources (URL or filename) of tagging preset definition files. See " +"http://josm.openstreetmap.de/wiki/TaggingPresets for help." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89 -msgid "" -"The sources (URL or filename) of tagging preset definition files. See http://" -"josm.openstreetmap.de/wiki/TaggingPresets for help." +msgid "Add a new tagging preset source to the list." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 -msgid "Add a new tagging preset source to the list." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 msgid "Delete the selected source from the list." msgstr "Slet den valgte kilde fra listen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:94 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93 msgid "Tagging Presets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97 msgid "Tagging preset sources" msgstr "" @@ -2235,6 +2223,6 @@ msgstr "Gem backup-filer med ~ i slutningen af filnavnet, når der gemmes" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:141 @@ -2242,34 +2230,34 @@ msgstr "Udvidelser" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 msgid "Configure available plugins." msgstr "Indstil tilgængelige udvidelser" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43 msgid "Download List" msgstr "Hent liste" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:80 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51 msgid "Update" msgstr "Opdater" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:60 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 msgid "Configure Sites..." msgstr "Indstil sites..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add either site-josm.xml or Wiki Pages." msgstr "Tilføj enten site-josm.xml eller Wiki-sider." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99 msgid "Please select an entry." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 msgid "Configure Plugin Sites" msgstr "Indstil udvidelses-sites" @@ -2445,9 +2433,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "Display Settings" msgstr "Indstillinger for visning" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "" "Various settings that influence the visual representation of the whole " @@ -2457,55 +2445,63 @@ "prorammet." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings" msgstr "Indstillinger for forbindelse" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings for the OSM server." msgstr "Indstillinger for forbindelse til OSM-serveren" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Map Settings" msgstr "Indstillinger for kort" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Settings for the map projection and data interpretation." msgstr "Indstilinger for projicering af kort og datafortolkning" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Audio Settings" msgstr "Lydindstillinger" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Settings for the audio player and audio markers." msgstr "Indstillinger for lydafspiller og lydmarkører" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97 msgid "You have to restart JOSM for some settings to take effect." msgstr "Du skal genstarte JOSM for at nogle af ændringerne træder i kraft." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:25 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 msgid "Draw lines between raw gps points." msgstr "Tegn linjer mellem rå GPS-punkter." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:27 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 msgid "Force lines if no segments imported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:28 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 msgid "Draw large GPS points." msgstr "Tegn store GPS-punkter." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 -msgid "Color tracks by velocity." -msgstr "Farvelæg spor ud fra hastighed." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34 +msgid "Velocity (red = slow, green = fast)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 +msgid "Dilution of Position (red = high, green = low, if available)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 +msgid "Single Color (can be customized for named layers)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:1346 msgid "Car" msgstr "Bil" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:309 trans_presets.java:635 trans_presets.java:833 #: trans_presets.java:842 trans_presets.java:851 trans_presets.java:864 @@ -2517,5 +2513,5 @@ msgstr "Cykel" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:310 trans_presets.java:637 trans_presets.java:832 #: trans_presets.java:841 trans_presets.java:850 trans_presets.java:863 @@ -2526,44 +2522,44 @@ msgstr "Gående" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 msgid "Draw Direction Arrows" msgstr "Tegn retningspile." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 msgid "Fast drawing (looks uglier)" msgstr "Hurtig optegning (ser grimmere ud)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180 msgid "Only interesting direction hints (e.g. with oneway tag)." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:186 msgid "Only on the head of a way." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44 msgid "Draw segment order numbers" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45 msgid "Draw boundaries of downloaded data" msgstr "Tegn omfang af hentet data" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46 msgid "Draw virtual nodes in select mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47 msgid "Draw inactive layers in other color" msgstr "Tegn inaktive lag i anden farve" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 msgid "Smooth map graphics (antialiasing)" msgstr "Udglattet kortgrafik (antialiasing)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 msgid "" "If your gps device draws too few lines, select this to draw lines along your " @@ -2571,78 +2567,97 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:71 msgid "" "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73 msgid "Maximum length (meters)" msgstr "Maksimal længde (meter)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:77 msgid "" "Force drawing of lines if the imported data contain no line information." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:84 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89 msgid "Draw direction arrows for lines, connecting GPS points." msgstr "Tegn retningspile for linjer, som forbinder GPS-punkter." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90 -msgid "Draw the direction arrows using table lookups instead of complex math." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95 +msgid "" +"Draw the direction arrows using table lookups instead of complex math." msgstr "" "Tegn retningspile ved hjælp af tabelopslag i stedet for kompleks matematik." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:96 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:101 msgid "" "Don't draw arrows if they are not at least this distance away from the last " "one." -msgstr "Tegn ikke pile, hvis de ikke er mindst denne afstand fra den forrige." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99 +msgstr "" +"Tegn ikke pile, hvis de ikke er mindst denne afstand fra den forrige." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104 msgid "Minimum distance (pixels)" msgstr "Minimal distance (pixels)" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:109 -msgid "Choose the hue for the track color by the velocity at that point." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116 -msgid "Allows to tune the track coloring for different average speeds." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122 msgid "Draw larger dots for the GPS points." msgstr "Tegn større prikker for GPS-punkter." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136 +msgid "" +"All points and track segments will have the same color. Can be customized in " +"Layer Manager." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137 +msgid "Colors points and track segments by velocity." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:138 +msgid "" +"Colors points and track segments by dilution of position (HDOP). Your " +"capture device needs to logs that information." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143 +msgid "Allows to tune the track coloring for different average speeds." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148 +msgid "Track and Point Coloring" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 msgid "GPS Points" msgstr "GPS-punkter" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175 msgid "Draw direction hints for way segments." msgstr "Tegn retningsvisere på vejstykker" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:163 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192 msgid "Draw the order numbers of all segments within their way." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:168 -msgid "Apply antialiasing to the map view resulting in a smoother appearance." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:197 +msgid "" +"Apply antialiasing to the map view resulting in a smoother appearance." msgstr "Brug udjævning på kortvisningen for et mere glat udseende." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202 msgid "Draw the boundaries of data loaded from the server." msgstr "Tegn omridset af data hentet fra serveren." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:178 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:207 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212 msgid "Draw the inactive data layers in a different color." msgstr "Tegn inaktive datalag i en anden farve." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219 msgid "OSM Data" msgstr "OSM-data" @@ -2755,6 +2770,6 @@ "a menu entry of button for the first time. So some of your changes may " "become active even without restart --- but also without collistion handling. " -"This is another reason to restart JOSM after making any changes here." -"

" +"This is another reason to restart JOSM after making any changes " +"here.

" msgstr "" "

Ydermere, genvejene aktiveres når handlingerne er tildelt til et " @@ -2772,8 +2787,9 @@ "key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also " "there will be 'keys' listed that correspond to a shortcut on your keyboard " -"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/" -"Semicolon on US keyboards, '.'/Period on German keyboards, ...) instead. Not " -"doing so may result in conflicts, as there is no way for JOSM to know that " -"Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...

" +"(e.g. ':'/Colon). Please also do not use them, use the base key " +"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) " +"instead. Not doing so may result in conflicts, as there is no way for JOSM " +"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US " +"keyboard...

" msgstr "" @@ -2797,6 +2813,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183 msgid "" -"

The pseudo-modifier 'disabled' will disable the shortcut when encountered." -"

" +"

The pseudo-modifier 'disabled' will disable the shortcut when " +"encountered.

" msgstr "" @@ -2866,67 +2882,67 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:231 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:236 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:250 msgid "layer not in list." msgstr "lag er ikke i listen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "usage" msgstr "brug" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 msgid "options" msgstr "valgmuligheder" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 msgid "Show this help" msgstr "Vis denne hjælp" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Standard unix geometry argument" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 msgid "Download the bounding box" msgstr "Hent det omsluttende område" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Open file (as raw gps, if .gpx)" msgstr "Åbn fil (som rå GPS, hvis .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 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:144 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Select with the given search" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 msgid "Don't launch in fullscreen mode" msgstr "Start ikke op i fuldskærm" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 msgid "Reset the preferences to default" msgstr "Nulstil indstillingerne til standard" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 msgid "Set the language." msgstr "Vælg sprog." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 msgid "examples" msgstr "eksempler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -2934,21 +2950,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 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:161 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 msgid "Activating updated plugins" msgstr "Aktiverer opdaterede udvidelser" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 msgid "Loading early plugins" msgstr "Henter indledende udvidelser" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Setting defaults" msgstr "Sætter standardværdier" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171 msgid "Loading plugins" msgstr "Henter udvidelser" @@ -2982,6 +2998,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:108 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:164 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:162 #: trans_presets.java:308 trans_presets.java:309 trans_presets.java:310 #: trans_presets.java:311 trans_presets.java:312 trans_presets.java:313 @@ -2998,5 +3014,5 @@ msgstr "ukendt" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:66 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 #, java-format msgid "" @@ -3007,25 +3023,25 @@ "påkrævet." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 #, java-format msgid "Plugin requires JOSM update: {0}." msgstr "Udvidelse kræver en JOSM-opdatering: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "Udvidelsen {0} kræves af udvidelsen {1}, men blev ikke fundet." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 #, java-format msgid "Plugin not found: {0}." msgstr "Udvidelsen blev ikke fundet: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Seneste udvidelsesopdatering mere end {0} dage siden." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 msgid "" "(You can change the number of days after which this warning appears
by " @@ -3035,17 +3051,17 @@ "indstillingen 'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 msgid "Disable plugin" msgstr "Deaktivér udvidelse." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Kunne ikke indlæse udvidelsen {0}. Fjern fra indstillinger?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -3053,5 +3069,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 #, java-format msgid "" @@ -3059,10 +3075,10 @@ msgstr "En uventet fejl opstod, som kan stamme fra \"{0}\"-udvidelsen." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Ifølge udvidelsen medfølgende information, så er {0} forfatteren." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:262 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -3071,9 +3087,9 @@ "fejlrapport." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 msgid "Should the plugin be disabled?" msgstr "Skal udvidelsen deaktiveres?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:278 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -3083,5 +3099,5 @@ "udvidelsen." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -3091,6 +3107,6 @@ "fra, om problemet." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:322 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:181 msgid "no description available" msgstr "Ingen beskrivelse er tilgængelig" @@ -3102,5 +3118,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 msgid "Update Plugins" msgstr "Opdater udvidelser" @@ -3122,5 +3138,6 @@ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." msgstr[0] "{0} udvidelse blev succesfuldt opdateret. Genstart venligst JOSM." -msgstr[1] "{0} udvidelser blev succesfuldt opdateret. Genstart venligst JOSM." +msgstr[1] "" +"{0} udvidelser blev succesfuldt opdateret. Genstart venligst JOSM." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:138 @@ -3135,5 +3152,5 @@ msgstr "Udvidelsen {0} forekommer itu eller kunne ikke hentes automatisk." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 #, java-format msgid "Downloaded plugin information from {0} site" @@ -3142,13 +3159,13 @@ msgstr[1] "Hent udvidelsesinformationer fra {0} sites" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 msgid "No plugin information found." msgstr "Ingen udvidelsesinformationer blev fundet." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:76 msgid "All installed plugins are up to date." msgstr "Alle installerede udvidelser er opdaterede." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 #, java-format msgid "" @@ -3161,9 +3178,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:105 msgid "Download missing plugins" msgstr "Hent manglende udvidelser" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:106 #, java-format msgid "" @@ -3176,22 +3193,22 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 msgid "Download Plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:170 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:168 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Version {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:176 msgid "Plugin bundled with JOSM" msgstr "Udvidelse som følger med JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208 msgid "Plugin already exists" msgstr "Udvidelsen findes allerede" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:211 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:209 #, java-format msgid "" @@ -3206,15 +3223,15 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 msgid "Delete and Download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:222 #, java-format msgid "Error deleting plugin file: {0}" msgstr "Fejl ved sletning af udvidelsesfil: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:281 #, java-format msgid "Error reading plugin information file: {0}" @@ -3281,10 +3298,10 @@ msgstr "Slet {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:165 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 msgid "Conflicting relation" msgstr "Modstridende relation" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 #, java-format msgid "" @@ -3295,5 +3312,5 @@ "Slet fra relation?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:166 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 #, java-format msgid "" @@ -3310,7 +3327,7 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:349 msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" +"You are about to delete nodes outside of the area you have " +"downloaded.
This can cause problems because other objects (that you don't " +"see) might use them.
Do you really want to delete?" msgstr "" @@ -3433,124 +3450,135 @@ msgstr "Kunne ikke hente indstillinger fra serveren." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:232 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:426 +msgstr "En vej af typen Område er ikke lukket." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:428 #, 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:527 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:765 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:776 msgid "Empty member in relation." msgstr "Tomt medlem i relation." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:767 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:531 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Slettede medlem \"{0}\" i relation" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:547 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 #, 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:552 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:549 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:558 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:561 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 +msgid "More than one \"via\" found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 #, java-format msgid "Unknown role ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 #, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 msgid "No \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 msgid "No \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -msgid "No \"via\" node found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +msgid "No \"via\" node or way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:636 -#, java-format -msgid "The \"{0}\" way must contain at least 2 nodes." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:731 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +msgid "The \"to\" way doesn't start or end at a \"via\" node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:620 +msgid "The \"from\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:624 +msgid "The \"to\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:742 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 #, 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:798 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:847 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:858 #, 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:927 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:949 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:987 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:998 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1012 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1023 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1195 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1206 msgid "untagged" msgstr "utagget" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1196 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207 msgid "text" msgstr "tekst" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" msgstr "inaktiv" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:94 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:181 @@ -3558,13 +3586,13 @@ msgstr "valgt" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" msgstr "utagget vej" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 msgid "incomplete way" msgstr "ukomplet vej" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 msgid "highlight" msgstr "" @@ -3586,5 +3614,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:113 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:89 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:77 msgid "incomplete" @@ -3614,14 +3642,14 @@ msgstr[1] "{0} medlemmer" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 msgid "Duplicate" msgstr "Duplikér" +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 +msgid "Duplicate selection by copy and immediate paste." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 -msgid "Duplicate selection by copy and immediate paste." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 @@ -3630,5 +3658,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -3699,6 +3727,8 @@ msgstr "Vis historisk information om OSM-veje eller -punkter" -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:57 -msgid "Please select at least one node, way or relation." +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:60 +msgid "" +"Please select at least one node, way or relation. Only already uploaded " +"elements have a history." msgstr "" @@ -3721,7 +3751,7 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/TerracerAction.java:47 @@ -3748,9 +3778,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:124 msgid "Distribute Nodes" -msgstr "" +msgstr "Fordel punkter" #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 msgid "Distribute the selected nodes to equal distances along a line." -msgstr "" +msgstr "Fordel de valgte punkter med samme afstand langs en linje." #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68 @@ -3859,5 +3889,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:123 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:314 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:315 msgid "Enter values for all conflicts." msgstr "Indtast værdier for alle konflikter." @@ -3865,5 +3895,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 msgid "Solve Conflicts" msgstr "" @@ -3997,5 +4027,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #, java-format @@ -4022,17 +4052,19 @@ msgstr[1] "De valgte punkter er ikke i midten af nogen vej." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125 -msgid "" -"There is more than one way using the node(s) you selected. Please select the " +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 +msgid "" +"There is more than one way using the node you selected. Please select the " "way also." -msgstr "" -"Der er mere end en vej, som benytter de(t) punkt(er), du har valgt. Vælg " -"venligst også vejen." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133 +msgid_plural "" +"There is more than one way using the nodes you selected. Please select the " +"way also." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137 msgid "The selected nodes do not share the same way." msgstr "De valgte punkter deler ikke samme vej." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -4040,10 +4072,10 @@ msgstr[1] "Den valgte vej indeholder ikke alle valgte punkter." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229 msgid "You must select two or more nodes to split a circular way." msgstr "Du skal vælge mindst to punkter for at opdele en kredsformig vej" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -4053,5 +4085,5 @@ "vejen.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 msgid "" "A role based relation membership was copied to all new ways.\n" @@ -4059,5 +4091,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:296 #, java-format msgid "Split way {0} into {1} parts" @@ -4444,5 +4476,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 msgid "Align Nodes in Circle" msgstr "Opstil punkter i cirkel" @@ -4456,5 +4488,5 @@ msgstr "Nogle af punkterne er (næsten) på linjen" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 msgid "Please select at least four nodes." msgstr "Vælg mindst fire punkter." @@ -4517,4 +4549,32 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222 msgid "An error occurred while restoring backup file." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "" +"Show status report with useful information that can be attached to bugs" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92 +msgid "Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +msgid "Copy to clipboard and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 +msgid "Close" msgstr "" @@ -4528,13 +4588,13 @@ msgstr "Omgør seneste fortrydelse" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:44 msgid "Delete Mode" msgstr "Slette-tilstand" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:46 msgid "Delete nodes or ways." msgstr "Slet punkter eller veje." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:84 @@ -4545,5 +4605,5 @@ msgstr "Tilstand: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:130 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -4555,6 +4615,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:87 msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." +"Drag play head and release near track to play audio from there; " +"SHIFT+release to synchronize audio at that point." msgstr "" @@ -4568,23 +4628,23 @@ msgstr "Opret områder" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 msgid "Extrude Way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:252 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:416 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:430 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/ExtrudeAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 msgid "Draw a rectangle of the desired size, then release the mouse button." msgstr "Tegn en firkant af passende størrelse og slip så museknappen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:420 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:434 msgid "Release the mouse button to stop rotating." msgstr "Slip museknappen for at stoppe rotationen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 msgid "Drag a way segment to make a rectangle." msgstr "" @@ -4652,14 +4712,14 @@ msgstr "Vælg, flyt og rotér objekter" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:191 msgid "Add and move a virtual new node to way" msgstr "Tilføj og flyt et virtuelt nyt punkt til vej" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:220 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:223 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 msgid "Cannot move objects outside of the world." msgstr "Kan ikke flytte objekter ud af verden." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:418 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:432 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -4668,5 +4728,5 @@ "nærmeste punkt." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:422 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:436 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to remove); Shift-" @@ -4739,30 +4799,30 @@ msgstr "Foren {0} punkter" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Orthogonalize Shape" msgstr "Gør vinkler rette" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 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:60 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 msgid "Only two nodes allowed" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 msgid "Selection must consist only of ways." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 msgid "Please select one or more closed ways of at least four nodes." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:90 +msgstr "Vælg venligst en eller flere lukkede veje på mindst fire punkter." + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 msgid "Please select ways with almost right angles to orthogonalize." msgstr "Vælg venligst veje med næsten rette vinkler at gøre retvinklet." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -4771,9 +4831,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "Only one node selected" msgstr "Kun et punkt er valgt" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 msgid "Orthogonalize" msgstr "" @@ -4824,6 +4884,8 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101 -msgid "Please select exactly three nodes or one way with exactly three nodes." -msgstr "Vælg venligst præcis tre punkter eller en vej med præcis tre punkter." +msgid "" +"Please select exactly three nodes or one way with exactly three nodes." +msgstr "" +"Vælg venligst præcis tre punkter eller en vej med præcis tre punkter." #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121 @@ -4831,52 +4893,69 @@ msgstr "De punkter ligger ikke i en cirkel." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../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:71 +msgid "Update Data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:72 +#, java-format +msgid "" +"This action will require {0} individual download requests. Do you wish to " +"continue?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 msgid "Open Location..." msgstr "Åbn placering..." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 msgid "Open an URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 msgid "Separate Layer" msgstr "Separat lag" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 msgid "Enter URL to download:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 msgid "Download Location" msgstr "Hent lokalitet" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 msgid "Download URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 msgid "Add Node..." msgstr "Tilføj punkt..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 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:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 msgid "Enter the coordinates for the new node." msgstr "Indtast koordinater for nyt punkt." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 msgid "Use decimal degrees." msgstr "Brug decimaltal i grader." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negative værdier angiver vestlig/sydlig halvkugle." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 #: ../plugins/livegps/livegps/LiveGpsDialog.java:54 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93 @@ -4885,5 +4964,5 @@ msgstr "Breddegrad" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 #: ../plugins/livegps/livegps/LiveGpsDialog.java:56 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96 @@ -4926,14 +5005,14 @@ msgstr "Flytter objekterne {0}" +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "Overwrite" msgstr "Overskriv" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "File exists. Overwrite?" msgstr "Filen findes allerede. Overskriv?" @@ -4952,42 +5031,47 @@ msgstr "Vælg venligst noget at kopiere." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Adskil veje" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 msgid "This node is not glued to anything else." msgstr "Dette punkt er ikke forbundet til noget andet." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 msgid "None of these nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of this way's nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 msgid "The current selection cannot be used for unglueing." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "Select either:" msgstr "Vælg enten:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +msgid "* One tagged node, or" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 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:103 -msgid "* One node that is used by more than one way and one of those ways, or" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +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:104 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -4996,5 +5080,5 @@ "eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -5003,5 +5087,5 @@ "vej." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -5011,10 +5095,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:160 +msgid "Unglued Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:373 #, java-format msgid "Dupe into {0} nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:320 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:397 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -5115,5 +5203,5 @@ msgstr "Fortryd den sidste handling" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 msgid "No Shortcut" msgstr "Ingen genvej" @@ -5135,13 +5223,13 @@ msgstr "OpenStreetMap-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:29 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:28 msgid "Downloading GPS data" msgstr "Henter GPS-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:41 msgid "Downloaded GPX Data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:71 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:69 msgid "Raw GPS data" msgstr "Rå GPS-data" @@ -5362,5 +5450,6 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169 -msgid "Header contains several values and cannot be mapped to a single string" +msgid "" +"Header contains several values and cannot be mapped to a single string" msgstr "" @@ -5488,5 +5577,6 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 msgid "A plugin that allows JOSM to be controlled from other applications." -msgstr "En udvidelse, som tillader JOSM at blive styret fra andre programmer." +msgstr "" +"En udvidelse, som tillader JOSM at blive styret fra andre programmer." #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 @@ -5527,5 +5617,5 @@ #: ../plugins/terracer/src/terracer/TerracerAction.java:91 msgid "Select a single, closed way of four nodes." -msgstr "" +msgstr "Vælg en enkelt, lukket vej med fire punkter." #: ../plugins/terracer/src/terracer/TerracerAction.java:155 @@ -5713,5 +5803,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69 -msgid "Maximum number of segments allowed in each generated way. Default 250." +msgid "" +"Maximum number of segments allowed in each generated way. Default 250." msgstr "" @@ -5730,6 +5821,7 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72 msgid "" -"Accuracy of Douglas-Peucker line simplification, measured in degrees." -"
Lower values give more nodes, and more accurate lines. Default 0.0003." +"Accuracy of Douglas-Peucker line simplification, measured in " +"degrees.
Lower values give more nodes, and more accurate lines. Default " +"0.0003." msgstr "" @@ -6135,5 +6227,5 @@ #, java-format msgid "leisure type {0}" -msgstr "fritids-type {0}" +msgstr "rekreations-type {0}" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97 @@ -6269,5 +6361,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 msgid "This test checks for untagged nodes that are not part of any way." -msgstr "Denne test tjekker for utaggede punkter, som ikke er del af nogen vej." +msgstr "" +"Denne test tjekker for utaggede punkter, som ikke er del af nogen vej." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:140 @@ -6368,6 +6461,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:509 msgid "" -"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." -"org/index.php/User:JLS/speller) or tag checking data files." +"The sources (URL or filename) of spell check (see " +"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking " +"data files." msgstr "" @@ -6825,6 +6919,6 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:40 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:43 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 #, java-format @@ -6832,18 +6926,29 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:51 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:55 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 msgid "Contacting WMS Server..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157 msgid "Create buildings" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 msgid "CadastreGrabber: Illegal url." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +msgid "" +"To avoid cadastre WMS overload,\n" +"building import size is limited to 1 km2 max." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" @@ -6866,16 +6971,25 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:128 +msgid "Cadastre" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:139 +msgid "Auto sourcing" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164 +msgid "Invalid projection" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 +#, java-format +msgid "Change the projection to {0} first." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:169 msgid "" "To enable the cadastre WMS plugin, change\n" "the JOSM projection to Lambert and restart" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132 -msgid "Cadastre" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 -msgid "Auto sourcing" msgstr "" @@ -6948,6 +7062,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:43 msgid "" -"More than one WMS layer present.\n" -"Select one of them first, then retry." +"More than one WMS layer present\n" +"Select one of them first, then retry" msgstr "" @@ -6956,5 +7070,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136 #, java-format @@ -6964,13 +7078,13 @@ msgstr[1] "Forenkl vej (fjern {0} punkter)" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61 msgid "Extract SVG ViewBox..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65 msgid "Extract best fitting boundary..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:120 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126 msgid "Create boundary" msgstr "" @@ -6980,5 +7094,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 msgid "Blank Layer" -msgstr "" +msgstr "Tomt lag" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182 @@ -7006,15 +7120,15 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 msgid "Save WMS layer to file" msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "Load WMS layer from file" msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -7022,5 +7136,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 msgid "File Format Error" msgstr "" @@ -7028,5 +7142,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 msgid "Error loading file" msgstr "" @@ -7052,52 +7166,53 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 msgid "Replace original background by JOSM background color." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30 msgid "Reverse grey colors (for black backgrounds)." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 msgid "Set background transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34 msgid "Draw boundaries of downloaded data." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Enable automatic caching." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:53 -msgid "" -"A special handler of the french cadastre wms at www.cadastre.gouv." -"fr

Please read the Terms and Conditions of Use here (in french): " -"
http://www.cadastre.gouv.fr/scpc/html/" -"CU_01_ConditionsGenerales_fr.html
before any upload of data created " -"by this plugin." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:58 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:55 +msgid "" +"A special handler of the french cadastre wms at " +"www.cadastre.gouv.fr

Please read the Terms and Conditions of Use here " +"(in french):
" +"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " +"
before any upload of data created by this plugin." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -7105,26 +7220,40 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 -msgid "" -"Invert the original texts from black to white (and all intermediate greys)." +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +msgid "" +"Invert the original black and white colors (and all intermediate greys). " +"Useful for texts on dark backgrounds." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 +msgid "Allows multiple layers stacking" msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 -msgid "Allows multiple layers stacking" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:99 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:113 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 msgid "Image grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:162 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:125 +msgid "Grab smaller images (higher quality but use more memory)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +msgid "Fixed size square (default is 100m)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +msgid "Fixed size (from 25 to 1000 meters)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -7210,5 +7339,5 @@ #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." -msgstr "" +msgstr "\"{0}\" er ikke lukket og kan derfor ikke blive forbundet." #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:169 @@ -7227,5 +7356,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:186 msgid "Please select at least one closed way the should be joined." -msgstr "" +msgstr "Vælg mindst en lukket vej, som skal forbindes." #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:194 @@ -7233,5 +7362,5 @@ msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:254 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:255 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -7372,7 +7501,7 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:203 msgid "" -"Take a photo of your GPS receiver while it displays the time." -"
Display that photo here.
And then, simply capture the time you read " -"on the photo and select a timezone
" +"Take a photo of your GPS receiver while it displays the " +"time.
Display that photo here.
And then, simply capture the time you " +"read on the photo and select a timezone
" msgstr "" @@ -7439,5 +7568,6 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:484 -msgid "I can take a picture of my GPS receiver.
Can this help?" +msgid "" +"I can take a picture of my GPS receiver.
Can this help?" msgstr "" @@ -7481,5 +7611,5 @@ msgstr "Ugyldig tidszone" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #, java-format msgid "" @@ -7488,14 +7618,14 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:579 msgid "Invalid offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:641 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:643 #, java-format msgid "Found {0} matchs of {1} in GPX track {2}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:642 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:644 msgid "GPX Track loaded" msgstr "GPX-spor hentet" @@ -7503,5 +7633,5 @@ #: ../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/UploadDataGui.java:79 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 msgid "Upload Traces" msgstr "" @@ -7511,58 +7641,72 @@ msgstr "" +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71 +msgid "Upload Trace" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +msgid "Public" +msgstr "" + #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 -msgid "Upload GPX track" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -msgid "Public" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 msgid "Selected makes your trace public in openstreetmap.org" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Description" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:123 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 msgid "Tags" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:182 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:153 +#, java-format +msgid "Selected track: {0}" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:176 msgid "Connecting..." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 -msgid "Uploading GPX track..." -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:214 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:199 +msgid "Upload cancelled" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:209 +msgid "Error while uploading" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:227 -msgid "Error while uploading" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:235 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +msgid "Upload failed. Server returned the following message: " +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 +#, java-format +msgid "Uploading GPX track: {0}% ({1} of {2})" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:252 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:241 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:244 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "" @@ -7739,5 +7883,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:149 msgid "Open a blank WMS layer to load data from a file" -msgstr "" +msgstr "Åbn et tomt WMS-lag for at hente data fra en fil" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 @@ -7783,32 +7927,32 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:232 msgid "Download visible tiles" msgstr "Hent synlige tern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241 msgid "Change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:253 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:264 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:271 msgid "Alpha channel" msgstr "" @@ -8137,5 +8281,5 @@ #: trans_style.java:1549 trans_style.java:1557 trans_style.java:1565 msgid "leisure" -msgstr "" +msgstr "rekreation" #: trans_style.java:1493 @@ -10504,5 +10648,5 @@ #: trans_presets.java:1723 msgid "Leisure" -msgstr "" +msgstr "Rekreation" #: trans_presets.java:1724 @@ -12677,4 +12821,7 @@ msgstr "" +#~ msgid "Please select something from the conflict list." +#~ msgstr "Vælg noget fra listen over konflikter." + #~ msgid "OSM History Information" #~ msgstr "OSM historik" @@ -12684,12 +12831,12 @@ #~ msgid "" -#~ "This is the basic relation editor which allows you to change the " -#~ "relation's tags as well as the members. In addition to this we should " -#~ "have a smart editor that detects the type of relationship and limits your " -#~ "choices in a sensible way." +#~ "This is the basic relation editor which allows you to change the relation's " +#~ "tags as well as the members. In addition to this we should have a smart " +#~ "editor that detects the type of relationship and limits your choices in a " +#~ "sensible way." #~ msgstr "" -#~ "Dette er den grundlæggende relations-editor, som giver dig mulighed for " -#~ "at rette relationens tags såvel som medlemmernes. Ydermere burde vi have " -#~ "en indsigtsfuld editor, som bemærker typen af relation og begrænser på en " +#~ "Dette er den grundlæggende relations-editor, som giver dig mulighed for at " +#~ "rette relationens tags såvel som medlemmernes. Ydermere burde vi have en " +#~ "indsigtsfuld editor, som bemærker typen af relation og begrænser på en " #~ "hensigtsmæssig måde." @@ -12697,7 +12844,37 @@ #~ msgstr "Fremhæv medlemmet fra den nuværende tabelrække som JOSM's valg" +#~ msgid "Upload this trace..." +#~ msgstr "Upload denne trace..." + +#~ msgid "" +#~ "This functionality has been added only recently. Please
use with " +#~ "care and check if it works as expected." +#~ msgstr "" +#~ "Denne funktionalitet er først nyligt blevet tilføjet. Brug
venligst " +#~ "varsomt og tjek om den virker som forventet." + +#~ msgid "Upload track filtered by JOSM" +#~ msgstr "Upload spor filtreret af JOSM" + +#~ msgid "Description:" +#~ msgstr "Beskrivelse:" + +#~ msgid "Tags (keywords in GPX):" +#~ msgstr "Tags (nøgleord i GPX):" + +#~ msgid "GPX-Upload" +#~ msgstr "GPX-Upload" + +#, java-format +#~ msgid "Upload raw file: {0}" +#~ msgstr "Upload rå fil: {0}" + +#~ msgid "Tags:" +#~ msgstr "Tags:" + #~ msgid "Unknown type" #~ msgstr "Ukendt type" +#, java-format #~ msgid "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..." #~ msgstr "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} tilbage)..." @@ -12721,4 +12898,5 @@ #~ msgstr "Geografi" +#, java-format #~ msgid "Version: {0}
Last change at {1}" #~ msgstr "Version: {0}
Seneste ændring ved {1}" @@ -12736,10 +12914,13 @@ #~ msgstr "SurveyorPlugin" +#, java-format #~ msgid "Version {0} - Last change at {1}" #~ msgstr "Version {0} - Seneste ændring ved {1}" +#, java-format #~ msgid "Data error: lat value \"{0}\" is out of bounds." #~ msgstr "Datafejl: bredde-værdi \"{0}\" er uden for grænserne." +#, java-format #~ msgid "Data error: lon value \"{0}\" is out of bounds." #~ msgstr "Datafejl: længde-værdi \"{0}\" er uden for grænserne." Index: /applications/editors/josm/i18n/po/de.po =================================================================== --- /applications/editors/josm/i18n/po/de.po (revision 13832) +++ /applications/editors/josm/i18n/po/de.po (revision 13833) @@ -9,6 +9,6 @@ "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-15 22:03+0100\n" -"PO-Revision-Date: 2009-02-15 20:16+0000\n" +"POT-Creation-Date: 2009-02-21 16:35+0100\n" +"PO-Revision-Date: 2009-02-21 21:23+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Deutsch\n" @@ -17,8 +17,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-02-15 20:41+0000\n" +"X-Launchpad-Export-Date: 2009-02-22 20:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 #, java-format msgid "" @@ -32,5 +32,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 msgid "" "This action will have no shortcut.\n" @@ -40,5 +40,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -49,7 +49,8 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 msgid "(Hint: You can edit the shortcuts in the preferences.)" -msgstr "(Hinweis: Sie können die Tastaturkürzel in den Einstellungen ändern.)" +msgstr "" +"(Hinweis: Sie können die Tastaturkürzel in den Einstellungen ändern.)" #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 @@ -58,17 +59,17 @@ #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 msgid "Information" msgstr "Information" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Do nothing" msgstr "Keine Aktion" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Report Bug" msgstr "Fehler melden" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 msgid "" "An unexpected exception occurred.\n" @@ -84,14 +85,14 @@ "melden." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Unexpected Exception" msgstr "Unerwartete Fehlersituation" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 #, java-format msgid "Please report a ticket at {0}" msgstr "Bitte melden Sie den Fehler unter {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" @@ -99,5 +100,5 @@ "notwendigen Schritte bei!" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:78 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -107,9 +108,9 @@ "und aller Plugins, bevor Sie den Fehler melden." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Be sure to include the following information:" msgstr "Stellen Sie sicher, dass folgende Informationen enthalten sind:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75 msgid "(The text has already been copied to your clipboard.)" msgstr "(Der Text wurde bereits in Ihre Zwischenablage kopiert.)" @@ -123,5 +124,5 @@ msgstr "Fehler bei der Klangausgabe" -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:94 @@ -129,5 +130,5 @@ msgstr "Verbindung zum OSM-Server..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:48 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:32 @@ -135,10 +136,10 @@ msgstr "OSM-Daten herunterladen..." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 msgid "NullPointerException, possibly some missing tags." msgstr "NullPointerException, vielleicht fehlende Merkmale." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83 msgid "Preparing data..." msgstr "Daten werden vorbereitet...." @@ -168,35 +169,35 @@ msgstr "Punkte {0} bis {1} werden heruntergeladen..." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:164 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:168 msgid "Unknown version" msgstr "Unbekannte Version" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 msgid "Found element in non-way." msgstr "Ein Element in einem Nicht-Weg gefunden." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 msgid " has zero ref" msgstr " hat Null ref" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 msgid "Found element in non-relation." msgstr "-Schlüssel bei einer Nicht-Relation gefunden." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:252 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250 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:294 msgid "Illegal object with id=0" msgstr "Illegales Objekt mit id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Erforderliches Attribut \"{0}\" nicht vorhanden." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 #, java-format msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" @@ -204,13 +205,13 @@ "Überspringe einen Weg, weil er einen nichtexistenten Knoten besitzt: {0}\n" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:502 msgid "Prepare OSM data..." msgstr "OSM-Daten werden vorbereitet...." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:518 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:516 msgid "Ill-formed node id" msgstr "Falsch formatierte Knoten-ID" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:280 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:287 msgid "Parse error: invalid document structure for gpx document" msgstr "Fehler: ungültige Dokumentenstruktur in GPX-Datei" @@ -220,18 +221,18 @@ msgstr "Serververbindung..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Angabe eines kurzen Kommentars über die hochzuladenden Änderungen:" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 msgid "Commit comment" msgstr "Änderungskommentar" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" msgstr "{0}% ({1}/{2}), {3} verbleiben. Überspiele {4}: {5} (id: {6})" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64 @@ -241,34 +242,32 @@ msgstr "Ein Fehler ist aufgetreten: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:192 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190 msgid "Opening changeset..." msgstr "Öffne Änderungssatz..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:226 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224 msgid "Server does not support changesets" msgstr "Server unterstützt keine Gruppenänderungen" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:246 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:428 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:609 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:184 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607 msgid "Unknown host" msgstr "Rechner unbekannt" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282 msgid "Preparing..." msgstr "Daten vorbereiten..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:294 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292 msgid "Uploading..." msgstr "Daten hochladen..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375 msgid "Closing changeset..." msgstr "Schließe Änderungssatz..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:652 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650 msgid "Transfer aborted due to error (will wait for 5 seconds):" msgstr "Übertragung wegen Fehlers abgebrochen (Warte 5 Sekunden):" @@ -306,17 +305,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95 #: ../core/src/org/openstreetmap/josm/Main.java:348 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:29 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 @@ -329,11 +331,11 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:110 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -348,11 +350,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:186 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 msgid "Creating main GUI" msgstr "Graphische Oberfläche erstellen" #: ../core/src/org/openstreetmap/josm/Main.java:195 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:271 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:278 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:56 msgid "Help" @@ -377,5 +379,6 @@ #: ../core/src/org/openstreetmap/josm/Main.java:347 msgid "There are unsaved changes. Discard the changes and continue?" -msgstr "Es gibt ungesicherte Daten. Änderungen verwerfen und wirklich beenden?" +msgstr "" +"Es gibt ungesicherte Daten. Änderungen verwerfen und wirklich beenden?" #: ../core/src/org/openstreetmap/josm/Main.java:348 @@ -397,21 +400,21 @@ msgstr "Ignoriere die ungültige Datei-URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109 msgid "min lat" msgstr "min Breite" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111 msgid "min lon" msgstr "min Länge" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:117 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "max lat" msgstr "max Breite" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 msgid "max lon" msgstr "max Länge" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:122 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -421,5 +424,5 @@ "zu laden)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:134 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130 msgid "Bounding Box" msgstr "Koordinaten" @@ -455,6 +458,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:96 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:894 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:956 msgid "name" msgstr "Name" @@ -487,5 +490,5 @@ msgstr "Zoom" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:107 msgid "" "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -495,5 +498,5 @@ "Maus bewegen. Auswahl: Klick." -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:109 msgid "Slippy map" msgstr "Interaktive Karte" @@ -504,7 +507,7 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:605 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:602 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:89 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -524,5 +527,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380 msgid "Remove" msgstr "Entfernen" @@ -668,20 +671,20 @@ "Wenn angegeben, wird die Konfiguration zurückgesetzt anstatt sie zu lesen." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:109 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:186 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:198 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:108 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:191 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:203 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 msgid "Java OpenStreetMap Editor" msgstr "OpenStreetMap-Editor in Java" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:111 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:110 msgid "Message of the day not available" msgstr "Nachricht des Tages nicht verfügbar" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:200 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:205 msgid "Downloading \"Message of the day\"" msgstr "Nachricht des Tages herunterladen" @@ -721,33 +724,33 @@ msgstr "Herauszoomen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:234 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:474 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:512 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:383 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:380 msgid "More information about this feature" -msgstr "Mehr Informationen zum diesem Feature" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:393 +msgstr "Mehr Informationen zu diesem Feature" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:390 msgid "Optional Attributes:" msgstr "Optionale Attribute:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:437 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Verwende Vorlage \"{0}\" aus Gruppe \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:438 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:435 #, java-format msgid "Use preset ''{0}''" msgstr "Verwende Vorlage \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 msgid "way" @@ -756,11 +759,11 @@ msgstr[1] "Wege" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:214 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 msgid "node" msgid_plural "nodes" @@ -768,6 +771,6 @@ msgstr[1] "Knotenpunkte" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:81 @@ -777,14 +780,14 @@ msgstr[1] "Relationen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 msgid "closedway" msgstr "geschlossener Weg" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:475 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 #, java-format msgid "Unknown type: {0}" msgstr "Unbekannter Typ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:549 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 #, java-format @@ -792,15 +795,15 @@ msgstr "Quelle für Objektvorlage kann nicht gelesen werden: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:555 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 #, java-format msgid "Error parsing {0}: " msgstr "Fehler beim Parsen {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:572 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:569 #, 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:607 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595 #, java-format msgid "Change {0} object" @@ -809,9 +812,17 @@ msgstr[1] "Ändere {0} Objekte" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 msgid "Nothing selected!" msgstr "Nichts ausgewählt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 +msgid "Selection unsuitable!" +msgstr "Auswahl unpassend!" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +msgid "Apply Preset" +msgstr "Vorlage anwenden" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 msgid "Change Properties" msgstr "Einstellungen ändern" @@ -822,14 +833,14 @@ msgstr "Vorlagengruppe \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:107 msgid "File" msgstr "Datei" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:135 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:107 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:86 @@ -841,22 +852,22 @@ msgstr "Bearbeiten" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 msgid "View" msgstr "Ansicht" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:26 msgid "Tools" msgstr "Werkzeuge" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:141 msgid "Audio" msgstr "Audio" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:142 msgid "Presets" msgstr "Vorlagen" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:40 @@ -868,18 +879,18 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:210 msgid "Wireframe View" msgstr "Drahtdarstellung" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212 msgid "Toggle Wireframe view" msgstr "Drahtdarstellung umschalten" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:28 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 msgid "Contacting the OSM server..." msgstr "OSM-Server kontaktieren..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 #, java-format msgid "This will change up to {0} object." @@ -888,11 +899,11 @@ msgstr[1] "Damit werden maximal {0} Objekte geändert." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 msgid "An empty value deletes the key." msgstr "Ein leerer Wert löscht den Schlüssel." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66 @@ -902,7 +913,7 @@ msgstr "Schlüssel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 @@ -911,10 +922,10 @@ msgstr "Wert" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333 msgid "Change values?" msgstr "Werte ändern?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:257 #, java-format msgid "Change properties of up to {0} object" @@ -923,34 +934,34 @@ msgstr[1] "Ändere Eigenschaften für bis zu {0} Objekte" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 msgid "Please select a key" msgstr "Bitte wählen Sie einen Schlüssel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321 msgid "Please select a value" msgstr "Bitte wählen Sie einen Wert" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:445 msgid "Please select the objects you want to change properties for." msgstr "" "Bitte wählen Sie die Objekte, deren Eigenschaften geändert werden sollen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 msgid "Properties/Memberships" msgstr "Eigenschaften/Mitgliedschaften" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 msgid "Properties for selected objects." msgstr "Eigenschaften der ausgewählten Objekte." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97 @@ -962,58 +973,58 @@ msgstr "Umschalten: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 msgid "Member Of" msgstr "Mitglied von" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Role" msgstr "Rolle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:559 msgid "Change relation" msgstr "Relation ändern" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560 #, 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:564 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 msgid "Delete from relation" msgstr "Aus der Relation entfernen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:600 msgid "Add Properties" msgstr "Eigenschaften hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 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:609 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 msgid "Edit Properties" msgstr "Eigenschaften bearbeiten" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609 msgid "Edit the value of the selected key for all objects" msgstr "Den Wert des Schlüssels für alle Objekte bearbeiten" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 msgid "Delete Properties" msgstr "Eigenschaften entfernen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:77 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:293 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 @@ -1022,98 +1033,116 @@ msgstr "Entfernen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 msgid "Delete the selected key in all objects" msgstr "Den Schlüssel von allen Objekten entfernen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:763 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Eigenschaften: {0} / Mitgliedschaften: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:769 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 msgid "Properties / Memberships" msgstr "Eigenschaften / Mitgliedschaften" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178 +msgid "Apply Changes" +msgstr "Änderungen übernehmen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 msgid "Create new relation" msgstr "Neue Relation erstellen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208 msgid "Edit new relation" msgstr "Neue Relation bearbeiten" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209 #, java-format msgid "Edit relation #{0}" msgstr "Relation bearbeiten #{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230 +msgid "Basic" +msgstr "Standard" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Occupied By" msgstr "Belegt durch" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311 msgid "Tags (empty value deletes tag)" msgstr "Merkmale (leerer Wert löscht das Merkmal)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313 msgid "Members" msgstr "Mitglieder" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 +msgid "Move Up" +msgstr "Nach oben" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 msgid "Move the currently selected members up" msgstr "Ausgewählte Mitglieder nach oben schieben" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358 +msgid "Add Selected" +msgstr "Ausgewähltes hinzufügen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359 +msgid "Add all currently selected objects as members" +msgstr "Alle ausgewählten Objekte als Mitglieder hinzufügen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365 +msgid "Remove Selected" +msgstr "Ausgewähltes entfernen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366 +msgid "Remove all currently selected objects from relation" +msgstr "Alle ausgewählten Objekte aus der Relation entfernen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 +msgid "Move Down" +msgstr "Nach unten" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 msgid "Move the currently selected members down" msgstr "Ausgewählte Mitglieder nach unten schieben" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356 -msgid "Add Selected" -msgstr "Ausgewähltes hinzufügen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:357 -msgid "Add all currently selected objects as members" -msgstr "Alle ausgewählten Objekte als Mitglieder hinzufügen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:363 -msgid "Remove Selected" -msgstr "Ausgewähltes entfernen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:364 -msgid "Remove all currently selected objects from relation" -msgstr "Alle ausgewählten Objekte aus der Relation entfernen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381 msgid "Remove the member in the current table row from this relation" -msgstr "Mitglied in der gewählten Tabellenzeile aus dieser Relation entfernen." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:405 +msgstr "" +"Mitglied in der gewählten Tabellenzeile aus dieser Relation entfernen." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394 msgid "Download Members" msgstr "Elemente herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:406 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395 msgid "Download all incomplete ways and nodes in relation" msgstr "Alle nicht vollständigen Wege und Knoten der Relation herunterladen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:415 -msgid "Basic" -msgstr "Standard" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:453 #, java-format msgid "Members: {0}" msgstr "Mitglieder: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:587 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:461 +#, java-format +msgid "Relation Editor: {0}" +msgstr "Relationseditor: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:585 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 msgid "There were conflicts during import." msgstr "Konflikte beim Importieren aufgetreten." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593 msgid "Error parsing server response." msgstr "Fehler beim Parsen der Serverantwort." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:600 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:594 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:598 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -1127,9 +1156,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:345 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 msgid "Error" msgstr "Fehler" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:599 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597 msgid "Cannot connect to server." msgstr "Kann nicht mit Server verbinden." @@ -1294,5 +1323,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:94 @@ -1302,5 +1331,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 msgid "" @@ -1368,16 +1397,24 @@ msgstr "Auswahl: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +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:67 +msgid "Delete the selected relation" +msgstr "Gewählte Relation löschen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 #: trans_presets.java:2904 msgid "Relations" msgstr "Relationen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 msgid "Open a list of all relations." msgstr "Eine Liste aller Relationen öffnen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 @@ -1385,17 +1422,9 @@ msgstr "Neu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 msgid "Create a new relation" msgstr "Eine neue Relation erstellen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -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:90 -msgid "Delete the selected relation" -msgstr "Gewählte Relation löschen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:130 #, java-format msgid "Relations: {0}" @@ -1423,47 +1452,48 @@ msgstr "Befehlsliste: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +msgid "Resolve" +msgstr "Auflösen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +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:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Conflict" msgstr "Konflikt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 msgid "Merging conflicts." msgstr "Konflikte auflösen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67 -msgid "Resolve" -msgstr "Auflösen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:68 -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:105 -msgid "Please select something from the conflict list." -msgstr "Bitte wählen Sie Einträge aus der Konflikte-Liste." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Resolve Conflicts" msgstr "Konflikte auflösen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +msgid "Solve Conflict" +msgstr "Konflikte lösen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 #, java-format msgid "Conflicts: {0}" msgstr "Konflikte: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Conflicts" msgstr "Konflikte" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 msgid "conflict" msgstr "Konflikt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 msgid "background" msgstr "Hintergrund" @@ -1487,5 +1517,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 msgid "Customize Color" @@ -1493,5 +1523,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1501,5 +1531,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1508,5 +1538,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:326 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:152 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -1526,5 +1556,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:265 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 #, java-format msgid "Audio synchronized at point {0}." @@ -1532,5 +1562,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232 msgid "Unable to synchronize in layer being played." msgstr "Sychronisation in Abspielebene nicht möglich." @@ -1555,5 +1585,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:958 msgid "desc" msgstr "Beschreibung" @@ -1575,5 +1605,5 @@ msgstr "Fehler beim Anzeigen der URL" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -1583,5 +1613,5 @@ "Aufnahme abgespielt werden soll." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -1591,85 +1621,42 @@ "sychronisierende Audio-Marke oder den Wegpunkt bewegt werden." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224 msgid "Unable to create new audio marker." msgstr "Konnte Audio-Marke nicht synchronisieren." #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 msgid "Convert to data layer" msgstr "Zur Daten-Ebene konvertieren" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:725 -msgid "" -"Upload of unprocessed GPS data as map data is considered harmful." -"
If you want to upload traces, look here:" -msgstr "" -"Hochladen von unbearbeiteten GPS-Daten als Kartendaten ist unerwünscht!" -"
Weitere Informationen, falls Sie die GPX-Spur hochladen möchten:" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:645 +msgid "" +"Upload of unprocessed GPS data as map data is considered " +"harmful.
If you want to upload traces, look here:" +msgstr "" +"Hochladen von unbearbeiteten GPS-Daten als Kartendaten ist " +"unerwünscht!
Weitere Informationen, falls Sie die GPX-Spur hochladen " +"möchten:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:646 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:747 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:448 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:667 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "Converted from: {0}" msgstr "Konvertiert von: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612 -msgid "Upload this trace..." -msgstr "Diese GPS-Spur hochladen...." - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:616 -msgid "" -"This functionality has been added only recently. Please
use with " -"care and check if it works as expected." -msgstr "" -"Diese Funktionalität ist sehr neu. Bitte vorsichtig
verwenden und " -"prüfen Sie, ob es wie erwartet funktioniert." - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:102 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:107 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:626 -msgid "Upload track filtered by JOSM" -msgstr "GPS-Spur durch JOSM gefiltert hochladen" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:103 -#, java-format -msgid "Upload raw file: {0}" -msgstr "Rohdaten hochladen: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:108 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:627 -msgid "Upload raw file: " -msgstr "Rohdaten hochladen: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640 -msgid "Description:" -msgstr "Beschreibung:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:123 -msgid "Tags:" -msgstr "Merkmale:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:129 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:648 -msgid "GPX-Upload" -msgstr "GPX-Upload" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:229 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:217 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113 msgid "gps point" msgstr "GPS-Punkt" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 #: trans_presets.java:1795 trans_presets.java:1801 trans_presets.java:1807 #: trans_presets.java:1813 trans_presets.java:1819 trans_presets.java:1825 @@ -1689,5 +1676,5 @@ msgstr[1] "GPS-Spuren" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 msgid "point" msgid_plural "points" @@ -1695,5 +1682,5 @@ msgstr[1] "Punkte" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 #, java-format msgid "a track with {0} point" @@ -1702,5 +1689,5 @@ msgstr[1] "Eine GPS-Spur mit {0} Punkten" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} consists of {1} track" @@ -1709,5 +1696,5 @@ msgstr[1] "{0} besteht aus {1} GPS-Spuren" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} point" @@ -1716,25 +1703,25 @@ msgstr[1] "{0} Punkte" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117 msgid "Customize line drawing" msgstr "Linienaussehen anpassen" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:296 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 msgid "Use global settings." msgstr "Globale Einstellungen verwenden." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 msgid "Draw lines between points for this layer." msgstr "Linien zwischen Punkten dieser Ebene zeichnen." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:298 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123 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/RawGpsLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:135 msgid "Select line drawing options" @@ -1768,5 +1755,5 @@ msgstr "JPEG-Bilder (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290 #, java-format msgid "{0} track, " @@ -1775,5 +1762,5 @@ msgstr[1] "{0} GPS-Spuren, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 #, java-format msgid "{0} route, " @@ -1782,5 +1769,5 @@ msgstr[1] "{0} Routen, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 #, java-format msgid "{0} waypoint" @@ -1789,55 +1776,51 @@ msgstr[1] "{0} Wegpunkte" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #, java-format msgid "Name: {0}" msgstr "Name: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "Description: {0}" msgstr "Beschreibung: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 msgid "Timespan: " msgstr "Zeitspanne: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Length: " msgstr "Länge: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:642 -msgid "Tags (keywords in GPX):" -msgstr "Merkmale (Schlüsselworte in GPX):" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:655 msgid "time" msgstr "Zeit" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:780 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:679 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:700 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 msgid "Download from OSM along this track" msgstr "OSM-Daten entlang der GPS-Spur herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:686 msgid "Download everything within:" msgstr "Alles im Bereich herunterladen:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 #, java-format msgid "{0} meters" msgstr "{0} Meter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:692 msgid "Maximum area per request:" msgstr "Maximalgebiet je Anfrage:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 #, java-format msgid "{0} sq km" msgstr "{0} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787 #, java-format msgid "" @@ -1848,10 +1831,10 @@ "fortfahren?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:844 #, java-format msgid "Audio markers from {0}" msgstr "Audio-Marken von {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 msgid "No GPX track available in layer to associate audio with." msgstr "" @@ -1859,5 +1842,5 @@ "werden kann." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "" "Some waypoints with timestamps from before the start of the track were " @@ -1866,5 +1849,5 @@ "Einige Wegpunkte mit Zeitstempeln vor Beginn der GPS-Spur wurden ignoriert." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -1974,19 +1957,19 @@ msgstr "Die eingegebene Zeit konnte nicht eingelesen werden." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:140 msgid "outside downloaded area" msgstr "Außerhalb des heruntergeladenen Bereichs" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 #, java-format msgid "{0} consists of:" msgstr "{0} besteht aus:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:353 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:347 #, java-format msgid " ({0} deleted.)" msgstr " ({0} gelöscht.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:445 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 msgid "Convert to GPX layer" msgstr "Zu GPX-Ebene konvertieren" @@ -2014,37 +1997,37 @@ msgstr "Lesezeichen konnten nicht geschrieben werden." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 msgid "The geographic longitude at the mouse pointer." msgstr "Die geographische Länge an der Mausposition." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The name of the object at the mouse pointer." msgstr "Der Name des Objekts unter der Mausposition." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 msgid "The geographic latitude at the mouse pointer." msgstr "Die geographische Breite an der Mausposition." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The angle between the previous and the current way segment." msgstr "Der Winkel zwischen vorherigem und aktuellem Wegabschnitt." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The (compass) heading of the line segment being drawn." msgstr "Die (Kompass-)Richtung des zu zeichnenden Wegabschnittes." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The length of the new way segment being drawn." msgstr "Die Länge des neu zu zeichnenden Wegabschnittes." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:160 msgid "(no object)" msgstr "(kein Objekt)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:62 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:56 msgid "Color" msgstr "Farbe" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:57 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107 #: trans_presets.java:56 trans_presets.java:92 trans_presets.java:130 @@ -2145,27 +2128,36 @@ msgstr "Name" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:118 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:112 #, java-format msgid "Paint style {0}: {1}" msgstr "Zeichenstil {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 msgid "Choose" msgstr "Wählen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 msgid "Please select a color." msgstr "Bitte eine Farbe wählen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 #, java-format msgid "Choose a color for {0}" msgstr "Eine Farbe für {0} auswählen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +msgid "Set to default" +msgstr "Voreinstellung" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:172 +msgid "Set all to default" +msgstr "Voreinstellung für alle" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:184 msgid "Colors used by different objects in JOSM." msgstr "Farben, die von verschiedenen Objekten in JOSM verwendet werden." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:171 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:198 msgid "Colors" msgstr "Farben" @@ -2200,7 +2192,7 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45 msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transfered in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." +"WARNING: The password is stored in plain text in the preferences " +"file.
The password is transfered 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 " @@ -2208,18 +2200,18 @@ "übertragen.
Benutzen Sie kein wertvolles Passwort." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44 msgid "Sort presets menu" msgstr "Objektvorlagenmenü sortieren" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46 msgid "Enable built-in defaults" msgstr "Voreinstellungen laden" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:58 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69 msgid "Tagging preset source" msgstr "Quelle für Objektvorlagen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:156 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 @@ -2227,5 +2219,5 @@ msgstr "Bitte wählen Sie eine Zeile zum Bearbeiten." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500 @@ -2234,26 +2226,26 @@ msgstr "Bitte wählen Sie die zu löschende Zeile." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89 -msgid "" -"The sources (URL or filename) of tagging preset definition files. See http://" -"josm.openstreetmap.de/wiki/TaggingPresets for help." +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88 +msgid "" +"The sources (URL or filename) of tagging preset definition files. See " +"http://josm.openstreetmap.de/wiki/TaggingPresets for help." msgstr "" "Die Quellen (URL oder Dateiname) der Definitionsdatei für Objektvorlagen. " "Weitere Informationen unter http://josm.openstreetmap.de/wiki/TaggingPresets" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89 msgid "Add a new tagging preset source to the list." msgstr "Eine neue Quelle für Objektvorlagen zur Liste hinzufügen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 msgid "Delete the selected source from the list." msgstr "Ausgewählte Quelle aus der Liste entfernen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:94 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93 msgid "Tagging Presets" msgstr "Objektvorlagen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97 msgid "Tagging preset sources" msgstr "Quellen für Objektvorlagen" @@ -2267,6 +2259,6 @@ msgstr "Beim Speichern eine Sicherheitskopie endend auf ~ erstellen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:141 @@ -2274,34 +2266,34 @@ msgstr "Plugins" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 msgid "Configure available plugins." msgstr "Verfügbare Plugins bearbeiten." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43 msgid "Download List" msgstr "Liste laden" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:80 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51 msgid "Update" msgstr "Aktualisieren" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:60 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 msgid "Configure Sites..." msgstr "Seiten konfigurieren..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add either site-josm.xml or Wiki Pages." msgstr "Bitte entweder site-josm.xml oder Wiki-Seiten hinzufügen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99 msgid "Please select an entry." msgstr "Bitte wählen Sie einen Eintrag." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 msgid "Configure Plugin Sites" msgstr "Pluginquellen bearbeiten" @@ -2492,9 +2484,9 @@ msgstr "Kalibrierung der Tonaufzeichnung" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "Display Settings" msgstr "Anzeige-Einstellungen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "" "Various settings that influence the visual representation of the whole " @@ -2502,55 +2494,65 @@ msgstr "Verschiedene Optionen, die das Aussehen des Programms festlegen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings" msgstr "Verbindungseinstellungen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings for the OSM server." msgstr "Verbinungseinstellungen zum OSM Server." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Map Settings" msgstr "Karten-Einstellungen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Settings for the map projection and data interpretation." msgstr "Einstellungen der Karten-Projektion und Daten-Interpretation." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Audio Settings" msgstr "Audio-Einstellungen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Settings for the audio player and audio markers." msgstr "Einstellungen für den Audio-Player und Audio-Marken." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97 msgid "You have to restart JOSM for some settings to take effect." -msgstr "Einige Einstellungen werden erst nach einem Neustart von JOSM wirksam." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:25 +msgstr "" +"Einige Einstellungen werden erst nach einem Neustart von JOSM wirksam." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 msgid "Draw lines between raw gps points." msgstr "Zeichne Linien zwischen rohen GPS-Punkten." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:27 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 msgid "Force lines if no segments imported." msgstr "Linien erzwingen, wenn keine Abschnitte importiert wurden." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:28 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 msgid "Draw large GPS points." msgstr "Große GPS-Punkte zeichnen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 -msgid "Color tracks by velocity." -msgstr "GPS-Spuren nach Geschwindigkeit einfärben." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34 +msgid "Velocity (red = slow, green = fast)" +msgstr "Geschwindigkeit (rot = langsam, grün = schnell)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 +msgid "Dilution of Position (red = high, green = low, if available)" +msgstr "" +"Positionsverschlechterung (rot = hoch, grün = langsam, wenn verfügbar)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 +msgid "Single Color (can be customized for named layers)" +msgstr "Einzelne Farbe (kann für benannte Ebenen angepasst werden)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:1346 msgid "Car" msgstr "Auto" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:309 trans_presets.java:635 trans_presets.java:833 #: trans_presets.java:842 trans_presets.java:851 trans_presets.java:864 @@ -2562,5 +2564,5 @@ msgstr "Fahrrad" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:310 trans_presets.java:637 trans_presets.java:832 #: trans_presets.java:841 trans_presets.java:850 trans_presets.java:863 @@ -2571,44 +2573,44 @@ msgstr "Zu Fuß" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 msgid "Draw Direction Arrows" msgstr "Richtungspfeile zeichnen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 msgid "Fast drawing (looks uglier)" msgstr "Schnelles Zeichnen (schlechtere Qualität)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180 msgid "Only interesting direction hints (e.g. with oneway tag)." msgstr "Nur interessante Richtungspfeile (z.B. bei Einbahnstraßen)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:186 msgid "Only on the head of a way." msgstr "Nur am Ende des Weges" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44 msgid "Draw segment order numbers" msgstr "Ordnungsnummer des Abschnitts anzeigen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45 msgid "Draw boundaries of downloaded data" msgstr "Zeichne Grenzen der geladenen Daten" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46 msgid "Draw virtual nodes in select mode" msgstr "Virtuelle Knoten im Auswahlmodus zeichnen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47 msgid "Draw inactive layers in other color" msgstr "Inaktive Ebenen in anderer Farbe zeichnen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 msgid "Smooth map graphics (antialiasing)" msgstr "Glätten der Kartengrafik (Anti-Aliasing)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 msgid "" "If your gps device draws too few lines, select this to draw lines along your " @@ -2618,5 +2620,5 @@ "Linien entlang des Weges zu zeichnen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:71 msgid "" "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines." @@ -2625,9 +2627,9 @@ "Linien zu zeichnen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73 msgid "Maximum length (meters)" msgstr "Maximallänge (Meter)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:77 msgid "" "Force drawing of lines if the imported data contain no line information." @@ -2636,15 +2638,16 @@ "Informationen enthalten." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:84 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89 msgid "Draw direction arrows for lines, connecting GPS points." msgstr "Richtungspfeile an Linien zwischen GPS-Punkten zeichnen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90 -msgid "Draw the direction arrows using table lookups instead of complex math." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95 +msgid "" +"Draw the direction arrows using table lookups instead of complex math." msgstr "" "Richtungspfeile mittels Tabellenzugriffen anstatt komplexer Mathematik " "zeichnen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:96 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:101 msgid "" "Don't draw arrows if they are not at least this distance away from the last " @@ -2653,13 +2656,33 @@ "Keine Pfeile zeichnen, wenn sie nicht den angegebenen Mindestabstand haben." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104 msgid "Minimum distance (pixels)" msgstr "Mindestabstand (Pixel)" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:109 -msgid "Choose the hue for the track color by the velocity at that point." -msgstr "Farbton einer GPS-Spur abhängig von der Geschwindigkeit wählen." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116 +msgid "Draw larger dots for the GPS points." +msgstr "Größere Punkte für GPS-Punkte zeichnen." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136 +msgid "" +"All points and track segments will have the same color. Can be customized in " +"Layer Manager." +msgstr "" +"Alle Punkte und GPS-Spuren haben die gleiche Farbe. Kann in der " +"Ebenenübersicht angepasst werden." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137 +msgid "Colors points and track segments by velocity." +msgstr "Punkte und GPS-Spuren nach Geschwindigkeit einfärben." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:138 +msgid "" +"Colors points and track segments by dilution of position (HDOP). Your " +"capture device needs to logs that information." +msgstr "" +"Punkte und GPS-Spuren anhand der Positionsverschlechterung (DOP) färben. Ihr " +"GPS-Empfänger muss diese Information aufzeichnen." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143 msgid "Allows to tune the track coloring for different average speeds." msgstr "" @@ -2667,31 +2690,32 @@ "Durchschnittsgeschwindigkeiten." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122 -msgid "Draw larger dots for the GPS points." -msgstr "Größere Punkte für GPS-Punkte zeichnen." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148 +msgid "Track and Point Coloring" +msgstr "Färbung von GPS-Spuren und Punkten" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 msgid "GPS Points" msgstr "GPS-Punkte" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175 msgid "Draw direction hints for way segments." msgstr "Richtungspfeile für Wegabschnitte zeichnen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:163 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192 msgid "Draw the order numbers of all segments within their way." msgstr "Ordnungsnummer für alle Abschnitte innerhalb des Weges anzeigen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:168 -msgid "Apply antialiasing to the map view resulting in a smoother appearance." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:197 +msgid "" +"Apply antialiasing to the map view resulting in a smoother appearance." msgstr "" "Anti-Aliasing in der Kartenanzeige nutzen, um ein gefälligeres Aussehen zu " "erreichen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202 msgid "Draw the boundaries of data loaded from the server." msgstr "Grenze des vom OSM-Server geladenen Bereichs anzeigen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:178 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:207 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" @@ -2699,9 +2723,9 @@ "vereinfachen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212 msgid "Draw the inactive data layers in a different color." msgstr "Inaktive Datenebenen in einer anderen Farbe zeichnen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219 msgid "OSM Data" msgstr "OSM-Daten" @@ -2812,6 +2836,6 @@ "a menu entry of button for the first time. So some of your changes may " "become active even without restart --- but also without collistion handling. " -"This is another reason to restart JOSM after making any changes here." -"

" +"This is another reason to restart JOSM after making any changes " +"here.

" msgstr "" "

Weiterhin werden die Tastaturkürzel aktiviert, wenn die Aktion das erste " @@ -2829,8 +2853,9 @@ "key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also " "there will be 'keys' listed that correspond to a shortcut on your keyboard " -"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/" -"Semicolon on US keyboards, '.'/Period on German keyboards, ...) instead. Not " -"doing so may result in conflicts, as there is no way for JOSM to know that " -"Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...

" +"(e.g. ':'/Colon). Please also do not use them, use the base key " +"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) " +"instead. Not doing so may result in conflicts, as there is no way for JOSM " +"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US " +"keyboard...

" msgstr "" "

Sie werden feststellen, dass die Tastenauswahl auf der nächsten Seite " @@ -2839,9 +2864,9 @@ "sind. Falls Ihre Tastatur keine 'Copy'-Taste hat (PC-Tastaturen haben diese " "nicht, aber Sun-Tastaturen), verwenden Sie sie nicht. Außerdem gibt es " -"'Tasten', welche auf der Tastatur Abkürzungen entsprechen (z.B. ':'/" -"Doppelpunkt). Bitte verwenden Sie diese nicht, sondern die Basistaste ('.'/" -"Punkt auf der deutschen Tastatur, ...). Falls Sie dies nicht tun, kann es " -"Konflikte geben, da JOSM nicht erkennt, dass Strg+Umschalt+. und Strg+: das " -"gleiche ist...

" +"'Tasten', welche auf der Tastatur Abkürzungen entsprechen (z.B. " +"':'/Doppelpunkt). Bitte verwenden Sie diese nicht, sondern die Basistaste " +"('.'/Punkt auf der deutschen Tastatur, ...). Falls Sie dies nicht tun, kann " +"es Konflikte geben, da JOSM nicht erkennt, dass Strg+Umschalt+. und Strg+: " +"das gleiche ist...

" #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:177 @@ -2869,6 +2894,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183 msgid "" -"

The pseudo-modifier 'disabled' will disable the shortcut when encountered." -"

" +"

The pseudo-modifier 'disabled' will disable the shortcut when " +"encountered.

" msgstr "" "

Das Pseudo-Tastaturkürzel 'disabled' deaktiviert Tastaturkürzel.

" @@ -2939,10 +2964,10 @@ msgstr "Steuertastengruppen" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:231 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:236 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:250 msgid "layer not in list." msgstr "Ebene nicht in der Liste." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -2951,57 +2976,57 @@ "genutzt." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "usage" msgstr "Verwendung" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 msgid "options" msgstr "Optionen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 msgid "Show this help" msgstr "Diese Hilfe anzeigen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Standard unix geometry argument" msgstr "Standard Unix Geometrie Argument" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 msgid "Download the bounding box" msgstr "Bounding Box herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Ort an der URL herunterladen (mit lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Open file (as raw gps, if .gpx)" msgstr "Datei öffnen (als Roh-GPS, wenn .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 msgid "Download the bounding box as raw gps" msgstr "Bounding Box als GPS-Spuren herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Select with the given search" msgstr "Mit der angegebenen Suche auswählen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 msgid "Don't launch in fullscreen mode" msgstr "Nicht im Vollbildmodus starten" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 msgid "Reset the preferences to default" msgstr "Die Einstellungen auf Standardwerte zurücksetzen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 msgid "Set the language." msgstr "Die Sprache festlegen." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 msgid "examples" msgstr "Beispiele" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3009,24 +3034,24 @@ msgstr "" "Parameter werden in der Reihenfolge ausgewertet, in der sie angegeben " -"werden. Stellen Sie also sicher, dass Daten existieren, bevor der Parameter " -"--selection verwendet wird." - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155 +"werden. Stellen Sie also sicher, dass Daten existieren, bevor der Parameter -" +"-selection verwendet wird." + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 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:161 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 msgid "Activating updated plugins" msgstr "Aktualisierte Plugins aktivieren" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 msgid "Loading early plugins" msgstr "Zeitige Plugins laden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Setting defaults" msgstr "Voreinstellungen setzen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171 msgid "Loading plugins" msgstr "Plugins laden" @@ -3060,6 +3085,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:108 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:164 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:162 #: trans_presets.java:308 trans_presets.java:309 trans_presets.java:310 #: trans_presets.java:311 trans_presets.java:312 trans_presets.java:313 @@ -3076,5 +3101,5 @@ msgstr "unbekannt" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:66 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 #, java-format msgid "" @@ -3085,25 +3110,25 @@ "mehr benötigt." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 #, java-format msgid "Plugin requires JOSM update: {0}." msgstr "Plugin benötigt JOSM-Aktualisierung: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "Das Plugin {0} wird vom Plugin {1} benötigt aber nicht gefunden." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 #, java-format msgid "Plugin not found: {0}." msgstr "Plugin nicht gefunden: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Letzte Aktualisierung der Plugins vor mehr als {0} Tagen." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 msgid "" "(You can change the number of days after which this warning appears
by " @@ -3113,12 +3138,12 @@ "Konfigurationsoption 'pluginmanager.warntime' (Wert in Tagen) ändern.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 msgid "Disable plugin" msgstr "Plugin abschalten" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" @@ -3126,5 +3151,5 @@ "Plugin {0} konnte nicht geladen werden. Aus den Einstellungen entfernen?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -3134,5 +3159,5 @@ "die Rechte besitzt die vorhandenen Plugins zu überschreiben." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 #, java-format msgid "" @@ -3142,10 +3167,10 @@ "ausgelöst haben könnte." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Laut den Informationen des Plugins ist der Autor des Plugins {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:262 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -3154,9 +3179,9 @@ "Plugins, bevor Sie den Fehler melden." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 msgid "Should the plugin be disabled?" msgstr "Soll das Plugin abgeschaltet werden?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:278 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -3166,5 +3191,5 @@ "um das Plugin zu entfernen." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -3174,6 +3199,6 @@ "Verwaltern Ihres JOSM-Pakets." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:322 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:181 msgid "no description available" msgstr "keine Beschreibung verfügbar" @@ -3185,5 +3210,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 msgid "Update Plugins" msgstr "Plugins aktualisieren" @@ -3220,5 +3245,5 @@ "heruntergeladen werden." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 #, java-format msgid "Downloaded plugin information from {0} site" @@ -3227,13 +3252,13 @@ msgstr[1] "Plugin-Informationen von {0} Quellen geladen" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 msgid "No plugin information found." msgstr "Keine Plugin-Informationen gefunden." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:76 msgid "All installed plugins are up to date." msgstr "Alle installierten Plugins sind aktuell." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 #, java-format msgid "" @@ -3246,9 +3271,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:105 msgid "Download missing plugins" msgstr "Fehlende Plugins herunterladen" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:106 #, java-format msgid "" @@ -3261,22 +3286,22 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 msgid "Download Plugins" msgstr "Plugins herunterladen" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:170 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:168 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Version {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:176 msgid "Plugin bundled with JOSM" msgstr "Plugin mit JOSM ausgeliefert" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208 msgid "Plugin already exists" msgstr "Das Plugin ist bereits vorhanden" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:211 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:209 #, java-format msgid "" @@ -3291,15 +3316,15 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 msgid "Delete and Download" msgstr "Löschen und Herunterladen" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:222 #, java-format msgid "Error deleting plugin file: {0}" msgstr "Fehler beim Löschen des Plugins: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:281 #, java-format msgid "Error reading plugin information file: {0}" @@ -3366,10 +3391,10 @@ msgstr "{0} {1} löschen" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:165 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 msgid "Conflicting relation" msgstr "Konflikt mit Relation" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 #, java-format msgid "" @@ -3380,5 +3405,5 @@ "Aus Relation entfernen?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:166 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 #, java-format msgid "" @@ -3395,11 +3420,11 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:349 msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Sie sind dabei Knoten außerhalb des heruntergeladenen Bereichs zu löschen." -"
Das kann zu Problemen führen, wenn andere Objekte (die Sie nicht sehen) " -"diese verwenden.
Wollen Sie die Knoten wirklich löschen?" +"You are about to delete nodes outside of the area you have " +"downloaded.
This can cause problems because other objects (that you don't " +"see) might use them.
Do you really want to delete?" +msgstr "" +"Sie sind dabei Knoten außerhalb des heruntergeladenen Bereichs zu " +"löschen.
Das kann zu Problemen führen, wenn andere Objekte (die Sie nicht " +"sehen) diese verwenden.
Wollen Sie die Knoten wirklich löschen?" #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 @@ -3526,124 +3551,135 @@ msgstr "Kann keine Einstellungen vom Server laden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:232 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 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:426 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:428 #, 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:527 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:765 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:776 msgid "Empty member in relation." msgstr "Leeres Element in der Relation." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:767 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:531 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 #, 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:547 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 #, 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:552 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:549 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:558 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555 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:564 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:561 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 +msgid "More than one \"via\" found." +msgstr "Mehr als ein Element mit \"via\" gefunden." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 #, java-format msgid "Unknown role ''{0}''." msgstr "Unbekannte Role \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Unbekannter Elementtyp für \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 msgid "No \"from\" way found." msgstr "Kein \"from\"-Weg gefunden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 msgid "No \"to\" way found." msgstr "Kein \"to\"-Weg gefunden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -msgid "No \"via\" node found." -msgstr "Kein \"via\"-Weg gefunden." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +msgid "No \"via\" node or way found." +msgstr "Kein \"via\"-Knoten oder Weg gefunden." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 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:619 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:636 -#, java-format -msgid "The \"{0}\" way must contain at least 2 nodes." -msgstr "Der \"{0}\"-Weg muss mindestens 2 Knoten enthalten." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:731 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +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:620 +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:624 +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:742 #, 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:787 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 #, 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:798 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Nicht-Weg ''{0}'' im Multipolygon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:847 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:858 #, 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:927 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 #, 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:938 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:949 #, 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:987 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:998 #, 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:1012 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1023 #, 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:1195 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1206 msgid "untagged" msgstr "Ohne Merkmale" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1196 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207 msgid "text" msgstr "Text" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" msgstr "Inaktiv" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:94 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:181 @@ -3651,13 +3687,13 @@ msgstr "Ausgewählt" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" msgstr "Weg ohne Merkmale" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 msgid "incomplete way" msgstr "Unvollständiger Weg" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 msgid "highlight" msgstr "Hervorgehoben" @@ -3679,5 +3715,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:113 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:89 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:77 msgid "incomplete" @@ -3707,14 +3743,14 @@ msgstr[1] "{0} Elemente" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 msgid "Duplicate" msgstr "Verdoppeln" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 msgid "Duplicate selection by copy and immediate paste." msgstr "Auswahl durch Kopieren und sofortiges Einfügen verdoppeln." -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 @@ -3723,5 +3759,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -3792,7 +3828,11 @@ msgstr "Geschichte der OSM Wege oder Knoten anzeigen." -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:57 -msgid "Please select at least one node, way or relation." -msgstr "Bitte mindestens einen Knoten, Weg oder Relation wählen." +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:60 +msgid "" +"Please select at least one node, way or relation. Only already uploaded " +"elements have a history." +msgstr "" +"Bitte mindestens einen Knoten, Weg oder Relation wählen. Nur bereits " +"hochgeladene Elemente haben eine Geschichte." #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 @@ -3814,7 +3854,7 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/TerracerAction.java:47 @@ -3952,5 +3992,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:123 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:314 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:315 msgid "Enter values for all conflicts." msgstr "Werte für alle Konflikte festlegen." @@ -3958,5 +3998,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 msgid "Solve Conflicts" msgstr "Konflikte auflösen" @@ -4092,5 +4132,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #, java-format @@ -4114,20 +4154,27 @@ msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." -msgstr[0] "Der gewählte Knotenpunkt ist kein innenliegender Teil eines Weges." +msgstr[0] "" +"Der gewählte Knotenpunkt ist kein innenliegender Teil eines Weges." msgstr[1] "Die gewählten Knotenpunkte sind nicht Teil eines Weges." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125 -msgid "" -"There is more than one way using the node(s) you selected. Please select the " +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 +msgid "" +"There is more than one way using the node you selected. Please select the " "way also." -msgstr "" +msgid_plural "" +"There is more than one way using the nodes you selected. Please select the " +"way also." +msgstr[0] "" +"Der gewählte Knotenpunkt wird von mehreren Wegen verwendet. Bitte auch den " +"Weg auswählen." +msgstr[1] "" "Mindestens ein gewählter Knotenpunkt wird von mehreren Wegen verwendet. " "Bitte auch den Weg auswählen." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137 msgid "The selected nodes do not share the same way." msgstr "Die gewählten Punkte gehören nicht zum selben Weg." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -4135,6 +4182,6 @@ msgstr[1] "Der gewählte Weg enthält nicht alle gewählten Punkte." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229 msgid "You must select two or more nodes to split a circular way." msgstr "" @@ -4142,5 +4189,5 @@ "trennen zu können." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -4150,5 +4197,5 @@ "in der Mitte des Weges.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 msgid "" "A role based relation membership was copied to all new ways.\n" @@ -4159,5 +4206,5 @@ "Sie sollten dies überprüfen und falls nötig korrigieren." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:296 #, java-format msgid "Split way {0} into {1} parts" @@ -4553,5 +4600,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 msgid "Align Nodes in Circle" msgstr "Knotenpunkte im Kreis anordnen" @@ -4565,5 +4612,5 @@ msgstr "Einige der Knoten sind (fast) in einer Linie" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 msgid "Please select at least four nodes." msgstr "Bitte mindestens vier Knotenpunkte auswählen." @@ -4632,4 +4679,33 @@ msgstr "Beim Wiederherstellen ist ein Fehler aufgetreten." +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "Statusübersicht anzeigen" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "" +"Show status report with useful information that can be attached to bugs" +msgstr "" +"Statusübersicht mit nützlichen Informationen für Fehlerberichte anzeigen" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "Hilfe: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92 +msgid "Status Report" +msgstr "Statusbericht" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +msgid "Copy to clipboard and close" +msgstr "In die Zwischenablage kopieren und schließen" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 +msgid "Close" +msgstr "Schließen" + #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 @@ -4641,13 +4717,13 @@ msgstr "Letzte Änderung wiederherstellen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:44 msgid "Delete Mode" msgstr "Löschmodus" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:46 msgid "Delete nodes or ways." msgstr "Knotenpunkte oder Wege löschen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:84 @@ -4658,5 +4734,5 @@ msgstr "Modus: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:130 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -4668,6 +4744,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:87 msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." +"Drag play head and release near track to play audio from there; " +"SHIFT+release to synchronize audio at that point." msgstr "" "Abspielposition in der Nähe einer GPS-Spur ablegen, um Audio abzuspielen. " @@ -4683,24 +4759,24 @@ msgstr "Gebiete erstellen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 msgid "Extrude Way" msgstr "Weg ausziehen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:252 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:416 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:430 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/ExtrudeAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 msgid "Draw a rectangle of the desired size, then release the mouse button." msgstr "" "Ein Rechteck der gewünschten Größe zeichnen und dann den Mausknopf loslassen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:420 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:434 msgid "Release the mouse button to stop rotating." msgstr "Maustaste loslassen, um das Drehen zu stoppen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 msgid "Drag a way segment to make a rectangle." msgstr "Einen Wegabschnitt bewegen, um ein Rechteck zu erstellen." @@ -4751,5 +4827,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:791 msgid "Click to make a connection to the existing node." -msgstr "Klicken, um eine Verbindung zum existierenden Knotenpunkt zu erzeugen." +msgstr "" +"Klicken, um eine Verbindung zum existierenden Knotenpunkt zu erzeugen." #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:794 @@ -4772,14 +4849,14 @@ msgstr "Objekte auswählen, verschieben, und drehen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:191 msgid "Add and move a virtual new node to way" msgstr "Virtuellen Knoten zu Weg hinzufügen und bewegen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:220 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:223 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 msgid "Cannot move objects outside of the world." msgstr "Kann Objekte nicht nach außerhalb der Welt verschieben." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:418 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:432 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -4788,5 +4865,5 @@ "Punkt vereinigen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:422 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:436 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to remove); Shift-" @@ -4863,32 +4940,32 @@ msgstr "{0} Knotenpunkte vereinigen" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Orthogonalize Shape" msgstr "Form rechtwinklig machen" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 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:60 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 msgid "Only two nodes allowed" msgstr "Nur zwei Knoten erlaubt" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 msgid "Selection must consist only of ways." msgstr "Auswahl darf nur aus Wegen bestehen." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 msgid "Please select one or more closed ways of at least four nodes." msgstr "" "Bitte geschlossene(n) Weg(e) mit mindestens vier Knotenpunkten auswählen." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 msgid "Please select ways with almost right angles to orthogonalize." msgstr "" "Bitte Wege mit nahezu rechten Winkeln zum rechtwinklig machen auswählen." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -4900,9 +4977,9 @@ "Projektion zum Ausschalten dieser Warnung.
Wollen Sie fortfahren?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "Only one node selected" msgstr "Nur ein Knoten ausgewählt" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 msgid "Orthogonalize" msgstr "Rechtwinklig machen" @@ -4953,5 +5030,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101 -msgid "Please select exactly three nodes or one way with exactly three nodes." +msgid "" +"Please select exactly three nodes or one way with exactly three nodes." msgstr "" "Bitte genau drei Knoten oder einen Weg mit drei Knotenpunkten auswählen." @@ -4961,52 +5039,71 @@ msgstr "Diese Knoten sind nicht in einem Kreis angeordnet." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../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:71 +msgid "Update Data" +msgstr "Daten aktualisieren" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" +"Die aktuelle Datenebene mittels des Servers aktualisieren (neu herunterladen)" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:72 +#, java-format +msgid "" +"This action will require {0} individual download requests. Do you wish to " +"continue?" +msgstr "" +"Diese Aktion benötigt {0} individuelle Serverzugriffe. Wollen Sie fortfahren?" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 msgid "Open Location..." msgstr "Adresse öffnen..." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 msgid "Open an URL." msgstr "Eine URL öffnen." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 msgid "Separate Layer" msgstr "Separate Ebene" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 msgid "Enter URL to download:" msgstr "URL zum Herunterladen eingeben" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 msgid "Download Location" msgstr "Adresse herunterladen" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 msgid "Download URL" msgstr "URL herunterladen" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 msgid "Add Node..." msgstr "Knotenpunkt hinzufügen..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 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:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 msgid "Enter the coordinates for the new node." msgstr "Koordinaten des neuen Knotens eingeben." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 msgid "Use decimal degrees." msgstr "Verwenden Sie Angaben in Dezimalgrad." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negative Werte für die westlichen oder südliche Hemisphere." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 #: ../plugins/livegps/livegps/LiveGpsDialog.java:54 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93 @@ -5015,5 +5112,5 @@ msgstr "(geogr.) Breite" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 #: ../plugins/livegps/livegps/LiveGpsDialog.java:56 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96 @@ -5056,14 +5153,14 @@ msgstr "Verschiebt Objekte {0}" +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "Overwrite" msgstr "Überschreiben" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "File exists. Overwrite?" msgstr "Datei existiert bereits. Überschreiben?" @@ -5082,44 +5179,49 @@ msgstr "Bitte etwas zum Kopieren auswählen." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Wege trennen" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "Duplizieren von Knoten, welche von mehreren Wegen genutzt werden." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 msgid "This node is not glued to anything else." msgstr "Dieser Knoten ist mit nichts verbunden." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 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:90 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 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:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 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:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "Select either:" msgstr "Bitte wählen:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +msgid "* One tagged node, or" +msgstr "* Ein Knoten mit Merkmalen, oder" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 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:103 -msgid "* One node that is used by more than one way and one of those ways, or" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +msgid "" +"* One node that is used by more than one way and one of those ways, or" msgstr "" "* Ein Knoten, der von mehr als einem Weg genutzt wird und einen dieser Wege, " "oder" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -5128,5 +5230,5 @@ "verwendet werden, oder" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -5135,5 +5237,5 @@ "werden." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -5147,10 +5249,14 @@ "und alle Knoten werden ausgewählt." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:160 +msgid "Unglued Node" +msgstr "Knotenpunkte getrennt" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:373 #, java-format msgid "Dupe into {0} nodes" msgstr "In {0} Knoten teilen" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:320 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:397 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -5253,5 +5359,5 @@ msgstr "Letzte Aktion zurücknehmen." -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 msgid "No Shortcut" msgstr "Kein Tastenkürzel" @@ -5273,13 +5379,13 @@ msgstr "OpenStreetMap-Daten" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:29 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:28 msgid "Downloading GPS data" msgstr "Hole GPS-Daten" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:41 msgid "Downloaded GPX Data" msgstr "Heruntergeladene GPS-Daten" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:71 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:69 msgid "Raw GPS data" msgstr "Rohe GPS-Daten" @@ -5293,5 +5399,6 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "Merkmale aus der Zwischenablage allen ausgewählten Elementen zuweisen." +msgstr "" +"Merkmale aus der Zwischenablage allen ausgewählten Elementen zuweisen." #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 @@ -5505,5 +5612,6 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169 -msgid "Header contains several values and cannot be mapped to a single string" +msgid "" +"Header contains several values and cannot be mapped to a single string" msgstr "" "Die Kopfzeile enthält mehrere Werte und kann nicht in eine Zeichenkette " @@ -5638,5 +5746,6 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 msgid "A plugin that allows JOSM to be controlled from other applications." -msgstr "Ein Plugin, das es anderen Programmen erlaubt, JOSM zu kontrollieren." +msgstr "" +"Ein Plugin, das es anderen Programmen erlaubt, JOSM zu kontrollieren." #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 @@ -5863,5 +5972,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69 -msgid "Maximum number of segments allowed in each generated way. Default 250." +msgid "" +"Maximum number of segments allowed in each generated way. Default 250." msgstr "" "Maximale Anzahl von Abschnitten in jedem generierten Weg. Standard ist 250." @@ -5885,10 +5995,11 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72 msgid "" -"Accuracy of Douglas-Peucker line simplification, measured in degrees." -"
Lower values give more nodes, and more accurate lines. Default 0.0003." -msgstr "" -"Genauigkeit der Douglas-Peucker Linien-Vereinfachung, gemessen in Grad." -"
Kleinere Werte ergeben genauere Linien, aber mehr Knoten. Standard ist " +"Accuracy of Douglas-Peucker line simplification, measured in " +"degrees.
Lower values give more nodes, and more accurate lines. Default " "0.0003." +msgstr "" +"Genauigkeit der Douglas-Peucker Linien-Vereinfachung, gemessen in " +"Grad.
Kleinere Werte ergeben genauere Linien, aber mehr Knoten. Standard " +"ist 0.0003." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73 @@ -5927,5 +6038,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80 msgid "Maximum size of each cache directory in bytes. Default is 300MB" -msgstr "Maximale Größe des Speicherverzeichnisses in Bytes. Standard ist 300MB" +msgstr "" +"Maximale Größe des Speicherverzeichnisses in Bytes. Standard ist 300MB" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81 @@ -6538,9 +6650,11 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:509 msgid "" -"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." -"org/index.php/User:JLS/speller) or tag checking data files." -msgstr "" -"Die Datenquellen (URL oder Dateiname) für die Rechtschreib- (siehe http://" -"wiki.openstreetmap.org/index.php/User:JLS/speller) oder Merkmalsprüfung." +"The sources (URL or filename) of spell check (see " +"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking " +"data files." +msgstr "" +"Die Datenquellen (URL oder Dateiname) für die Rechtschreib- (siehe " +"http://wiki.openstreetmap.org/index.php/User:JLS/speller) oder " +"Merkmalsprüfung." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:510 @@ -6664,5 +6778,6 @@ #: ../plugins/livegps/livegps/LiveGpsPlugin.java:67 msgid "Continuously center the LiveGPS layer to current position." -msgstr "Die LiveGPS-Ebene kontinuierlich auf die aktuelle Position zentrieren." +msgstr "" +"Die LiveGPS-Ebene kontinuierlich auf die aktuelle Position zentrieren." #: ../plugins/livegps/livegps/LiveGpsPlugin.java:82 @@ -6957,6 +7072,6 @@ msgstr "" "Kann die rxtxSerial-Bibliothek nicht laden. Falls Sie Hilfe bei der " -"Installation brauchen, versuchen Sie die GlobalSat-Internetseite http://www." -"raphael-mack.de/josm-globalsat-gpx-import-plugin/" +"Installation brauchen, versuchen Sie die GlobalSat-Internetseite " +"http://www.raphael-mack.de/josm-globalsat-gpx-import-plugin/" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 @@ -7005,6 +7120,6 @@ msgstr "Eine neue Ebene hinzufügen" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:40 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:43 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 #, java-format @@ -7012,19 +7127,34 @@ msgstr "{0} herunterladen" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:51 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:55 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 msgid "Contacting WMS Server..." msgstr "Verbinde zu WMS-Server..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157 msgid "Create buildings" msgstr "Gebäude erstellen" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 msgid "CadastreGrabber: Illegal url." msgstr "CadastreGrabber: Ungültige URL." + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +msgid "" +"To avoid cadastre WMS overload,\n" +"building import size is limited to 1 km2 max." +msgstr "" +"Um Überlastung des Kataster-WMS zu vermeiden, ist die\n" +"Importgröße für Gebäude auf 1 Quadratkilometer begrenzt." + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +msgid "Please, enable auto-sourcing and check cadastre millesime." +msgstr "" +"Bitte aktivieren Sie automatische \"source\"-Texte und prüfen das Kataster-" +"Millisime (Jahr)." #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78 @@ -7046,5 +7176,22 @@ msgstr "Kataster: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:128 +msgid "Cadastre" +msgstr "Kataster" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:139 +msgid "Auto sourcing" +msgstr "Automatische Quellenangabe" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164 +msgid "Invalid projection" +msgstr "Ungültige Projektion" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 +#, java-format +msgid "Change the projection to {0} first." +msgstr "Ändern Sie die Projektion vorher auf {0}." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:169 msgid "" "To enable the cadastre WMS plugin, change\n" @@ -7053,12 +7200,4 @@ "Um das Kataster-WMS-Plugin zu aktivieren, ändern Sie die JOSM-Projektion auf " "Lambert und starten neu." - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132 -msgid "Cadastre" -msgstr "Kataster" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 -msgid "Auto sourcing" -msgstr "Automatische Quellenangabe" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20 @@ -7132,6 +7271,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:43 msgid "" -"More than one WMS layer present.\n" -"Select one of them first, then retry." +"More than one WMS layer present\n" +"Select one of them first, then retry" msgstr "" "Mehr als eine WMS-Ebene.\n" @@ -7142,5 +7281,5 @@ msgstr "Position aus dem Zwischenspeicher laden (nur wenn er aktiviert ist)" -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136 #, java-format @@ -7150,13 +7289,13 @@ msgstr[1] "Weg vereinfachen ({0} Knoten entfernen)" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61 msgid "Extract SVG ViewBox..." msgstr "SVG-Dimensionen extrahieren..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65 msgid "Extract best fitting boundary..." msgstr "Optimale Dimensionen extrahieren..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:120 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126 msgid "Create boundary" msgstr "Grenze erstellen" @@ -7192,15 +7331,15 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 msgid "Save WMS layer to file" msgstr "WMS-Ebene in Datei speichern" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "Load WMS layer from file" msgstr "WMS-Ebene aus Datei laden" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -7208,5 +7347,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 msgid "File Format Error" msgstr "Dateiformatfehler" @@ -7214,5 +7353,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 msgid "Error loading file" msgstr "Fehler beim Laden der Datei" @@ -7243,59 +7382,61 @@ msgstr "Lambert-Zonenfehler zwischenspeichern" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 msgid "Replace original background by JOSM background color." msgstr "Ersetze die originalen Hintergrundfarben mit JOSM-Farben" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30 msgid "Reverse grey colors (for black backgrounds)." msgstr "Graue Farben invertieren (für schwarze Hintergründe)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 msgid "Set background transparent." msgstr "Aktiviere transparenten Hindergrund" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34 msgid "Draw boundaries of downloaded data." msgstr "Grenzenlinien der heruntergeladenen Daten zeichnen" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Enable automatic caching." msgstr "Automatischen Zwischenspeicher aktivieren." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 msgid "Max. cache size (in MB)" msgstr "Max. Speichergröße (in MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:53 -msgid "" -"A special handler of the french cadastre wms at www.cadastre.gouv." -"fr

Please read the Terms and Conditions of Use here (in french): " -"
http://www.cadastre.gouv.fr/scpc/html/" -"CU_01_ConditionsGenerales_fr.html
before any upload of data created " -"by this plugin." -msgstr "" -"Eine spezielle Schnittstelle für das französische Kataster-WMS auf www." -"cadastre.gouv.fr

Bitte lesen Sie die Nutzungsbedingungen (auf " -"französisch):
http://www.cadastre.gouv.fr/scpc/html/" -"CU_01_ConditionsGenerales_fr.html
bevor SIe Daten die mit Hilfe " -"dieses Plugins erstellt wurden, hochladen." - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:58 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:55 +msgid "" +"A special handler of the french cadastre wms at " +"www.cadastre.gouv.fr

Please read the Terms and Conditions of Use here " +"(in french):
" +"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " +"
before any upload of data created by this plugin." +msgstr "" +"Eine spezielle Schnittstelle für das französische Kataster-WMS auf " +"www.cadastre.gouv.fr

Bitte lesen Sie die Nutzungsbedingungen (auf " +"französisch):
http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html
bevor SIe Daten die mit Hilfe dieses Plugins erstellt wurden, " +"hochladen." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 msgid "French cadastre WMS" msgstr "Französisches Kataster-WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64 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:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65 msgid "Source" msgstr "Quelle" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -7305,15 +7446,17 @@ "Hintergrundfarbe ersetzen." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 -msgid "" -"Invert the original texts from black to white (and all intermediate greys)." -msgstr "" -"Invertiere die Originaltexte von schwarz nach weiß (auch alle Graustufen)" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +msgid "" +"Invert the original black and white colors (and all intermediate greys). " +"Useful for texts on dark backgrounds." +msgstr "" +"Invertiere die Originaltexte von schwarz nach weiß (auch alle Graustufen). " +"Nützlich für Texte auf dunklen Hintergründen." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Allows multiple layers stacking" msgstr "Stapeln mehrerer Schichten erlauben" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:99 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" @@ -7321,13 +7464,26 @@ "durchsichtig." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Ein Rechteck um die vom WMS-Server heruntergeladenen Daten zeichnen" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:113 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 msgid "Image grab multiplier:" msgstr "Bildladefaktor:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:162 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:125 +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:129 +msgid "Fixed size square (default is 100m)" +msgstr "Feste Quadratgröße (Standard ist 100m)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +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:167 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -7416,5 +7572,6 @@ #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." -msgstr "\"{0}\" ist nicht geschlossen und kann deshalb nicht vereinigt werden." +msgstr "" +"\"{0}\" ist nicht geschlossen und kann deshalb nicht vereinigt werden." #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:169 @@ -7443,5 +7600,5 @@ msgstr "Keine Überschneidungen gefunden. Es wurde nicht geändert." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:254 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:255 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -7592,7 +7749,7 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:203 msgid "" -"Take a photo of your GPS receiver while it displays the time." -"
Display that photo here.
And then, simply capture the time you read " -"on the photo and select a timezone
" +"Take a photo of your GPS receiver while it displays the " +"time.
Display that photo here.
And then, simply capture the time you " +"read on the photo and select a timezone
" msgstr "" "Nehmen Sie ein Foto des GPS-Empfängers auf, während er die Zeit " @@ -7662,8 +7819,9 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:484 -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 "" +"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?" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:501 @@ -7708,5 +7866,5 @@ msgstr "Ungültige Zeitzone" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #, java-format msgid "" @@ -7717,14 +7875,14 @@ "Erwartetes Format: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:579 msgid "Invalid offset" msgstr "Ungültiger Offset" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:641 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:643 #, java-format msgid "Found {0} matchs of {1} in GPX track {2}" msgstr "{0} Treffer für {1} in GPS-Spur {2} gefunden" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:642 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:644 msgid "GPX Track loaded" msgstr "GPS-Spur geladen" @@ -7732,5 +7890,5 @@ #: ../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/UploadDataGui.java:79 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 msgid "Upload Traces" msgstr "GPS-Spuren hochladen" @@ -7740,58 +7898,74 @@ msgstr "GPS-Spuren zu openstreetmap.org hochladen" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 -msgid "Upload GPX track" +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71 +msgid "Upload Trace" msgstr "GPS-Spur hochladen" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Public" msgstr "Öffentlich" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 msgid "Selected makes your trace public in openstreetmap.org" -msgstr "Wird dies gewählt, werden Ihre Spuren bei openstreetmap.org öffentlich" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:120 +msgstr "" +"Wird dies gewählt, werden Ihre Spuren bei openstreetmap.org öffentlich" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Description" msgstr "Beschreibung" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:123 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 msgid "Tags" msgstr "Merkmale" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:182 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:153 +#, java-format +msgid "Selected track: {0}" +msgstr "Gewählte GPS-Spur: {0}" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:176 msgid "Connecting..." msgstr "Verbinden..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 -msgid "Uploading GPX track..." -msgstr "GPS-Spur hochladen..." - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:214 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:199 +msgid "Upload cancelled" +msgstr "Hochladen abgebrochen" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:209 +msgid "Error while uploading" +msgstr "Fehler beim Hochladen" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "GPX-Hochladen war erfolgreich" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:227 -msgid "Error while uploading" -msgstr "Fehler beim Hochladen" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:235 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +msgid "Upload failed. Server returned the following message: " +msgstr "" +"Hochladen fehlgeschlagen. Der Server hat folgene Meldung zurückgegeben: " + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 +#, java-format +msgid "Uploading GPX track: {0}% ({1} of {2})" +msgstr "GPS-Spur hochladen: {0}% ({1} von {2})" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "Keine Beschreibung angegeben. Bitte Beschreibungstext ergänzen." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:252 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "Keine GPX-Ebene gewählt. Kann GPS-Spur nicht hochladen." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:241 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "Kein Nutzername angegeben." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:244 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "Kein Passwort angegeben." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "GPS-Spur hochladen" @@ -8017,15 +8191,15 @@ msgstr "Automatisches Laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS-Ebene ({0}): Automatisches Laden mit Zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS-Ebene ({0}): Laden mit Zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -8034,17 +8208,17 @@ "die Auflösung" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:232 msgid "Download visible tiles" msgstr "Sichtbare Kacheln laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241 msgid "Change resolution" msgstr "Auflösung ändern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:253 msgid "Reload erroneous tiles" msgstr "Fehlerkacheln neu laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:264 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:271 msgid "Alpha channel" msgstr "Alphakanal" @@ -8826,6 +9000,6 @@ msgstr "" "Die maximale Downloadgröße ist 0.25 und Ihre Anfrage war zu groß. Fordern " -"Sie entweder einen kleineren Ausschnitt an oder nutzen Sie die Datei planet." -"osm." +"Sie entweder einen kleineren Ausschnitt an oder nutzen Sie die Datei " +"planet.osm." #: specialmessages.java:9 @@ -11488,5 +11662,5 @@ #: trans_presets.java:2078 msgid "College" -msgstr "College" +msgstr "Hochschule" #: trans_presets.java:2080 @@ -11512,9 +11686,9 @@ #: trans_presets.java:2099 msgid "Arts Centre" -msgstr "Kunstausstellungsgebäude" +msgstr "Kulturzentrum" #: trans_presets.java:2101 msgid "Edit Arts Centre" -msgstr "Kunstausstellung bearbeiten" +msgstr "Kulturzentrum bearbeiten" #: trans_presets.java:2105 @@ -12204,5 +12378,5 @@ #: trans_presets.java:2400 msgid "Electronics" -msgstr "Elektronik" +msgstr "Elektronikgeschäft" #: trans_presets.java:2401 @@ -12896,9 +13070,9 @@ #: trans_presets.java:2922 msgid "Edit a Turn Restriction" -msgstr "Abbiegeeinschränkungen bearbeiten" +msgstr "Abbiegeeinschränkung bearbeiten" #: trans_presets.java:2924 msgid "Restriction" -msgstr "Einschränkungen" +msgstr "Einschränkung" #: trans_presets.java:2924 Index: /applications/editors/josm/i18n/po/el.po =================================================================== --- /applications/editors/josm/i18n/po/el.po (revision 13832) +++ /applications/editors/josm/i18n/po/el.po (revision 13833) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-15 22:03+0100\n" +"POT-Creation-Date: 2009-02-21 16:35+0100\n" "PO-Revision-Date: 2009-02-14 09:53+0000\n" "Last-Translator: logictheo \n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-02-15 20:41+0000\n" +"X-Launchpad-Export-Date: 2009-02-22 20:29+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 #, java-format msgid "" @@ -26,10 +26,10 @@ "\n" msgstr "" -"Η ρύθμιση της συντόμευσης πληκτρολογίου ''{0}'' για την ενέργεια " -"''{1}'' ({2}) απέτυχε\n" +"Η ρύθμιση της συντόμευσης πληκτρολογίου ''{0}'' για την ενέργεια ''{1}'' " +"({2}) απέτυχε\n" "γιατί η συντόμευση είναι ήδη πιασμένη από την ενέργεια ''{3}'' ({4}).\n" "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 msgid "" "This action will have no shortcut.\n" @@ -39,5 +39,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -48,5 +48,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "Συμβουλή: Μπορείτε να αλλάξετε τις συντομεύσεις στις προτιμήσεις" @@ -57,17 +57,17 @@ #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 msgid "Information" msgstr "Πληροφορίες" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Do nothing" msgstr "Καμία ενέργεια" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Report Bug" msgstr "Αναφέρετε Bug" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 msgid "" "An unexpected exception occurred.\n" @@ -82,19 +82,19 @@ "για bug." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Unexpected Exception" msgstr "Μη Αναμενόμενη Εξαίρεση" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 #, java-format msgid "Please report a ticket at {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" "Συμπεριλάβετε τα βήματα ποθ οδήγησαν στο σφάλμα (όσο πιο λεπτομερώς γίνεται)!" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:78 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -104,9 +104,9 @@ "πρόσθετων πριν αναφέρετε bug." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Be sure to include the following information:" msgstr "Βεβαιωθείτε ότι συμπεριλάβατε τις ακόλουθεσ πληροφορίες:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75 msgid "(The text has already been copied to your clipboard.)" msgstr "(Το κείμενο έχει ήδη αντιγραφεί στο πρόχειρο σας.)" @@ -120,5 +120,5 @@ msgstr "Σφάλμα στην αναπαραγωγή ήχου" -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:94 @@ -126,5 +126,5 @@ msgstr "Επικοινωνία με τον διακομιστή OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:48 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:32 @@ -132,10 +132,10 @@ msgstr "Μεταφόρτωση δεδομένων OSM..." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 msgid "NullPointerException, possibly some missing tags." msgstr "NullPointerException, πιθανόν να λείπουν κάποιες ετικέτες" -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83 msgid "Preparing data..." msgstr "Προετοιμασία δεδομένων..." @@ -165,48 +165,48 @@ msgstr "Μεταφόρτωση σημείων {0} ως {1}..." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:164 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:168 msgid "Unknown version" msgstr "Άγνωστη έκδοση" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 msgid "Found element in non-way." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 msgid " has zero ref" msgstr " έχει μηδενική αναφορά" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 msgid "Found element in non-relation." msgstr "Βρέθηκε στοιχείο εκτός σχέσης." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:252 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250 msgid "Incomplete specification with ref=0" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294 msgid "Illegal object with id=0" msgstr "Άγνωστο αντικείμενο με id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Ανύπαρκτο απαιτούμενο χαρακτηριστικό \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 #, java-format msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:502 msgid "Prepare OSM data..." msgstr "Προετοιμασία δεδομένων OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:518 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:516 msgid "Ill-formed node id" msgstr "Κακοσχηματισμένο id κόμβου" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:280 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:287 msgid "Parse error: invalid document structure for gpx document" msgstr "" @@ -216,18 +216,18 @@ msgstr "Επικοινωνία με τον Διακομιστή..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Παρέχετε ένα σύντομο σχόλιο για τις αλλαγές που αποστέλλετε:" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 msgid "Commit comment" msgstr "Οριστικοποίηση σχολίου" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64 @@ -237,34 +237,32 @@ msgstr "Προέκυψε σφάλμα: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:192 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190 msgid "Opening changeset..." msgstr "Άνοιγμα πακέτου αλλαγών..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:226 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224 msgid "Server does not support changesets" msgstr "Ο διακομιστής δεν υποστηρίζει πακέτα αλλαγών" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:246 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:428 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:609 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:184 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607 msgid "Unknown host" msgstr "Άγνωστος υπολογιστής" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282 msgid "Preparing..." msgstr "Προετοιμασία..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:294 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292 msgid "Uploading..." msgstr "Αποστολή..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375 msgid "Closing changeset..." msgstr "Κλείσιμο πακέτου αλλαγών" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:652 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650 msgid "Transfer aborted due to error (will wait for 5 seconds):" msgstr "" @@ -303,17 +301,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95 #: ../core/src/org/openstreetmap/josm/Main.java:348 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:29 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 @@ -326,11 +327,11 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:110 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -345,11 +346,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:186 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 msgid "Creating main GUI" msgstr "Δημιουργία κύριου GUI" #: ../core/src/org/openstreetmap/josm/Main.java:195 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:271 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:278 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:56 msgid "Help" @@ -391,21 +392,21 @@ msgstr "Αγνοήθηκε κακοσχηματισμένο URL αρχείου:\"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109 msgid "min lat" msgstr "ελαχ. γ. πλάτος" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111 msgid "min lon" msgstr "ελαχ. γ. μήκος" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:117 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "max lat" msgstr "μεγ. γ. πλάτος" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 msgid "max lon" msgstr "μεγ. γ. μήκος" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:122 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -415,5 +416,5 @@ "για να κατεβάσετε μια περιοχή)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:134 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130 msgid "Bounding Box" msgstr "" @@ -449,6 +450,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:96 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:894 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:956 msgid "name" msgstr "όνομα" @@ -481,5 +482,5 @@ msgstr "ζουμ" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:107 msgid "" "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -487,5 +488,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:109 msgid "Slippy map" msgstr "Slippy map" @@ -496,7 +497,7 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:605 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:602 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:89 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -516,5 +517,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380 msgid "Remove" msgstr "Αφαίρεση" @@ -654,20 +655,20 @@ msgstr "Άν δοθεί, επαναφορά των ρυθμίσεων αντί για ανάγνωση τους." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:109 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:186 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:198 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:108 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:191 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:203 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 msgid "Java OpenStreetMap Editor" msgstr "Java OpenStreetMap Editor" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:111 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:110 msgid "Message of the day not available" msgstr "Το μήνυμα της ημέρας δεν είναι διαθέσιμο" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:200 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:205 msgid "Downloading \"Message of the day\"" msgstr "" @@ -707,33 +708,33 @@ msgstr "Σμίκρυνση" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:234 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:474 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:512 msgid "" msgstr "<διαφορετικά>" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:383 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:380 msgid "More information about this feature" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:393 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:390 msgid "Optional Attributes:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:437 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Χρήση προεπιλογής \"{0}\" από ομάδα \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:438 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:435 #, java-format msgid "Use preset ''{0}''" msgstr "Χρήση προεπιλογής \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 msgid "way" @@ -742,11 +743,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:214 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 msgid "node" msgid_plural "nodes" @@ -754,6 +755,6 @@ msgstr[1] "κόμβοι" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:81 @@ -763,30 +764,30 @@ msgstr[1] "σχέσεις" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:475 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 #, java-format msgid "Unknown type: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:549 +#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 +#, java-format +msgid "Could not read tagging preset source: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 -#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 -#, java-format -msgid "Could not read tagging preset source: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:555 #, java-format msgid "Error parsing {0}: " msgstr "Σφάλμα ανάλυσης {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:572 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:569 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595 #, java-format msgid "Change {0} object" @@ -795,9 +796,17 @@ msgstr[1] "Αλλαγή {0} αντικειμένων" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 msgid "Nothing selected!" msgstr "Τίποτα επιλεγμένο!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 +msgid "Selection unsuitable!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +msgid "Apply Preset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 msgid "Change Properties" msgstr "Αλλαγή ιδιοτήτων" @@ -808,14 +817,14 @@ msgstr "Ομάδα προεπιλογών \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:107 msgid "File" msgstr "Αρχείο" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:135 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:107 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:86 @@ -827,22 +836,22 @@ msgstr "Επεξεργασία" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 msgid "View" msgstr "Προβολή" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:26 msgid "Tools" msgstr "Εργαλεία" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:141 msgid "Audio" msgstr "Ήχος" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:142 msgid "Presets" msgstr "Προεπιλογές" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:40 @@ -854,18 +863,18 @@ msgstr "Μενού: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:210 msgid "Wireframe View" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212 msgid "Toggle Wireframe view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:28 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 msgid "Contacting the OSM server..." msgstr "Επικοινωνία με τον διακομιστή OSM..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 #, java-format msgid "This will change up to {0} object." @@ -874,11 +883,11 @@ msgstr[1] "Αυτό θα αλλάξει εώς {0} αντικείμενα." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 msgid "An empty value deletes the key." msgstr "Κενή τιμή διαγράφει το κλειδί." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66 @@ -888,7 +897,7 @@ msgstr "Κλειδί" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 @@ -897,10 +906,10 @@ msgstr "Τιμή" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333 msgid "Change values?" msgstr "Αλλαγή τιμών;" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:257 #, java-format msgid "Change properties of up to {0} object" @@ -909,34 +918,34 @@ msgstr[1] "Αλλαγή ιδιοτήτων εώς {0} αντικειμένων" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 msgid "Please select a key" msgstr "Παρακαλώ επιλέξτε κλειδί" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321 msgid "Please select a value" msgstr "Παρακαλώ επιλέξτε μια τιμή" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:445 msgid "Please select the objects you want to change properties for." msgstr "" "Παρακαλώ επιλέξτε τα αντικείμενα των οποίων τις ιδιότητες θέλετε να αλλάξετε." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 msgid "Properties/Memberships" msgstr "Ιδιότητες/Υπαγωγές" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 msgid "Properties for selected objects." msgstr "Ιδιότητες επιλεγμένων αντικειμένων." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97 @@ -948,58 +957,59 @@ msgstr "Εναλλαγή: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 msgid "Member Of" msgstr "Μέλος του" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Role" msgstr "Ρόλος" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:559 msgid "Change relation" msgstr "Αλλαγή σχέσης" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Σίγουρα επιθυμήτε την διαγραφή της επιλογής από την σχέση {0};" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 msgid "Delete from relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:600 msgid "Add Properties" msgstr "Προσθήκη Ιδιοτήτων" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 msgid "Add a new key/value pair to all objects" msgstr "Προσθήκη νέου ζεύγους κλειδιού/τιμής σε όλα τα αντικείμενα" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 msgid "Edit Properties" msgstr "Επεξεργασία Ιδιοτήτων" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609 +msgid "Edit the value of the selected key for all objects" +msgstr "" +"Επεξεργασία της τιμής του επιλεγμένου κλειδιού για όλα τα αντικείμενα" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 -msgid "Edit the value of the selected key for all objects" -msgstr "Επεξεργασία της τιμής του επιλεγμένου κλειδιού για όλα τα αντικείμενα" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 msgid "Delete Properties" msgstr "Διαγραφή Ιδιοτήτων" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:77 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:293 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 @@ -1008,98 +1018,116 @@ msgstr "Διαγραφή" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 msgid "Delete the selected key in all objects" msgstr "Διαγραφή του επιλεγμένου κλειδιού από όλα τα αντικείμενα" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:763 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Ιδιότητες: {0} / Υπαγωγές: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:769 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 msgid "Properties / Memberships" msgstr "Ιδιότητες / Υπαγωγές" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178 +msgid "Apply Changes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 msgid "Create new relation" msgstr "Δημιουργία νέας σχέσης" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208 msgid "Edit new relation" msgstr "Επεξεργασία νέας σχέσης" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209 #, java-format msgid "Edit relation #{0}" msgstr "Επεξεργασία σχέσης #{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230 +msgid "Basic" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Occupied By" msgstr "Κατεχόμενο από" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311 msgid "Tags (empty value deletes tag)" msgstr "Ετικέτες (κενή τιμή διαγράφει την ετικέτα)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313 msgid "Members" msgstr "Μέλη" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 +msgid "Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 msgid "Move the currently selected members up" msgstr "Μετακίνηση των επιλεγμένων μελών πάνω" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358 +msgid "Add Selected" +msgstr "Προσθήκη επιλεγμένων" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359 +msgid "Add all currently selected objects as members" +msgstr "Προσθήκη επιλεγμένων αντικειμένων ως μέλη" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365 +msgid "Remove Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366 +msgid "Remove all currently selected objects from relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 +msgid "Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 msgid "Move the currently selected members down" msgstr "Μετακίνηση των επιλεγμένων μελών κάτω" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356 -msgid "Add Selected" -msgstr "Προσθήκη επιλεγμένων" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:357 -msgid "Add all currently selected objects as members" -msgstr "Προσθήκη επιλεγμένων αντικειμένων ως μέλη" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:363 -msgid "Remove Selected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:364 -msgid "Remove all currently selected objects from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381 msgid "Remove the member in the current table row from this relation" -msgstr "Αφαίρεση του μέλους στην τρέχουσα σειρά του πίνακα από αυτήν την σχέση" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:405 +msgstr "" +"Αφαίρεση του μέλους στην τρέχουσα σειρά του πίνακα από αυτήν την σχέση" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394 msgid "Download Members" msgstr "Λήψη μελών" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:406 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395 msgid "Download all incomplete ways and nodes in relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:415 -msgid "Basic" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:453 #, java-format msgid "Members: {0}" msgstr "Μέλη: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:587 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:461 +#, java-format +msgid "Relation Editor: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:585 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 msgid "There were conflicts during import." msgstr "Υπήρχαν συγκρούσεις στην εισαγωγή" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593 msgid "Error parsing server response." msgstr "Σφάλμα κατά την ανάλυση της απάντησης του διακομιστή." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:600 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:594 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:598 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -1113,9 +1141,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:345 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 msgid "Error" msgstr "Σφάλμα" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:599 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597 msgid "Cannot connect to server." msgstr "Αδυναμία σύνδεσης με το διακομιστή" @@ -1278,5 +1306,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:94 @@ -1286,5 +1314,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 msgid "" @@ -1350,16 +1378,24 @@ msgstr "Επιλογή: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +msgid "Open an editor for the selected relation" +msgstr "Άνοιγμα επεξεργαστή για την επιλεγμένη σχέση" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +msgid "Delete the selected relation" +msgstr "Διαγραφή της επιλεγμένης σχέσης" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 #: trans_presets.java:2904 msgid "Relations" msgstr "Σχέσεις" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 msgid "Open a list of all relations." msgstr "Άνοιγμα λίστας όλων τον σχέσεων." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 @@ -1367,17 +1403,9 @@ msgstr "Νέα" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 msgid "Create a new relation" msgstr "Σημιουργία νέας σχέσης" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open an editor for the selected relation" -msgstr "Άνοιγμα επεξεργαστή για την επιλεγμένη σχέση" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -msgid "Delete the selected relation" -msgstr "Διαγραφή της επιλεγμένης σχέσης" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:130 #, java-format msgid "Relations: {0}" @@ -1405,18 +1433,9 @@ msgstr "Σωρός Εντολών: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 -msgid "Conflict" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 -msgid "Merging conflicts." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 msgid "Resolve" msgstr "Επίλυση" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:68 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -1424,30 +1443,39 @@ "λίστα." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:105 -msgid "Please select something from the conflict list." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +msgid "Conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +msgid "Merging conflicts." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Resolve Conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +msgid "Solve Conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 #, java-format msgid "Conflicts: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Conflicts" msgstr "Συγκρούσεις" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 msgid "conflict" msgstr "σύγκρουση" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 msgid "background" msgstr "φόντο" @@ -1471,5 +1499,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 msgid "Customize Color" @@ -1477,5 +1505,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1485,5 +1513,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1492,5 +1520,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:326 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:152 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -1508,5 +1536,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:265 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 #, java-format msgid "Audio synchronized at point {0}." @@ -1514,5 +1542,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232 msgid "Unable to synchronize in layer being played." msgstr "Αδυναμία συγχρονισμού στο επίπεδο που αναπαράγεται." @@ -1533,5 +1561,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:958 msgid "desc" msgstr "περιγραφή" @@ -1554,5 +1582,5 @@ msgstr "Σφάλμα στην εμφάνιση του URL" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -1560,5 +1588,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -1566,18 +1594,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224 msgid "Unable to create new audio marker." msgstr "Αδυναμία δημιουργίας νέου σημαδιού ήχου." #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 msgid "Convert to data layer" msgstr "Μετατροπή σε επίπεδο δεδομένων" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:725 -msgid "" -"Upload of unprocessed GPS data as map data is considered harmful." -"
If you want to upload traces, look here:" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:645 +msgid "" +"Upload of unprocessed GPS data as map data is considered " +"harmful.
If you want to upload traces, look here:" msgstr "" "Η αποστολή μη επεξεργασμένων δεδομένων GPS ως δεδομένα χάρτη θερείτε " @@ -1585,66 +1613,22 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:646 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:747 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:448 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:667 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "Converted from: {0}" msgstr "Μετατράπηκε από: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612 -msgid "Upload this trace..." -msgstr "Αποστολή αυτού του ίχνους..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:616 -msgid "" -"This functionality has been added only recently. Please
use with " -"care and check if it works as expected." -msgstr "" -"Αυτή η δυνατότητα προστέθηκε πρόσφατα.Παρακαλώ
χρησιμοποιήστε την " -"με προσοχή και ελέγξτε ότι δουλεύει όπως πρέπει." - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:102 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:107 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:626 -msgid "Upload track filtered by JOSM" -msgstr "Αποστολή ίχνους φιλτραρισμένου από το JOSM" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:103 -#, java-format -msgid "Upload raw file: {0}" -msgstr "Αποστολή ακατέργαστου αρχείου: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:108 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:627 -msgid "Upload raw file: " -msgstr "Αποστολή ακατέργαστου αρχείου: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640 -msgid "Description:" -msgstr "Περιγραφή:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:123 -msgid "Tags:" -msgstr "Ετικέτες:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:129 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:648 -msgid "GPX-Upload" -msgstr "Αποστολή GPX" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:229 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:217 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113 msgid "gps point" msgstr "σημείο gps" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 #: trans_presets.java:1795 trans_presets.java:1801 trans_presets.java:1807 #: trans_presets.java:1813 trans_presets.java:1819 trans_presets.java:1825 @@ -1664,5 +1648,5 @@ msgstr[1] "ίχνη" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 msgid "point" msgid_plural "points" @@ -1670,5 +1654,5 @@ msgstr[1] "σημεία" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 #, java-format msgid "a track with {0} point" @@ -1677,5 +1661,5 @@ msgstr[1] "ένα ίχνος με {0} σημεία" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} consists of {1} track" @@ -1684,5 +1668,5 @@ msgstr[1] "το {0} αποτελείται από {1} ίχνη" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} point" @@ -1691,25 +1675,25 @@ msgstr[1] "{0} σημεία" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117 msgid "Customize line drawing" msgstr "Προσαρμογή του σχεδιασμού γραμμών" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:296 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 msgid "Use global settings." msgstr "Χρηση καθολικών ρυθμίσεων." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 msgid "Draw lines between points for this layer." msgstr "Σχεδίαση γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:298 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123 msgid "Do not draw lines between points for this layer." msgstr "ΠΑράλειψη σχεδίασης γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:135 msgid "Select line drawing options" @@ -1743,5 +1727,5 @@ msgstr "Εικόνες JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290 #, java-format msgid "{0} track, " @@ -1750,5 +1734,5 @@ msgstr[1] "{0} τροχιές, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 #, java-format msgid "{0} route, " @@ -1757,5 +1741,5 @@ msgstr[1] "{0} διαδρομές, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 #, java-format msgid "{0} waypoint" @@ -1764,55 +1748,51 @@ msgstr[1] "{0} σημεία αναφοράς" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #, java-format msgid "Name: {0}" msgstr "Όνομα: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "Description: {0}" msgstr "Περιγραφή: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 msgid "Timespan: " msgstr "Διάρκεια: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Length: " msgstr "Μήκος: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:642 -msgid "Tags (keywords in GPX):" -msgstr "Ετικέτες (λέξεις κλειδιά σε GPX):" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:655 msgid "time" msgstr "ώρα" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:780 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:679 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:700 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 msgid "Download from OSM along this track" msgstr "Λήψη από OSM κατά μηκός αυτού του ίχνους" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:686 msgid "Download everything within:" msgstr "Λήψη όλων εντός:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 #, java-format msgid "{0} meters" msgstr "{0} μέτρα" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:692 msgid "Maximum area per request:" msgstr "Μέγιστη περιοχή ανά αίτημα:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 #, java-format msgid "{0} sq km" msgstr "{0} τετρ. χλμ" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787 #, java-format msgid "" @@ -1823,15 +1803,15 @@ "συνεχίσετε;" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:844 #, java-format msgid "Audio markers from {0}" msgstr "Σημάδια ήχου από {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 msgid "No GPX track available in layer to associate audio with." msgstr "" "Δεν υπάρχει διαθέσιμο ίχνος GPX στο επίπεδο για την συσχέτιση με τον ήχο." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "" "Some waypoints with timestamps from before the start of the track were " @@ -1841,5 +1821,5 @@ "παραλείφθηκαν." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -1947,19 +1927,19 @@ msgstr "Η ώρα ποθ εισήχθει δεν μπόρεσε να ερμηνευθεί." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:140 msgid "outside downloaded area" msgstr "εκτός περιοχής λήψης" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 #, java-format msgid "{0} consists of:" msgstr "το {0} αποτελείται από:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:353 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:347 #, java-format msgid " ({0} deleted.)" msgstr " ({0} διαγράφηκαν.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:445 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 msgid "Convert to GPX layer" msgstr "Μετατροπή σε επίπεδο GPX" @@ -1987,37 +1967,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 msgid "The geographic longitude at the mouse pointer." msgstr "Το γεωγραφικό μήκος στο σημείο του ποντικιού." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The name of the object at the mouse pointer." msgstr "Το όνομα του αντικειμένου στο σημείο του ποντικιού." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 msgid "The geographic latitude at the mouse pointer." msgstr "Το γεωγραφικό πλάτος στο σημείο του ποντικιού." +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +msgid "The angle between the previous and the current way segment." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 -msgid "The angle between the previous and the current way segment." +msgid "The (compass) heading of the line segment being drawn." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 -msgid "The (compass) heading of the line segment being drawn." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:160 msgid "(no object)" msgstr "(κανένα αντικείμενο)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:62 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:56 msgid "Color" msgstr "Χρώμα" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:57 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107 #: trans_presets.java:56 trans_presets.java:92 trans_presets.java:130 @@ -2118,27 +2098,36 @@ msgstr "Όνομα" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:118 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:112 #, java-format msgid "Paint style {0}: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 msgid "Choose" msgstr "Επιλέξτε" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 msgid "Please select a color." msgstr "Παρακαλώ επιλέξτε ένα χρώμα." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 #, java-format msgid "Choose a color for {0}" msgstr "Επιλέξτε ένα χρώμα για {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +msgid "Set to default" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:172 +msgid "Set all to default" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:184 msgid "Colors used by different objects in JOSM." msgstr "Χρώματα που χρησιμοποιούνται από διάφορα αντικείμενα στο JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:171 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:198 msgid "Colors" msgstr "Χρώματα" @@ -2173,23 +2162,23 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45 msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transfered in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:45 +"WARNING: The password is stored in plain text in the preferences " +"file.
The password is transfered in plain text to the server, encoded in " +"the URL.
Do not use a valuable Password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44 msgid "Sort presets menu" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46 msgid "Enable built-in defaults" msgstr "Ενεργοποίηση ενσωματωμένων προεπιλογών" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:58 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69 msgid "Tagging preset source" msgstr "Πηγή προεπιλογών ετικετών" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:156 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 @@ -2197,5 +2186,5 @@ msgstr "Παρακαλώ επιλέξτε την γραμμή για επεξεργασία." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500 @@ -2204,24 +2193,24 @@ msgstr "Παρακαλώ επιλέξτε την γραμμή για διαγραφή." +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88 +msgid "" +"The sources (URL or filename) of tagging preset definition files. See " +"http://josm.openstreetmap.de/wiki/TaggingPresets for help." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89 -msgid "" -"The sources (URL or filename) of tagging preset definition files. See http://" -"josm.openstreetmap.de/wiki/TaggingPresets for help." +msgid "Add a new tagging preset source to the list." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 -msgid "Add a new tagging preset source to the list." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 msgid "Delete the selected source from the list." msgstr "Διαγραφή της επιλεγμένης πηγής από την λίστα." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:94 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93 msgid "Tagging Presets" msgstr "Προεπιλογές Ετικετών" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97 msgid "Tagging preset sources" msgstr "Πηγές προεπιλογών ετικετών" @@ -2236,6 +2225,6 @@ "Κατά την αποθήκευση, διατήρηση αντιγράφων ασφαλείας που τελειώνουν σε ~" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:141 @@ -2243,34 +2232,34 @@ msgstr "Πρόσθετα" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 msgid "Configure available plugins." msgstr "Ρύθμιση διαθέσιμων πρόσθετων." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43 msgid "Download List" msgstr "Λήψη λίστας" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:80 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51 msgid "Update" msgstr "Ενημέρωση" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:60 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 msgid "Configure Sites..." msgstr "Ρύθμιση τοποθεσιών..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add either site-josm.xml or Wiki Pages." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99 msgid "Please select an entry." msgstr "Παρακαλώ επιλέξτε μια επιλογή" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 msgid "Configure Plugin Sites" msgstr "Ρύθμιση τοποθεσιών πρόσθετων" @@ -2446,9 +2435,9 @@ msgstr "Βαθμονόμηση καταγραφέα ήχου" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "Display Settings" msgstr "Ρυθμίσεις απεικόνισης" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "" "Various settings that influence the visual representation of the whole " @@ -2457,55 +2446,64 @@ "Διάφορες ρυθμίσεις που επηρρεάζουν την εμφάνιση ολόκληρου του προγράμματος." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings" msgstr "Ρυθμίσεις σύνδεσης" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings for the OSM server." msgstr "Ρυθμίσεις σύνδεσης για τον διακομηστή OSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Map Settings" msgstr "Ρυθμίσεις Χάρτη" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Settings for the map projection and data interpretation." msgstr "Ρυθμίσεις για την προβολή χάρτη και την ερμηνεία δεδομένων." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Audio Settings" msgstr "Ρυθμίσεις Ήχου" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Settings for the audio player and audio markers." msgstr "Ρυθμίσεις για την αναπαραγωγή ήχου και σημαδιών ήχου." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97 msgid "You have to restart JOSM for some settings to take effect." -msgstr "Πρέπει να επανεκινήσετε το JOSM για να εφαρμοστούν κάποιες ρυθμίσεις." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:25 +msgstr "" +"Πρέπει να επανεκινήσετε το JOSM για να εφαρμοστούν κάποιες ρυθμίσεις." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 msgid "Draw lines between raw gps points." msgstr "Σχεδιασμός γραμμών ανάμεσα σε ακατέργαστα σημεία GPS." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:27 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 msgid "Force lines if no segments imported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:28 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 msgid "Draw large GPS points." msgstr "Σχεδιασμός μεγάλων σημείων GPS." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 -msgid "Color tracks by velocity." -msgstr "Χρωματισμός ιχνών ανάλογα με την ταχύτητα." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34 +msgid "Velocity (red = slow, green = fast)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 +msgid "Dilution of Position (red = high, green = low, if available)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 +msgid "Single Color (can be customized for named layers)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:1346 msgid "Car" msgstr "Αυτοκίνητο" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:309 trans_presets.java:635 trans_presets.java:833 #: trans_presets.java:842 trans_presets.java:851 trans_presets.java:864 @@ -2517,5 +2515,5 @@ msgstr "Ποδήλατο" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:310 trans_presets.java:637 trans_presets.java:832 #: trans_presets.java:841 trans_presets.java:850 trans_presets.java:863 @@ -2526,44 +2524,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 msgid "Draw Direction Arrows" msgstr "Σχεδιασμός Βελών Κατεύθυνσης" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 msgid "Fast drawing (looks uglier)" msgstr "Γρήγορος σχεδιασμός (δείχνει άσχημος)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180 msgid "Only interesting direction hints (e.g. with oneway tag)." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:186 msgid "Only on the head of a way." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44 msgid "Draw segment order numbers" msgstr "Σχεδιασμός αριθμών σειράς τμημάτων" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45 msgid "Draw boundaries of downloaded data" msgstr "Σχεδιασμός ορίων δεδομένων που έχουν ληφθεί" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46 msgid "Draw virtual nodes in select mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47 msgid "Draw inactive layers in other color" msgstr "Σχεδιασμός ανενεργών επιπέδων με άλλο χρώμα" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 msgid "Smooth map graphics (antialiasing)" msgstr "Εξομάλυνση γραφικών χάρτη (antialiasing)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 msgid "" "If your gps device draws too few lines, select this to draw lines along your " @@ -2573,5 +2571,5 @@ "σχεδιαστούν γραμμές στο δρόμο σας." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:71 msgid "" "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines." @@ -2580,22 +2578,23 @@ "σχεδιασμό όλων των γραμμών." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73 msgid "Maximum length (meters)" msgstr "Μέγιστο μήκος (μέτρα)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:77 msgid "" "Force drawing of lines if the imported data contain no line information." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:84 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89 msgid "Draw direction arrows for lines, connecting GPS points." msgstr "Σχεδιασμός βελών κατεύθυνσης για γραμμές που συνδέουν σημεία GPS." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90 -msgid "Draw the direction arrows using table lookups instead of complex math." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:96 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95 +msgid "" +"Draw the direction arrows using table lookups instead of complex math." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:101 msgid "" "Don't draw arrows if they are not at least this distance away from the last " @@ -2603,50 +2602,67 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104 msgid "Minimum distance (pixels)" msgstr "Ελάχιστη απόσταση (pixels)" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:109 -msgid "Choose the hue for the track color by the velocity at that point." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116 -msgid "Allows to tune the track coloring for different average speeds." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122 msgid "Draw larger dots for the GPS points." msgstr "Σχεδιασμός μεγαλύτερων κοθκίδων για τα σημεία GPS." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136 +msgid "" +"All points and track segments will have the same color. Can be customized in " +"Layer Manager." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137 +msgid "Colors points and track segments by velocity." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:138 +msgid "" +"Colors points and track segments by dilution of position (HDOP). Your " +"capture device needs to logs that information." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143 +msgid "Allows to tune the track coloring for different average speeds." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148 +msgid "Track and Point Coloring" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 msgid "GPS Points" msgstr "Σημεία GPS" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175 msgid "Draw direction hints for way segments." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:163 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192 msgid "Draw the order numbers of all segments within their way." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:168 -msgid "Apply antialiasing to the map view resulting in a smoother appearance." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:197 +msgid "" +"Apply antialiasing to the map view resulting in a smoother appearance." msgstr "" "Εφαρμογή antialiasing σετην προβολή χάρτη με αποτέλεσμα ομαλότερη απεικόνηση." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202 msgid "Draw the boundaries of data loaded from the server." msgstr "Σχεδιασμός των ορίων των δεδομένων που λήφθηκαν από τον διακομιστή." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:178 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:207 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212 msgid "Draw the inactive data layers in a different color." msgstr "Σχεδιασμός των ανενερών επιπέδων με διαφορετικό χρώμα." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219 msgid "OSM Data" msgstr "Δεδομένα OSM" @@ -2759,6 +2775,6 @@ "a menu entry of button for the first time. So some of your changes may " "become active even without restart --- but also without collistion handling. " -"This is another reason to restart JOSM after making any changes here." -"

" +"This is another reason to restart JOSM after making any changes " +"here.

" msgstr "" @@ -2771,8 +2787,9 @@ "key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also " "there will be 'keys' listed that correspond to a shortcut on your keyboard " -"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/" -"Semicolon on US keyboards, '.'/Period on German keyboards, ...) instead. Not " -"doing so may result in conflicts, as there is no way for JOSM to know that " -"Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...

" +"(e.g. ':'/Colon). Please also do not use them, use the base key " +"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) " +"instead. Not doing so may result in conflicts, as there is no way for JOSM " +"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US " +"keyboard...

" msgstr "" @@ -2796,6 +2813,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183 msgid "" -"

The pseudo-modifier 'disabled' will disable the shortcut when encountered." -"

" +"

The pseudo-modifier 'disabled' will disable the shortcut when " +"encountered.

" msgstr "" @@ -2865,67 +2882,67 @@ msgstr "Ομάδες τροποποιητών" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:231 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:236 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:250 msgid "layer not in list." msgstr "το επίπεδο δεν είναι στη λίστα." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "usage" msgstr "χρήση" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 msgid "options" msgstr "Επιλογές" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 msgid "Show this help" msgstr "Εμφάνιση αυτής τησ βοήθειας" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +msgid "Standard unix geometry argument" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +msgid "Download the bounding box" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 -msgid "Standard unix geometry argument" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 -msgid "Download the bounding box" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 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:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Open file (as raw gps, if .gpx)" msgstr "Άνοιγμα αρχείου (ως ακατέργαστο gps, αν είναι .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 msgid "Download the bounding box as raw gps" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Select with the given search" msgstr "Επιλογή με την δοθείσα αναζήτηση" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 msgid "Don't launch in fullscreen mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 msgid "Reset the preferences to default" msgstr "Επαναφορά προτιμήσεων στις προκαθορισμένες" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 msgid "Set the language." msgstr "Ρυθμίστε την γλώσσα." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 msgid "examples" msgstr "παραδείγματα" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -2936,22 +2953,22 @@ "ότι φορτώσατε δεδομένα πριν το --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 msgid "Instead of --download= you may specify osm://\n" msgstr "" "Αντί για το --download= μπορείτε να καθορίσεται το osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 msgid "Activating updated plugins" msgstr "Ενεργοποίηση ενημερωμένων πρόσθετων" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 msgid "Loading early plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Setting defaults" msgstr "Ρύθμιση προκαθορισμένων" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171 msgid "Loading plugins" msgstr "Φόρτωση πρόσθετων" @@ -2985,6 +3002,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:108 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:164 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:162 #: trans_presets.java:308 trans_presets.java:309 trans_presets.java:310 #: trans_presets.java:311 trans_presets.java:312 trans_presets.java:313 @@ -3001,5 +3018,5 @@ msgstr "άγνωστο" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:66 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 #, java-format msgid "" @@ -3010,25 +3027,26 @@ "χρειάζεται πλέον." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 #, java-format msgid "Plugin requires JOSM update: {0}." msgstr "Το πρόσθετο απαιτεί ενημέρωση του JOSM: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." -msgstr "Το πρόσθετο {0} είναι απαραίτητο από το πρόσθετο {1} αλλά δεν βρέθηκε." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +msgstr "" +"Το πρόσθετο {0} είναι απαραίτητο από το πρόσθετο {1} αλλά δεν βρέθηκε." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 #, java-format msgid "Plugin not found: {0}." msgstr "Δεν βρέθηκε το πρόσθετο: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Τελευταία ενημέρωση πρόσθετου παραπάνω από {0} μέρες πριν." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 msgid "" "(You can change the number of days after which this warning appears
by " @@ -3039,12 +3057,12 @@ "διαμόρφωση.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 msgid "Disable plugin" msgstr "Απενεργοποίηση πρόσθετου" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" @@ -3052,5 +3070,5 @@ "Δεν ήταν δυνατή η φόρτωση του πρόσθετου {0}. Διαγραφή από τις προτιμήσεις;" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -3060,5 +3078,5 @@ "άδεια αντικατάστασης των υπαρχόντων." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 #, java-format msgid "" @@ -3068,10 +3086,10 @@ "''{0}''." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Σώμφωνα με τις πληροφορίες του πρόσθετου, ο συγγραφέας είναι{0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:262 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -3080,9 +3098,9 @@ "κάντε αναφορά για bug." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 msgid "Should the plugin be disabled?" msgstr "Να απενεργοποιηθεί το πρόσθετο;" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:278 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -3092,5 +3110,5 @@ "να αποφορτωθεί το πρόσθετο." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -3100,6 +3118,6 @@ "πήρατε το JOSM για το πρόβλημα." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:322 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:181 msgid "no description available" msgstr "δεν υπάρχει περιγραφή" @@ -3111,5 +3129,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 msgid "Update Plugins" msgstr "Ενημέρωση πρόσθετων" @@ -3130,5 +3148,6 @@ msgid "{0} Plugin successfully updated. Please restart JOSM." msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -msgstr[0] "{0} Το πρόσθετο ενημερώθηκε επιτυχώς. Παρακαλώ επανεκινήστε το JOSM" +msgstr[0] "" +"{0} Το πρόσθετο ενημερώθηκε επιτυχώς. Παρακαλώ επανεκινήστε το JOSM" msgstr[1] "" "{0} Τα πρόσθετα ενημερώθηκαν επιτυχώς. Παρακαλώ επανεκινήστε το JOSM" @@ -3145,5 +3164,5 @@ msgstr "Το πρόσθετο {0} μοιάζει χαλασμένο ή δεν μπόρεσε να ληφθεί αυτόματα." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 #, java-format msgid "Downloaded plugin information from {0} site" @@ -3152,13 +3171,13 @@ msgstr[1] "Έγινε λήψη πληροφοριών πρόσθετων από {0} τοποθεσίες" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 msgid "No plugin information found." msgstr "Δεν βρέθηκαν πληροφορίες πρόσθετων." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:76 msgid "All installed plugins are up to date." msgstr "Όλα τα εγκατεστημένα πρόσθετα είναι ενημεωμένα." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 #, java-format msgid "" @@ -3171,9 +3190,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:105 msgid "Download missing plugins" msgstr "Λήψη πρόσθετων που λείπουν" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:106 #, java-format msgid "" @@ -3186,22 +3205,22 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 msgid "Download Plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:170 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:168 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Έκδοση {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:176 msgid "Plugin bundled with JOSM" msgstr "Πρόσθετα που έρχονται με το JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208 msgid "Plugin already exists" msgstr "Το πρόσθετο υπάρχει ήδη" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:211 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:209 #, java-format msgid "" @@ -3216,15 +3235,15 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 msgid "Delete and Download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:222 #, java-format msgid "Error deleting plugin file: {0}" msgstr "Σφάλμα κατά την διαγραφή του αρχείου πρόσθετου: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:281 #, java-format msgid "Error reading plugin information file: {0}" @@ -3291,10 +3310,10 @@ msgstr "Διαγραφή {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:165 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 msgid "Conflicting relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 #, java-format msgid "" @@ -3305,5 +3324,5 @@ "Διαγραφή από την σχέση;" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:166 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 #, java-format msgid "" @@ -3320,7 +3339,7 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:349 msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" +"You are about to delete nodes outside of the area you have " +"downloaded.
This can cause problems because other objects (that you don't " +"see) might use them.
Do you really want to delete?" msgstr "" "Πρόκειτε να διαγράψετε κόμβους εκτός της περιοχής που λάβατε.
Αυτό " @@ -3453,124 +3472,135 @@ msgstr "Αδυναμία φόρτωσης προτιμήσεων από διακομηστή" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:232 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:426 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:428 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:527 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:765 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:776 msgid "Empty member in relation." msgstr "Άδειο μέλος στη σχέση." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:767 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:531 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Διαγράφηκε το μέλος ''{0}'' της σχέσης." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:547 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:552 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:549 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:558 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:561 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 +msgid "More than one \"via\" found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 #, java-format msgid "Unknown role ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 #, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 msgid "No \"from\" way found." msgstr "Οδός \"από\" δεν βρέθηκε." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 msgid "No \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -msgid "No \"via\" node found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +msgid "No \"via\" node or way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:636 -#, java-format -msgid "The \"{0}\" way must contain at least 2 nodes." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:731 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +msgid "The \"to\" way doesn't start or end at a \"via\" node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:620 +msgid "The \"from\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:624 +msgid "The \"to\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:742 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:847 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:858 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:949 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Εσωτερικός δρόμος \"{0}\" είναι από έξω." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:987 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:998 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1012 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1023 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1195 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1206 msgid "untagged" msgstr "Χωρίς ετικέτα" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1196 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207 msgid "text" msgstr "κείμενο" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" msgstr "ανενεργό" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:94 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:181 @@ -3578,13 +3608,13 @@ msgstr "επιλεγμένο" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 msgid "incomplete way" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 msgid "highlight" msgstr "" @@ -3606,5 +3636,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:113 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:89 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:77 msgid "incomplete" @@ -3634,14 +3664,14 @@ msgstr[1] "{0} μέλη" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 msgid "Duplicate" msgstr "Αντιγραφή" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 msgid "Duplicate selection by copy and immediate paste." msgstr "Αντιγραφή επιλογής με αντιγραφή και άμεση επικόλληση." -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 @@ -3650,5 +3680,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -3720,7 +3750,9 @@ msgstr "Εμφάνιση πληροφοριών ιστορικού για δρόμους ή κόμβους του OSM." -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:57 -msgid "Please select at least one node, way or relation." -msgstr "Παρακαλώ επιλέξτε τουλάχιστον έναν κόμβο, δρόμο ή σχέση." +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:60 +msgid "" +"Please select at least one node, way or relation. Only already uploaded " +"elements have a history." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 @@ -3742,7 +3774,7 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/TerracerAction.java:47 @@ -3876,5 +3908,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:123 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:314 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:315 msgid "Enter values for all conflicts." msgstr "" @@ -3882,5 +3914,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 msgid "Solve Conflicts" msgstr "" @@ -4014,5 +4046,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #, java-format @@ -4039,15 +4071,19 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125 -msgid "" -"There is more than one way using the node(s) you selected. Please select the " +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 +msgid "" +"There is more than one way using the node you selected. Please select the " "way also." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133 +msgid_plural "" +"There is more than one way using the nodes you selected. Please select the " +"way also." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137 msgid "The selected nodes do not share the same way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -4055,10 +4091,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229 msgid "You must select two or more nodes to split a circular way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -4066,5 +4102,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 msgid "" "A role based relation membership was copied to all new ways.\n" @@ -4072,5 +4108,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:296 #, java-format msgid "Split way {0} into {1} parts" @@ -4457,5 +4493,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 msgid "Align Nodes in Circle" msgstr "Τακτοποίηση Κόμβων σε Κύκλο" @@ -4469,5 +4505,5 @@ msgstr "Μερικοι από τους κόμβους είναι (σχεδόν) σε ευθεία" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 msgid "Please select at least four nodes." msgstr "Παρακαλώ επιλέξτε τουλάχιστον τέσσερεις κόμβους." @@ -4534,4 +4570,32 @@ msgstr "Δημιοθργήθηκε σφάλμα κατά την επαναφορά αντιγράφου ασφαλείας." +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "" +"Show status report with useful information that can be attached to bugs" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92 +msgid "Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +msgid "Copy to clipboard and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 +msgid "Close" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 @@ -4543,13 +4607,13 @@ msgstr "Επανάληψη της τελευταίας αναίρεσης." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:44 msgid "Delete Mode" msgstr "Κατάσταση Διαγραφής" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:46 +msgid "Delete nodes or ways." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 -msgid "Delete nodes or ways." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:84 @@ -4560,5 +4624,5 @@ msgstr "Κατάσταση: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:130 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -4568,6 +4632,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:87 msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." +"Drag play head and release near track to play audio from there; " +"SHIFT+release to synchronize audio at that point." msgstr "" @@ -4581,10 +4645,10 @@ msgstr "Δημιουργία περιοχών" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 msgid "Extrude Way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:252 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:416 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:430 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" @@ -4592,5 +4656,5 @@ "τετράγωνο" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 msgid "Draw a rectangle of the desired size, then release the mouse button." msgstr "" @@ -4598,10 +4662,10 @@ "του ποντικιού." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:420 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:434 msgid "Release the mouse button to stop rotating." msgstr "Αφήστε το πλήκτρο του ποντικιού για να σταματήσετε την περιστροφή" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 msgid "Drag a way segment to make a rectangle." msgstr "" @@ -4669,14 +4733,14 @@ msgstr "Επιλέξτε, μετακινήστε και περιστρέψτε αντικείμενα" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:191 msgid "Add and move a virtual new node to way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:220 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:223 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 msgid "Cannot move objects outside of the world." msgstr "Δεν μπορείτε να μετακινήσετε αντικείμενα εκτός κόσμου." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:418 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:432 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -4685,5 +4749,5 @@ "συγχώνευση με το πλησιέστερο κόμβο." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:422 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:436 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to remove); Shift-" @@ -4707,6 +4771,6 @@ "move zoom with right button" msgstr "" -"Κάντε ζουμ σέρνοντας ή πατώντας Ctrl+. ή Ctrl+, μετακινήστε πατώντας Ctrl" -"+πάνω, κάτω, αριστερά, δεξιά ή με το δεξί πλήκτρο του ποντικιού" +"Κάντε ζουμ σέρνοντας ή πατώντας Ctrl+. ή Ctrl+, μετακινήστε πατώντας " +"Ctrl+πάνω, κάτω, αριστερά, δεξιά ή με το δεξί πλήκτρο του ποντικιού" #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22 @@ -4758,30 +4822,30 @@ msgstr "Συγχώνευση {0} κόμβων" +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Orthogonalize Shape" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -msgid "Orthogonalize Shape" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Μετακίνηση κόμβων ώστε όλες οι γωνίες να είναι 90 ή 270 μοίρες" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 msgid "Only two nodes allowed" msgstr "Επιτρέπονται μόνο δύο κόμβοι" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 msgid "Selection must consist only of ways." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 msgid "Please select one or more closed ways of at least four nodes." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 msgid "Please select ways with almost right angles to orthogonalize." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -4790,13 +4854,13 @@ msgstr "" "Χρησιμοποιείτε την προβολή EPSG:4326 η οποία μπορεί να " -"οδηγήσει
ανεπιθύμητα αποτελέσματα όταν γίνονται ορθογώνιες ευθυγραμμίσεις." -"
Αλλάξτε την προβολή για να μην ξαναεμφανιστεί αυτό το μήνυμα .
Θέλετε " -"να συνεχίσετε;" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 +"οδηγήσει
ανεπιθύμητα αποτελέσματα όταν γίνονται ορθογώνιες " +"ευθυγραμμίσεις.
Αλλάξτε την προβολή για να μην ξαναεμφανιστεί αυτό το " +"μήνυμα .
Θέλετε να συνεχίσετε;" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "Only one node selected" msgstr "Μόνο ένας κόμβος επιλέχθηκε" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 msgid "Orthogonalize" msgstr "Ορθογωνισμός" @@ -4847,5 +4911,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101 -msgid "Please select exactly three nodes or one way with exactly three nodes." +msgid "" +"Please select exactly three nodes or one way with exactly three nodes." msgstr "" @@ -4854,52 +4919,69 @@ msgstr "Αυτοι οι κόμβοι δεν βρίσκονται σε κύκλο." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../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:71 +msgid "Update Data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:72 +#, java-format +msgid "" +"This action will require {0} individual download requests. Do you wish to " +"continue?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 msgid "Open Location..." msgstr "Άνοιγμα Τοποθεσίας..." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 msgid "Open an URL." msgstr "Άνοιγμα URL" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 msgid "Separate Layer" msgstr "Ξεχωριστό Επίπεδο" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 msgid "Enter URL to download:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 msgid "Download Location" msgstr "Προορισμός Λήψης" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 msgid "Download URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 msgid "Add Node..." msgstr "Προσθήκη Κόμβου..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 msgid "Add a node by entering latitude and longitude." msgstr "Προσθήκη κόμβου με εισαγωγή γεωγραφικού πλάτους και μήκους." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 msgid "Enter the coordinates for the new node." msgstr "Εισάγετε τις συντεταγμένες για τον νέο κόμβο." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 msgid "Use decimal degrees." msgstr "Χρησιμοποιήστε δεκαδικές μοίρες" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 msgid "Negative values denote Western/Southern hemisphere." msgstr "Αρνητικές τιμές υποδεικνείουν Δυτικό/Νότιο ημισφαίριο." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 #: ../plugins/livegps/livegps/LiveGpsDialog.java:54 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93 @@ -4908,5 +4990,5 @@ msgstr "Γεωγραφικό πλάτος" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 #: ../plugins/livegps/livegps/LiveGpsDialog.java:56 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96 @@ -4949,14 +5031,14 @@ msgstr "Μεταφέρει αντικείμενα {0}" +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "Overwrite" msgstr "Αντικατάσταση" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "File exists. Overwrite?" msgstr "Το αρχείο υπάρχει. Αντικατάσταση;" @@ -4975,47 +5057,52 @@ msgstr "Παρακαλώ επιλέξτε κάτι για αντιγραφή." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 msgid "This node is not glued to anything else." msgstr "Αυτός ο κόμβος δεν είναι κολλημένος σε τίποτε άλλο." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 msgid "None of these nodes are glued to anything else." msgstr "Κανείς από αυτούς τούς κόμβους δεν είναι κολλημένος σε τίποτε άλλο." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of this way's nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 msgid "The current selection cannot be used for unglueing." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "Select either:" msgstr "Επιλέξτε οποιοδήποτε:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +msgid "* One tagged node, or" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "* One node that is used by more than one way, or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 -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:104 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +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:117 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:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -5024,5 +5111,5 @@ "χρησιμοποιούνται από περισσότερο από έναν δρόμο." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -5032,10 +5119,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:160 +msgid "Unglued Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:373 #, java-format msgid "Dupe into {0} nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:320 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:397 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -5136,5 +5227,5 @@ msgstr "Αναίρεση της τελευταίας ενέργειας." -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 msgid "No Shortcut" msgstr "Καμοία συντόμευση" @@ -5156,13 +5247,13 @@ msgstr "Δεδομένα OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:29 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:28 msgid "Downloading GPS data" msgstr "Λήψη δεδομένων GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:41 msgid "Downloaded GPX Data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:71 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:69 msgid "Raw GPS data" msgstr "Ακατέργαστα δεδομένα GPS" @@ -5383,5 +5474,6 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169 -msgid "Header contains several values and cannot be mapped to a single string" +msgid "" +"Header contains several values and cannot be mapped to a single string" msgstr "" @@ -5731,5 +5823,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69 -msgid "Maximum number of segments allowed in each generated way. Default 250." +msgid "" +"Maximum number of segments allowed in each generated way. Default 250." msgstr "" @@ -5748,6 +5841,7 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72 msgid "" -"Accuracy of Douglas-Peucker line simplification, measured in degrees." -"
Lower values give more nodes, and more accurate lines. Default 0.0003." +"Accuracy of Douglas-Peucker line simplification, measured in " +"degrees.
Lower values give more nodes, and more accurate lines. Default " +"0.0003." msgstr "" @@ -5767,5 +5861,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75 msgid "Offset all points in East direction (degrees). Default 0." -msgstr "Μετατόπιση όλων των σημείων Ανατολικά (μοίρες). Προκαθορισμένη τιμή 0." +msgstr "" +"Μετατόπιση όλων των σημείων Ανατολικά (μοίρες). Προκαθορισμένη τιμή 0." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76 @@ -6382,6 +6477,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:509 msgid "" -"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." -"org/index.php/User:JLS/speller) or tag checking data files." +"The sources (URL or filename) of spell check (see " +"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking " +"data files." msgstr "" @@ -6839,6 +6935,6 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:40 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:43 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 #, java-format @@ -6846,18 +6942,29 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:51 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:55 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 msgid "Contacting WMS Server..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157 msgid "Create buildings" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 msgid "CadastreGrabber: Illegal url." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +msgid "" +"To avoid cadastre WMS overload,\n" +"building import size is limited to 1 km2 max." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" @@ -6880,16 +6987,25 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:128 +msgid "Cadastre" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:139 +msgid "Auto sourcing" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164 +msgid "Invalid projection" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 +#, java-format +msgid "Change the projection to {0} first." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:169 msgid "" "To enable the cadastre WMS plugin, change\n" "the JOSM projection to Lambert and restart" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132 -msgid "Cadastre" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 -msgid "Auto sourcing" msgstr "" @@ -6962,6 +7078,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:43 msgid "" -"More than one WMS layer present.\n" -"Select one of them first, then retry." +"More than one WMS layer present\n" +"Select one of them first, then retry" msgstr "" @@ -6970,5 +7086,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136 #, java-format @@ -6978,13 +7094,13 @@ msgstr[1] "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61 msgid "Extract SVG ViewBox..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65 msgid "Extract best fitting boundary..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:120 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126 msgid "Create boundary" msgstr "" @@ -7020,15 +7136,15 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 msgid "Save WMS layer to file" msgstr "Αποθ'ηκευση επιπέδου WMS σε αρχείο" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "Load WMS layer from file" msgstr "Φόρτωση επιπέδου WMS από αρχείο" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -7036,5 +7152,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 msgid "File Format Error" msgstr "Σφάλμα μορφής αρχείου" @@ -7042,5 +7158,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 msgid "Error loading file" msgstr "Σφάλμα φόρτωσης αρχείου" @@ -7066,52 +7182,53 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 msgid "Replace original background by JOSM background color." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30 msgid "Reverse grey colors (for black backgrounds)." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 msgid "Set background transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34 msgid "Draw boundaries of downloaded data." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Enable automatic caching." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:53 -msgid "" -"A special handler of the french cadastre wms at www.cadastre.gouv." -"fr

Please read the Terms and Conditions of Use here (in french): " -"
 http://www.cadastre.gouv.fr/scpc/html/" -"CU_01_ConditionsGenerales_fr.html
before any upload of data created " -"by this plugin." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:58 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:55 +msgid "" +"A special handler of the french cadastre wms at " +"www.cadastre.gouv.fr

Please read the Terms and Conditions of Use here " +"(in french):
" +"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " +"
before any upload of data created by this plugin." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -7119,26 +7236,40 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 -msgid "" -"Invert the original texts from black to white (and all intermediate greys)." +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +msgid "" +"Invert the original black and white colors (and all intermediate greys). " +"Useful for texts on dark backgrounds." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 +msgid "Allows multiple layers stacking" msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 -msgid "Allows multiple layers stacking" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:99 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:113 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 msgid "Image grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:162 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:125 +msgid "Grab smaller images (higher quality but use more memory)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +msgid "Fixed size square (default is 100m)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +msgid "Fixed size (from 25 to 1000 meters)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -7247,5 +7378,5 @@ msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:254 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:255 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -7390,7 +7521,7 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:203 msgid "" -"Take a photo of your GPS receiver while it displays the time." -"
Display that photo here.
And then, simply capture the time you read " -"on the photo and select a timezone
" +"Take a photo of your GPS receiver while it displays the " +"time.
Display that photo here.
And then, simply capture the time you " +"read on the photo and select a timezone
" msgstr "" @@ -7455,5 +7586,6 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:484 -msgid "I can take a picture of my GPS receiver.
Can this help?" +msgid "" +"I can take a picture of my GPS receiver.
Can this help?" msgstr "" "Μπορώ να βγάλω φωτογραφία τον δέκτη GPS μου.
Μπορεί αυτό να " @@ -7499,5 +7631,5 @@ msgstr "Λανθασμένη ζώνη ώρας" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #, java-format msgid "" @@ -7506,14 +7638,14 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:579 msgid "Invalid offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:641 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:643 #, java-format msgid "Found {0} matchs of {1} in GPX track {2}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:642 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:644 msgid "GPX Track loaded" msgstr "" @@ -7521,5 +7653,5 @@ #: ../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/UploadDataGui.java:79 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 msgid "Upload Traces" msgstr "Αποστολή ιχνών" @@ -7529,58 +7661,72 @@ msgstr "Αποστολή ιχνών στο openstreetmap.org" +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71 +msgid "Upload Trace" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +msgid "Public" +msgstr "" + #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 -msgid "Upload GPX track" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -msgid "Public" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 msgid "Selected makes your trace public in openstreetmap.org" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Description" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:123 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 msgid "Tags" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:182 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:153 +#, java-format +msgid "Selected track: {0}" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:176 msgid "Connecting..." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 -msgid "Uploading GPX track..." -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:214 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:199 +msgid "Upload cancelled" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:209 +msgid "Error while uploading" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:227 -msgid "Error while uploading" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:235 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +msgid "Upload failed. Server returned the following message: " +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 +#, java-format +msgid "Uploading GPX track: {0}% ({1} of {2})" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:252 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:241 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:244 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "" @@ -7803,32 +7949,32 @@ msgstr "Αυτόματη λήψη" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:232 msgid "Download visible tiles" msgstr "Λήψη εμφανών πλακιδίων" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241 msgid "Change resolution" msgstr "Αλλαγή ανάλυσης" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:253 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:264 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:271 msgid "Alpha channel" msgstr "" @@ -12702,21 +12848,53 @@ #~ msgid "Please select objects for which you want to change properties." #~ msgstr "" -#~ "Παρακαλώ διαλέξτε αντικείμενα για τα οποία θέλετε να αλλάξετε τις " -#~ "ιδιότητες." +#~ "Παρακαλώ διαλέξτε αντικείμενα για τα οποία θέλετε να αλλάξετε τις ιδιότητες." #~ msgid "" -#~ "This is the basic relation editor which allows you to change the " -#~ "relation's tags as well as the members. In addition to this we should " -#~ "have a smart editor that detects the type of relationship and limits your " -#~ "choices in a sensible way." +#~ "This is the basic relation editor which allows you to change the relation's " +#~ "tags as well as the members. In addition to this we should have a smart " +#~ "editor that detects the type of relationship and limits your choices in a " +#~ "sensible way." #~ msgstr "" -#~ "Αυτός είναι ο βασικός επεξεργαστής σχέσεων που σας επιτρέπει να αλλάξετε " -#~ "τις ετικέτες σχέσεων καθώς επίσης και τα μέλη τους. Επιπρόσθετα θα πρέπει " -#~ "να έχουμε έναν έξυπνο επεξεργαστή που ανιχνεύει τον τύπο της σχέσης κα " +#~ "Αυτός είναι ο βασικός επεξεργαστής σχέσεων που σας επιτρέπει να αλλάξετε τις " +#~ "ετικέτες σχέσεων καθώς επίσης και τα μέλη τους. Επιπρόσθετα θα πρέπει να " +#~ "έχουμε έναν έξυπνο επεξεργαστή που ανιχνεύει τον τύπο της σχέσης κα " #~ "ιπεριορίζει τις επιλογές με κάποιο λογικό τρόπο." + +#~ msgid "Upload this trace..." +#~ msgstr "Αποστολή αυτού του ίχνους..." + +#~ msgid "" +#~ "This functionality has been added only recently. Please
use with " +#~ "care and check if it works as expected." +#~ msgstr "" +#~ "Αυτή η δυνατότητα προστέθηκε πρόσφατα.Παρακαλώ
χρησιμοποιήστε την " +#~ "με προσοχή και ελέγξτε ότι δουλεύει όπως πρέπει." + +#~ msgid "Upload track filtered by JOSM" +#~ msgstr "Αποστολή ίχνους φιλτραρισμένου από το JOSM" + +#~ msgid "Upload raw file: " +#~ msgstr "Αποστολή ακατέργαστου αρχείου: " + +#~ msgid "Description:" +#~ msgstr "Περιγραφή:" + +#~ msgid "Tags (keywords in GPX):" +#~ msgstr "Ετικέτες (λέξεις κλειδιά σε GPX):" + +#~ msgid "GPX-Upload" +#~ msgstr "Αποστολή GPX" + +#, java-format +#~ msgid "Upload raw file: {0}" +#~ msgstr "Αποστολή ακατέργαστου αρχείου: {0}" + +#~ msgid "Tags:" +#~ msgstr "Ετικέτες:" #~ msgid "Unknown type" #~ msgstr "Άγνωστος τύπος" +#, java-format #~ msgid "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..." #~ msgstr "Αποστολή {0} {1} (id: {2}) {3}% {4}/{5} (απομένουν {6} )..." @@ -12737,4 +12915,5 @@ #~ msgstr "Πάροχος" +#, java-format #~ msgid "Version: {0}
Last change at {1}" #~ msgstr "Έκδοση: {0}
Τελευταία αλλαγή στις {1}" @@ -12747,4 +12926,5 @@ #~ msgstr "SurveyorPlugin" +#, java-format #~ msgid "Version {0} - Last change at {1}" #~ msgstr "Έκδοση {0} - Τελευταία αλλαγή στις {1}" @@ -12757,35 +12937,34 @@ #~ msgid "" -#~ "Fulltext search:
  • Baker Street - 'Baker' and 'Street' " -#~ "in any key or name.
  • \"Baker Street\" - 'Baker Street' in " -#~ "any key or name.
  • name:Bak - 'Bak' anywhere in the name.
  • -name:Bak - not 'Bak' in the name.
  • foot: - " -#~ "key=foot set to any value.
  • Special targets:
  • type: " -#~ "- type of the object (node, way, relation)
  • user:... - all objects changed by user
  • id:... - object with given ID
  • nodes:... - object with given " -#~ "number of nodes
  • modified - all changed objects
  • selected - all selected objects
  • incomplete - " -#~ "all incomplete objects
  • Use | or OR to combine with " -#~ "logical or
  • Use \" to quote operators (e.g. if key " -#~ "contains :)
  • Use ( and ) to group expressions
    • " +#~ "Fulltext search:
    • Baker Street - 'Baker' and 'Street' in " +#~ "any key or name.
    • \"Baker Street\" - 'Baker Street' in any key " +#~ "or name.
    • name:Bak - 'Bak' anywhere in the name.
    • -" +#~ "name:Bak - not 'Bak' in the name.
    • foot: - key=foot set to " +#~ "any value.
    • Special targets:
    • type: - type of the " +#~ "object (node, way, relation)
    • user:... - " +#~ "all objects changed by user
    • id:... - object with given " +#~ "ID
    • nodes:... - object with given number of " +#~ "nodes
    • modified - all changed objects
    • selected -" +#~ " all selected objects
    • incomplete - all incomplete " +#~ "objects
    • Use | or OR to combine with logical " +#~ "or
    • Use \" to quote operators (e.g. if key contains " +#~ ":)
    • Use ( and ) to group expressions
    " #~ msgstr "" -#~ "Fulltext search:
    • Baker Street - 'Baker' και 'Street' " -#~ "σε οποιοδήποτε κλειδί ή όνομα.
    • \"Baker Street\" - 'Baker " -#~ "Street' σε οποιοδήποτε κλειδί ή όνομα.
    • name:Bak - 'Bak' " -#~ "οπυδήποτε στο όνομα.
    • -name:Bak - χωρίς 'Bak' στο όνομα.
    • foot: - κλειδί=foot ρυθμισμένο σε οποιαδήποτε τιμή.
    • Special targets:
    • type: - τύπος του αντικειμένου " -#~ "(κόμβος, way, σχέση)
    • user:... - όλα " -#~ "τα αντικείμενα που αλλάχτηκαν απο τον user
    • id:... - " -#~ "αντικείμενα με το δωσμένο ID
    • nodes:... - αντικείμενο με " -#~ "τον δοσμένο αριθμό κόμβων
    • modified - όλα τα αλλαγμένα " -#~ "αντικείμενα
    • selected - όλα τα επιλεγμένα αντικείμενα
    • incomplete - all incomplete objects
    • Χρησιμοποιήστε " -#~ "το | ή το OR για να συνδιάσετε με λογικό or
    • Use " -#~ "\" to quote operators (e.g. if key contains :)
    • Χρησιμοποιήστε ( και ) για να ομαδοποιήσετε όρους
    " +#~ "Fulltext search:
    • Baker Street - 'Baker' και 'Street' σε " +#~ "οποιοδήποτε κλειδί ή όνομα.
    • \"Baker Street\" - 'Baker Street' " +#~ "σε οποιοδήποτε κλειδί ή όνομα.
    • name:Bak - 'Bak' οπυδήποτε στο " +#~ "όνομα.
    • -name:Bak - χωρίς 'Bak' στο " +#~ "όνομα.
    • foot: - κλειδί=foot ρυθμισμένο σε οποιαδήποτε " +#~ "τιμή.
    • Special targets:
    • type: - τύπος του αντικειμένου " +#~ "(κόμβος, way, σχέση)
    • user:... - όλα τα " +#~ "αντικείμενα που αλλάχτηκαν απο τον user
    • id:... - αντικείμενα " +#~ "με το δωσμένο ID
    • nodes:... - αντικείμενο με τον δοσμένο " +#~ "αριθμό κόμβων
    • modified - όλα τα αλλαγμένα " +#~ "αντικείμενα
    • selected - όλα τα επιλεγμένα " +#~ "αντικείμενα
    • incomplete - all incomplete " +#~ "objects
    • Χρησιμοποιήστε το | ή το OR για να συνδιάσετε " +#~ "με λογικό or
    • Use \" to quote operators (e.g. if key contains " +#~ ":)
    • Χρησιμοποιήστε ( και ) για να ομαδοποιήσετε " +#~ "όρους
    " #~ msgid "Add Node" Index: /applications/editors/josm/i18n/po/en_GB.po =================================================================== --- /applications/editors/josm/i18n/po/en_GB.po (revision 13832) +++ /applications/editors/josm/i18n/po/en_GB.po (revision 13833) @@ -9,7 +9,7 @@ "Project-Id-Version: en_GB\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-15 22:03+0100\n" -"PO-Revision-Date: 2009-02-15 20:32+0000\n" -"Last-Translator: nin2jardin \n" +"POT-Creation-Date: 2009-02-21 16:35+0100\n" +"PO-Revision-Date: 2009-02-21 17:18+0000\n" +"Last-Translator: Andrew Gee \n" "Language-Team: JOSM\n" "MIME-Version: 1.0\n" @@ -17,8 +17,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-02-15 20:40+0000\n" +"X-Launchpad-Export-Date: 2009-02-22 20:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 #, java-format msgid "" @@ -31,5 +31,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 msgid "" "This action will have no shortcut.\n" @@ -39,5 +39,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -48,5 +48,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Hint: You can edit the shortcuts in the preferences.)" @@ -57,17 +57,17 @@ #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 msgid "Information" msgstr "Information" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Do nothing" msgstr "Do nothing" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Report Bug" msgstr "Report Bug" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 msgid "" "An unexpected exception occurred.\n" @@ -81,18 +81,18 @@ "version of JOSM, please consider being kind and file a bug report." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Unexpected Exception" msgstr "Unexpected Exception" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 #, java-format msgid "Please report a ticket at {0}" msgstr "Please report a ticket at {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "Include your steps to get to the error (as detailed as possible)!" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:78 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -102,9 +102,9 @@ "a bug." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Be sure to include the following information:" msgstr "Be sure to include the following information:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75 msgid "(The text has already been copied to your clipboard.)" msgstr "(The text has already been copied to your clipboard.)" @@ -118,5 +118,5 @@ msgstr "Error playing sound" -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:94 @@ -124,5 +124,5 @@ msgstr "Contacting OSM Server..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:48 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:32 @@ -130,10 +130,10 @@ msgstr "Downloading OSM data..." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 msgid "NullPointerException, possibly some missing tags." msgstr "NullPointerException, possibly some missing tags." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83 msgid "Preparing data..." msgstr "Preparing data..." @@ -162,48 +162,48 @@ msgstr "Downloading points {0} to {1}..." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:164 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:168 msgid "Unknown version" msgstr "Unknown version" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 msgid "Found element in non-way." msgstr "Found element in non-way." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 msgid " has zero ref" msgstr " has zero ref" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 msgid "Found element in non-relation." msgstr "Found element in non-relation." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:252 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250 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:294 msgid "Illegal object with id=0" msgstr "Illegal object with id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Missing required attribute \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 #, java-format msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" msgstr "Skipping a way because it includes a node that doesn''t exist: {0}\n" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:502 msgid "Prepare OSM data..." msgstr "Prepare OSM data..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:518 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:516 msgid "Ill-formed node id" msgstr "Ill-formed node id" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:280 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:287 msgid "Parse error: invalid document structure for gpx document" msgstr "Parse error: invalid document structure for gpx document" @@ -213,18 +213,18 @@ msgstr "Contacting Server..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 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/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 msgid "Commit comment" msgstr "Commit comment" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" msgstr "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64 @@ -234,34 +234,32 @@ msgstr "An error occurred: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:192 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190 msgid "Opening changeset..." msgstr "Opening changeset..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:226 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224 msgid "Server does not support changesets" msgstr "Server does not support changesets" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:246 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:428 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:609 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:184 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607 msgid "Unknown host" msgstr "Unknown host" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282 msgid "Preparing..." msgstr "Preparing..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:294 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292 msgid "Uploading..." msgstr "Uploading..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375 msgid "Closing changeset..." msgstr "Closing changeset..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:652 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650 msgid "Transfer aborted due to error (will wait for 5 seconds):" msgstr "Transfer aborted due to error (will wait for 5 seconds):" @@ -299,17 +297,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95 #: ../core/src/org/openstreetmap/josm/Main.java:348 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:29 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 @@ -322,11 +323,11 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:110 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -341,11 +342,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:186 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 msgid "Creating main GUI" msgstr "Creating main GUI" #: ../core/src/org/openstreetmap/josm/Main.java:195 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:271 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:278 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:56 msgid "Help" @@ -387,21 +388,21 @@ msgstr "Ignoring malformed file URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109 msgid "min lat" msgstr "min lat" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111 msgid "min lon" msgstr "min lon" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:117 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "max lat" msgstr "max lat" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 msgid "max lon" msgstr "max lon" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:122 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -411,5 +412,5 @@ "area)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:134 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130 msgid "Bounding Box" msgstr "Bounding Box" @@ -445,6 +446,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:96 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:894 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:956 msgid "name" msgstr "name" @@ -477,5 +478,5 @@ msgstr "zoom" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:107 msgid "" "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -485,5 +486,5 @@ "move mouse. Select: Click." -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:109 msgid "Slippy map" msgstr "Slippy map" @@ -494,7 +495,7 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:605 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:602 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:89 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -514,5 +515,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380 msgid "Remove" msgstr "Remove" @@ -654,20 +655,20 @@ msgstr "If specified, reset the configuration instead of reading it." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:109 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:186 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:198 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:108 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:191 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:203 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 msgid "Java OpenStreetMap Editor" msgstr "Java OpenStreetMap Editor" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:111 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:110 msgid "Message of the day not available" msgstr "Message of the day not available" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:200 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:205 msgid "Downloading \"Message of the day\"" msgstr "Downloading \"Message of the day\"" @@ -707,33 +708,33 @@ msgstr "Zoom out" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:234 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:474 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:512 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:383 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:380 msgid "More information about this feature" msgstr "More information about this feature" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:393 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:390 msgid "Optional Attributes:" msgstr "Optional Attributes:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:437 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Use preset ''{0}'' of group ''{1}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:438 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:435 #, java-format msgid "Use preset ''{0}''" msgstr "Use preset ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 msgid "way" @@ -742,11 +743,11 @@ msgstr[1] "ways" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:214 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 msgid "node" msgid_plural "nodes" @@ -754,6 +755,6 @@ msgstr[1] "nodes" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:81 @@ -763,14 +764,14 @@ msgstr[1] "relations" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 msgid "closedway" msgstr "closed way" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:475 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 #, java-format msgid "Unknown type: {0}" msgstr "Unknown type: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:549 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 #, java-format @@ -778,15 +779,15 @@ msgstr "Could not read tagging preset source: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:555 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 #, java-format msgid "Error parsing {0}: " msgstr "Error parsing {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:572 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:569 #, 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:607 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595 #, java-format msgid "Change {0} object" @@ -795,9 +796,17 @@ msgstr[1] "Change {0} objects" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 msgid "Nothing selected!" msgstr "Nothing selected!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 +msgid "Selection unsuitable!" +msgstr "Selection unsuitable!" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +msgid "Apply Preset" +msgstr "Apply Preset" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 msgid "Change Properties" msgstr "Change Properties" @@ -808,14 +817,14 @@ msgstr "Preset group ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:107 msgid "File" msgstr "File" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:135 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:107 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:86 @@ -827,22 +836,22 @@ msgstr "Edit" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 msgid "View" msgstr "View" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:26 msgid "Tools" msgstr "Tools" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:141 msgid "Audio" msgstr "Audio" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:142 msgid "Presets" msgstr "Presets" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:40 @@ -854,18 +863,18 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:210 msgid "Wireframe View" msgstr "Wireframe View" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212 msgid "Toggle Wireframe view" msgstr "Toggle Wireframe view" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:28 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 msgid "Contacting the OSM server..." msgstr "Contacting the OSM server..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 #, java-format msgid "This will change up to {0} object." @@ -874,11 +883,11 @@ msgstr[1] "This will change up to {0} objects." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 msgid "An empty value deletes the key." msgstr "An empty value deletes the key." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66 @@ -888,7 +897,7 @@ msgstr "Key" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 @@ -897,10 +906,10 @@ msgstr "Value" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333 msgid "Change values?" msgstr "Change values?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:257 #, java-format msgid "Change properties of up to {0} object" @@ -909,33 +918,33 @@ msgstr[1] "Change properties of up to {0} objects" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 msgid "Please select a key" msgstr "Please select a key" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321 msgid "Please select a value" msgstr "Please select a value" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:445 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:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 msgid "Properties/Memberships" msgstr "Properties/Memberships" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 msgid "Properties for selected objects." msgstr "Properties for selected objects." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97 @@ -947,58 +956,58 @@ msgstr "Toggle: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 msgid "Member Of" msgstr "Member Of" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Role" msgstr "Role" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:559 msgid "Change relation" msgstr "Change relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560 #, 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:564 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 msgid "Delete from relation" msgstr "Delete from relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:600 msgid "Add Properties" msgstr "Add Properties" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 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:609 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 msgid "Edit Properties" msgstr "Edit Properties" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609 msgid "Edit the value of the selected key for all objects" msgstr "Edit the value of the selected key for all objects" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 msgid "Delete Properties" msgstr "Delete Properties" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:77 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:293 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 @@ -1007,98 +1016,115 @@ msgstr "Delete" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 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:766 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:763 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Properties: {0} / Memberships: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:769 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 msgid "Properties / Memberships" msgstr "Properties / Memberships" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178 +msgid "Apply Changes" +msgstr "Apply Changes" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 msgid "Create new relation" msgstr "Create new relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208 msgid "Edit new relation" msgstr "Edit new relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209 #, java-format msgid "Edit relation #{0}" msgstr "Edit relation #{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230 +msgid "Basic" +msgstr "Basic" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Occupied By" msgstr "Occupied By" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311 msgid "Tags (empty value deletes tag)" msgstr "Tags (empty value deletes tag)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313 msgid "Members" msgstr "Members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 +msgid "Move Up" +msgstr "Move Up" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 msgid "Move the currently selected members up" msgstr "Move the currently selected members up" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358 +msgid "Add Selected" +msgstr "Add Selected" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359 +msgid "Add all currently selected objects as members" +msgstr "Add all currently selected objects as members" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365 +msgid "Remove Selected" +msgstr "Remove Selected" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366 +msgid "Remove all currently selected objects from relation" +msgstr "Remove all currently selected objects from relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 +msgid "Move Down" +msgstr "Move Down" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 msgid "Move the currently selected members down" msgstr "Move the currently selected members down" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356 -msgid "Add Selected" -msgstr "Add Selected" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:357 -msgid "Add all currently selected objects as members" -msgstr "Add all currently selected objects as members" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:363 -msgid "Remove Selected" -msgstr "Remove Selected" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:364 -msgid "Remove all currently selected objects from relation" -msgstr "Remove all currently selected objects from relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381 msgid "Remove the member in the current table row from this relation" msgstr "Remove the member in the current table row from this relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394 msgid "Download Members" msgstr "Download Members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:406 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395 msgid "Download all incomplete ways and nodes in relation" msgstr "Download all incomplete ways and nodes in relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:415 -msgid "Basic" -msgstr "Basic" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:453 #, java-format msgid "Members: {0}" msgstr "Members: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:587 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:461 +#, java-format +msgid "Relation Editor: {0}" +msgstr "Relation Editor: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:585 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 msgid "There were conflicts during import." msgstr "There were conflicts during import." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593 msgid "Error parsing server response." msgstr "Error parsing server response." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:600 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:594 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:598 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -1112,9 +1138,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:345 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 msgid "Error" msgstr "Error" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:599 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597 msgid "Cannot connect to server." msgstr "Cannot connect to server." @@ -1276,5 +1302,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:94 @@ -1284,5 +1310,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 msgid "" @@ -1349,16 +1375,24 @@ msgstr "Selection: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +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:67 +msgid "Delete the selected relation" +msgstr "Delete the selected relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 #: trans_presets.java:2904 msgid "Relations" msgstr "Relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 msgid "Open a list of all relations." msgstr "Open a list of all relations." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 @@ -1366,17 +1400,9 @@ msgstr "New" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 msgid "Create a new relation" msgstr "Create a new relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -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:90 -msgid "Delete the selected relation" -msgstr "Delete the selected relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:130 #, java-format msgid "Relations: {0}" @@ -1404,47 +1430,47 @@ msgstr "Command Stack: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +msgid "Resolve" +msgstr "Resolve" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +msgid "Open a merge dialog of all selected items in the list above." +msgstr "Open a merge dialog of all selected items in the list above." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Conflict" msgstr "Conflict" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 msgid "Merging conflicts." msgstr "Merging conflicts." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67 -msgid "Resolve" -msgstr "Resolve" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:68 -msgid "Open a merge dialog of all selected items in the list above." -msgstr "Open a merge dialog of all selected items in the list above." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:105 -msgid "Please select something from the conflict list." -msgstr "Please select something from the conflict list." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Resolve Conflicts" msgstr "Resolve Conflicts" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +msgid "Solve Conflict" +msgstr "Solve Conflict" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 #, java-format msgid "Conflicts: {0}" msgstr "Conflicts: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Conflicts" msgstr "Conflicts" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 msgid "conflict" msgstr "conflict" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 msgid "background" msgstr "background" @@ -1468,5 +1494,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 msgid "Customize Color" @@ -1474,5 +1500,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1482,5 +1508,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1489,5 +1515,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:326 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:152 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -1506,5 +1532,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:265 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 #, java-format msgid "Audio synchronized at point {0}." @@ -1512,5 +1538,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232 msgid "Unable to synchronize in layer being played." msgstr "Unable to synchronise in layer being played." @@ -1533,5 +1559,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:958 msgid "desc" msgstr "desc" @@ -1553,5 +1579,5 @@ msgstr "Error displaying URL" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -1561,5 +1587,5 @@ "track you were playing." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -1569,85 +1595,41 @@ "point where you want to synchronize." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224 msgid "Unable to create new audio marker." msgstr "Unable to create new audio marker." #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 msgid "Convert to data layer" msgstr "Convert to data layer" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:725 -msgid "" -"Upload of unprocessed GPS data as map data is considered harmful." -"
    If you want to upload traces, look here:" -msgstr "" -"Upload of unprocessed GPS data as map data is considered harmful." -"
    If you want to upload traces, look here:" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:645 +msgid "" +"Upload of unprocessed GPS data as map data is considered " +"harmful.
    If you want to upload traces, look here:" +msgstr "" +"Upload of unprocessed GPS data as map data is considered " +"harmful.
    If you want to upload traces, look here:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:646 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:747 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:448 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:667 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "Converted from: {0}" msgstr "Converted from: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612 -msgid "Upload this trace..." -msgstr "Upload this trace..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:616 -msgid "" -"This functionality has been added only recently. Please
    use with " -"care and check if it works as expected." -msgstr "" -"This functionality has been added only recently. Please
    use with " -"care and check if it works as expected." - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:102 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:107 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:626 -msgid "Upload track filtered by JOSM" -msgstr "Upload track filtered by JOSM" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:103 -#, java-format -msgid "Upload raw file: {0}" -msgstr "Upload raw file: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:108 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:627 -msgid "Upload raw file: " -msgstr "Upload raw file: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640 -msgid "Description:" -msgstr "Description:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:123 -msgid "Tags:" -msgstr "Tags:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:129 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:648 -msgid "GPX-Upload" -msgstr "GPX-Upload" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:229 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:217 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113 msgid "gps point" msgstr "gps point" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 #: trans_presets.java:1795 trans_presets.java:1801 trans_presets.java:1807 #: trans_presets.java:1813 trans_presets.java:1819 trans_presets.java:1825 @@ -1667,5 +1649,5 @@ msgstr[1] "tracks" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 msgid "point" msgid_plural "points" @@ -1673,5 +1655,5 @@ msgstr[1] "points" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 #, java-format msgid "a track with {0} point" @@ -1680,5 +1662,5 @@ msgstr[1] "a track with {0} points" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} consists of {1} track" @@ -1687,5 +1669,5 @@ msgstr[1] "{0} consists of {1} tracks" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} point" @@ -1694,25 +1676,25 @@ msgstr[1] "{0} points" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117 msgid "Customize line drawing" msgstr "Customise line drawing" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:296 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 msgid "Use global settings." msgstr "Use global settings." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 msgid "Draw lines between points for this layer." msgstr "Draw lines between points for this layer." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:298 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123 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/RawGpsLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:135 msgid "Select line drawing options" @@ -1746,5 +1728,5 @@ msgstr "JPEG images (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290 #, java-format msgid "{0} track, " @@ -1753,5 +1735,5 @@ msgstr[1] "{0} tracks, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 #, java-format msgid "{0} route, " @@ -1760,5 +1742,5 @@ msgstr[1] "{0} routes, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 #, java-format msgid "{0} waypoint" @@ -1767,55 +1749,51 @@ msgstr[1] "{0} waypoints" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #, java-format msgid "Name: {0}" msgstr "Name: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "Description: {0}" msgstr "Description: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 msgid "Timespan: " msgstr "Timespan: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Length: " msgstr "Length: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:642 -msgid "Tags (keywords in GPX):" -msgstr "Tags (keywords in GPX):" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:655 msgid "time" msgstr "time" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:780 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:679 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:700 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 msgid "Download from OSM along this track" msgstr "Download from OSM along this track" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:686 msgid "Download everything within:" msgstr "Download everything within:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 #, java-format msgid "{0} meters" msgstr "{0} meters" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:692 msgid "Maximum area per request:" msgstr "Maximum area per request:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 #, java-format msgid "{0} sq km" msgstr "{0} sq km" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787 #, java-format msgid "" @@ -1826,14 +1804,14 @@ "wish
    to continue?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:844 #, java-format msgid "Audio markers from {0}" msgstr "Audio markers from {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 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:1049 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "" "Some waypoints with timestamps from before the start of the track were " @@ -1843,5 +1821,5 @@ "omitted." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -1951,19 +1929,19 @@ msgstr "Time entered could not be parsed." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:140 msgid "outside downloaded area" msgstr "outside downloaded area" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 #, java-format msgid "{0} consists of:" msgstr "{0} consists of:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:353 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:347 #, java-format msgid " ({0} deleted.)" msgstr " ({0} deleted.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:445 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 msgid "Convert to GPX layer" msgstr "Convert to GPX layer" @@ -1991,37 +1969,37 @@ msgstr "Could not write bookmark." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 msgid "The geographic longitude at the mouse pointer." msgstr "The geographic longitude at the mouse pointer." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The name of the object at the mouse pointer." msgstr "The name of the object at the mouse pointer." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 msgid "The geographic latitude at the mouse pointer." msgstr "The geographic latitude at the mouse pointer." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The angle between the previous and the current way segment." msgstr "The angle between the previous and the current way segment." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The (compass) heading of the line segment being drawn." msgstr "The (compass) heading of the line segment being drawn." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The length of the new way segment being drawn." msgstr "The length of the new way segment being drawn." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:160 msgid "(no object)" msgstr "(no object)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:62 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:56 msgid "Color" msgstr "Colour" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:57 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107 #: trans_presets.java:56 trans_presets.java:92 trans_presets.java:130 @@ -2122,27 +2100,36 @@ msgstr "Name" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:118 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:112 #, java-format msgid "Paint style {0}: {1}" msgstr "Paint style {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 msgid "Choose" msgstr "Choose" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 msgid "Please select a color." msgstr "Please select a colour." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 #, java-format msgid "Choose a color for {0}" msgstr "Choose a colour for {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +msgid "Set to default" +msgstr "Set to default" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:172 +msgid "Set all to default" +msgstr "Set all to default" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:184 msgid "Colors used by different objects in JOSM." msgstr "Colours used by different objects in JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:171 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:198 msgid "Colors" msgstr "Colours" @@ -2176,26 +2163,26 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45 msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
    The password is transfered 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 transfered in plain text to the server, encoded in the " -"URL.
    Do not use a valuable Password." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:45 +"WARNING: The password is stored in plain text in the preferences " +"file.
    The password is transfered 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 transfered in plain text to the server, encoded in " +"the URL.
    Do not use a valuable Password." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44 msgid "Sort presets menu" msgstr "Sort presets menu" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46 msgid "Enable built-in defaults" msgstr "Enable built-in defaults" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:58 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69 msgid "Tagging preset source" msgstr "Tagging preset source" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:156 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 @@ -2203,5 +2190,5 @@ msgstr "Please select the row to edit." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500 @@ -2210,26 +2197,26 @@ msgstr "Please select the row to delete." +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88 +msgid "" +"The sources (URL or filename) of tagging preset definition files. See " +"http://josm.openstreetmap.de/wiki/TaggingPresets for help." +msgstr "" +"The sources (URL or filename) of tagging preset definition files. See " +"http://josm.openstreetmap.de/wiki/TaggingPresets for help." + #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89 -msgid "" -"The sources (URL or filename) of tagging preset definition files. See http://" -"josm.openstreetmap.de/wiki/TaggingPresets for help." -msgstr "" -"The sources (URL or filename) of tagging preset definition files. See http://" -"josm.openstreetmap.de/wiki/TaggingPresets for help." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 msgid "Add a new tagging preset source to the list." msgstr "Add a new tagging preset source to the list." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 msgid "Delete the selected source from the list." msgstr "Delete the selected source from the list." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:94 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93 msgid "Tagging Presets" msgstr "Tagging Presets" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97 msgid "Tagging preset sources" msgstr "Tagging preset sources" @@ -2243,6 +2230,6 @@ msgstr "When saving, keep backup files ending with a ~" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:141 @@ -2250,34 +2237,34 @@ msgstr "Plugins" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 msgid "Configure available plugins." msgstr "Configure available plugins." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43 msgid "Download List" msgstr "Download List" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:80 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51 msgid "Update" msgstr "Update" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:60 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 msgid "Configure Sites..." msgstr "Configure Sites..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add either site-josm.xml or Wiki Pages." msgstr "Add either site-josm.xml or Wiki Pages." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99 msgid "Please select an entry." msgstr "Please select an entry." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 msgid "Configure Plugin Sites" msgstr "Configure Plugin Sites" @@ -2465,9 +2452,9 @@ msgstr "Voice recorder calibration" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "Display Settings" msgstr "Display Settings" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "" "Various settings that influence the visual representation of the whole " @@ -2477,55 +2464,63 @@ "program." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings" msgstr "Connection Settings" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings for the OSM server." msgstr "Connection Settings for the OSM server." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Map Settings" msgstr "Map Settings" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Settings for the map projection and data interpretation." msgstr "Settings for the map projection and data interpretation." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Audio Settings" msgstr "Audio Settings" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Settings for the audio player and audio markers." msgstr "Settings for the audio player and audio markers." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97 msgid "You have to restart JOSM for some settings to take effect." msgstr "You have to restart JOSM for some settings to take effect." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:25 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 msgid "Draw lines between raw gps points." msgstr "Draw lines between raw gps points." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:27 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 msgid "Force lines if no segments imported." msgstr "Force lines if no segments imported." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:28 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 msgid "Draw large GPS points." msgstr "Draw large GPS points." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 -msgid "Color tracks by velocity." -msgstr "Colour tracks by velocity." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34 +msgid "Velocity (red = slow, green = fast)" +msgstr "Velocity (red = slow, green = fast)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 +msgid "Dilution of Position (red = high, green = low, if available)" +msgstr "Dilution of Position (red = high, green = low, if available)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 +msgid "Single Color (can be customized for named layers)" +msgstr "Single Colour (can be customized for named layers)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:1346 msgid "Car" msgstr "Car" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:309 trans_presets.java:635 trans_presets.java:833 #: trans_presets.java:842 trans_presets.java:851 trans_presets.java:864 @@ -2537,5 +2532,5 @@ msgstr "Bicycle" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:310 trans_presets.java:637 trans_presets.java:832 #: trans_presets.java:841 trans_presets.java:850 trans_presets.java:863 @@ -2546,44 +2541,44 @@ msgstr "Foot" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 msgid "Draw Direction Arrows" msgstr "Draw Direction Arrows" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 msgid "Fast drawing (looks uglier)" msgstr "Fast drawing (looks uglier)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180 msgid "Only interesting direction hints (e.g. with oneway tag)." msgstr "Only interesting direction hints (e.g. with oneway tag)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:186 msgid "Only on the head of a way." msgstr "Only on the head of a way." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44 msgid "Draw segment order numbers" msgstr "Draw segment order numbers" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45 msgid "Draw boundaries of downloaded data" msgstr "Draw boundaries of downloaded data" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46 msgid "Draw virtual nodes in select mode" msgstr "Draw virtual nodes in select mode" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47 msgid "Draw inactive layers in other color" msgstr "Draw inactive layers in other colour" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 msgid "Smooth map graphics (antialiasing)" msgstr "Smooth map graphics (antialiasing)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 msgid "" "If your gps device draws too few lines, select this to draw lines along your " @@ -2593,5 +2588,5 @@ "way." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:71 msgid "" "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines." @@ -2599,9 +2594,9 @@ "Maximum length (in metres) to draw lines. Set to '-1' to draw all lines." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73 msgid "Maximum length (meters)" msgstr "Maximum length (metres)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:77 msgid "" "Force drawing of lines if the imported data contain no line information." @@ -2609,14 +2604,15 @@ "Force drawing of lines if the imported data contain no line information." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:84 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89 msgid "Draw direction arrows for lines, connecting GPS points." msgstr "Draw direction arrows for lines, connecting GPS points." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90 -msgid "Draw the direction arrows using table lookups instead of complex math." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95 +msgid "" +"Draw the direction arrows using table lookups instead of complex math." msgstr "" "Draw the direction arrows using table lookups instead of complex maths." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:96 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:101 msgid "" "Don't draw arrows if they are not at least this distance away from the last " @@ -2626,49 +2622,71 @@ "one." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104 msgid "Minimum distance (pixels)" msgstr "Minimum distance (pixels)" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:109 -msgid "Choose the hue for the track color by the velocity at that point." -msgstr "Choose the hue for the track colour by the velocity at that point." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116 +msgid "Draw larger dots for the GPS points." +msgstr "Draw larger dots for the GPS points." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136 +msgid "" +"All points and track segments will have the same color. Can be customized in " +"Layer Manager." +msgstr "" +"All points and track segments will have the same colour. Can be customized " +"in Layer Manager." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137 +msgid "Colors points and track segments by velocity." +msgstr "Colours points and track segments by velocity." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:138 +msgid "" +"Colors points and track segments by dilution of position (HDOP). Your " +"capture device needs to logs that information." +msgstr "" +"Colours points and track segments by dilution of position (HDOP). Your " +"capture device needs to logs that information." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143 msgid "Allows to tune the track coloring for different average speeds." msgstr "Allows to tune the track coloring for different average speeds." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122 -msgid "Draw larger dots for the GPS points." -msgstr "Draw larger dots for the GPS points." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148 +msgid "Track and Point Coloring" +msgstr "Track and Point Colouring" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 msgid "GPS Points" msgstr "GPS Points" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175 msgid "Draw direction hints for way segments." msgstr "Draw direction hints for way segments." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:163 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192 msgid "Draw the order numbers of all segments within their way." msgstr "Draw the order numbers of all segments within their way." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:168 -msgid "Apply antialiasing to the map view resulting in a smoother appearance." -msgstr "Apply antialiasing to the map view resulting in a smoother appearance." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:197 +msgid "" +"Apply antialiasing to the map view resulting in a smoother appearance." +msgstr "" +"Apply antialiasing to the map view resulting in a smoother appearance." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202 msgid "Draw the boundaries of data loaded from the server." msgstr "Draw the boundaries of data loaded from the server." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:178 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:207 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "Draw virtual nodes in select mode for easy way modification." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212 msgid "Draw the inactive data layers in a different color." msgstr "Draw the inactive data layers in a different colour." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219 msgid "OSM Data" msgstr "OSM Data" @@ -2778,12 +2796,12 @@ "a menu entry of button for the first time. So some of your changes may " "become active even without restart --- but also without collistion handling. " -"This is another reason to restart JOSM after making any changes here." -"

    " +"This is another reason to restart JOSM after making any changes " +"here.

    " msgstr "" "

    Furthermore, the shortcuts are activated when the actions are assigned to " "a menu entry of button for the first time. So some of your changes may " "become active even without restart --- but also without collistion handling. " -"This is another reason to restart JOSM after making any changes here." -"

    " +"This is another reason to restart JOSM after making any changes " +"here.

    " #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:170 @@ -2795,8 +2813,9 @@ "key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also " "there will be 'keys' listed that correspond to a shortcut on your keyboard " -"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/" -"Semicolon on US keyboards, '.'/Period on German keyboards, ...) instead. Not " -"doing so may result in conflicts, as there is no way for JOSM to know that " -"Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...

    " +"(e.g. ':'/Colon). Please also do not use them, use the base key " +"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) " +"instead. Not doing so may result in conflicts, as there is no way for JOSM " +"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US " +"keyboard...

    " msgstr "" "

    You may notice that the key selection list on the next page lists all " @@ -2806,9 +2825,9 @@ "key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also " "there will be 'keys' listed that correspond to a shortcut on your keyboard " -"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/" -"Semicolon on US keyboards, '.'/Full Stop on German keyboards, ...) instead. " -"Not doing so may result in conflicts, as there is no way for JOSM to know " -"that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard..." -"

    " +"(e.g. ':'/Colon). Please also do not use them, use the base key " +"(';'/Semicolon on US keyboards, '.'/Full Stop on German keyboards, ...) " +"instead. Not doing so may result in conflicts, as there is no way for JOSM " +"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US " +"keyboard...

    " #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:177 @@ -2836,9 +2855,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183 msgid "" -"

    The pseudo-modifier 'disabled' will disable the shortcut when encountered." -"

    " -msgstr "" -"

    The pseudo-modifier 'disabled' will disable the shortcut when encountered." -"

    " +"

    The pseudo-modifier 'disabled' will disable the shortcut when " +"encountered.

    " +msgstr "" +"

    The pseudo-modifier 'disabled' will disable the shortcut when " +"encountered.

    " #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:186 @@ -2907,67 +2926,67 @@ msgstr "Modifier Groups" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:231 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:236 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:250 msgid "layer not in list." msgstr "layer not in list." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." msgstr "Unable to find translation for the locale {0}. Reverting to {1}." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "usage" msgstr "usage" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 msgid "options" msgstr "options" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 msgid "Show this help" msgstr "Show this help" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Standard unix geometry argument" msgstr "Standard unix geometry argument" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 msgid "Download the bounding box" msgstr "Download the bounding box" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 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:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Open file (as raw gps, if .gpx)" msgstr "Open file (as raw gps, if .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 msgid "Download the bounding box as raw gps" msgstr "Download the bounding box as raw gps" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Select with the given search" msgstr "Select with the given search" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 msgid "Don't launch in fullscreen mode" msgstr "Don't launch in fullscreen mode" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 msgid "Reset the preferences to default" msgstr "Reset the preferences to default" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 msgid "Set the language." msgstr "Set the language." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 msgid "examples" msgstr "examples" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -2977,21 +2996,21 @@ "some data before --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 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:161 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 msgid "Activating updated plugins" msgstr "Activating updated plugins" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 msgid "Loading early plugins" msgstr "Loading early plugins" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Setting defaults" msgstr "Setting defaults" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171 msgid "Loading plugins" msgstr "Loading plugins" @@ -3025,6 +3044,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:108 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:164 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:162 #: trans_presets.java:308 trans_presets.java:309 trans_presets.java:310 #: trans_presets.java:311 trans_presets.java:312 trans_presets.java:313 @@ -3041,5 +3060,5 @@ msgstr "unknown" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:66 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 #, java-format msgid "" @@ -3050,25 +3069,25 @@ "required." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 #, java-format msgid "Plugin requires JOSM update: {0}." msgstr "Plugin requires JOSM update: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "Plugin {0} is required by plugin {1} but was not found." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 #, java-format msgid "Plugin not found: {0}." msgstr "Plugin not found: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Last plugin update more than {0} days ago." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 msgid "" "(You can change the number of days after which this warning appears
    by " @@ -3078,17 +3097,17 @@ "setting the config option 'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 msgid "Disable plugin" msgstr "Disable plugin" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Could not load plugin {0}. Delete from preferences?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -3098,5 +3117,5 @@ "overwrite the existing ones." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 #, java-format msgid "" @@ -3105,10 +3124,10 @@ "An unexpected exception occurred that may have come from the ''{0}'' plugin." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "According to the information within the plugin, the author is {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:262 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -3116,9 +3135,9 @@ "Try updating to the newest version of this plugin before reporting a bug." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 msgid "Should the plugin be disabled?" msgstr "Should the plugin be disabled?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:278 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -3128,5 +3147,5 @@ "unload the plugin." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -3136,6 +3155,6 @@ "about the problem." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:322 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:181 msgid "no description available" msgstr "no description available" @@ -3147,5 +3166,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 msgid "Update Plugins" msgstr "Update Plugins" @@ -3181,5 +3200,5 @@ "The plugin {0} seems to be broken or could not be downloaded automatically." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 #, java-format msgid "Downloaded plugin information from {0} site" @@ -3188,13 +3207,13 @@ msgstr[1] "Downloaded plugin information from {0} sites" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 msgid "No plugin information found." msgstr "No plugin information found." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:76 msgid "All installed plugins are up to date." msgstr "All installed plugins are up to date." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 #, java-format msgid "" @@ -3207,9 +3226,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:105 msgid "Download missing plugins" msgstr "Download missing plugins" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:106 #, java-format msgid "" @@ -3222,22 +3241,22 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 msgid "Download Plugins" msgstr "Download Plugins" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:170 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:168 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Version {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:176 msgid "Plugin bundled with JOSM" msgstr "Plugin bundled with JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208 msgid "Plugin already exists" msgstr "Plugin already exists" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:211 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:209 #, java-format msgid "" @@ -3252,15 +3271,15 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 msgid "Delete and Download" msgstr "Delete and Download" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:222 #, java-format msgid "Error deleting plugin file: {0}" msgstr "Error deleting plugin file: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:281 #, java-format msgid "Error reading plugin information file: {0}" @@ -3327,10 +3346,10 @@ msgstr "Delete {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:165 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 msgid "Conflicting relation" msgstr "Conflicting relation" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 #, java-format msgid "" @@ -3341,5 +3360,5 @@ "Delete from relation?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:166 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 #, java-format msgid "" @@ -3356,11 +3375,11 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:349 msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
    This can cause problems because other objects (that you don't see) might " -"use them.
    Do you really want to delete?" -msgstr "" -"You are about to delete nodes outside of the area you have downloaded." -"
    This can cause problems because other objects, that you don't see, might " -"be using them.
    Do you really want to delete?" +"You are about to delete nodes outside of the area you have " +"downloaded.
    This can cause problems because other objects (that you don't " +"see) might use them.
    Do you really want to delete?" +msgstr "" +"You are about to delete nodes outside of the area you have " +"downloaded.
    This can cause problems because other objects, that you don't " +"see, might be using them.
    Do you really want to delete?" #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 @@ -3488,124 +3507,135 @@ msgstr "Could not load preferences from server." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:232 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "Area style way is not closed." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:426 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:428 #, 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:527 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:765 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:776 msgid "Empty member in relation." msgstr "Empty member in relation." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:767 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:531 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Deleted member ''{0}'' in relation." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:547 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 #, 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:552 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:549 msgid "More than one \"from\" way found." msgstr "More than one \"from\" way found." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:558 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555 msgid "More than one \"to\" way found." msgstr "More than one \"to\" way found." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:561 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 +msgid "More than one \"via\" found." +msgstr "More than one \"via\" found." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 #, java-format msgid "Unknown role ''{0}''." msgstr "Unknown role ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Unknown member type for ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 msgid "No \"from\" way found." msgstr "No \"from\" way found." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 msgid "No \"to\" way found." msgstr "No \"to\" way found." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -msgid "No \"via\" node found." -msgstr "No \"via\" node found." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +msgid "No \"via\" node or way found." +msgstr "No \"via\" node or way found." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 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:619 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:636 -#, java-format -msgid "The \"{0}\" way must contain at least 2 nodes." -msgstr "The \"{0}\" way must contain at least 2 nodes." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:731 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +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:620 +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:624 +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:742 #, 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:787 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 #, 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:798 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Non-Way ''{0}'' in multipolygon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:847 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:858 #, 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:927 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 #, 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:938 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:949 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Inner way ''{0}'' is outside." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:987 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:998 #, 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:1012 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1023 #, 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:1195 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1206 msgid "untagged" msgstr "untagged" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1196 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207 msgid "text" msgstr "text" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" msgstr "inactive" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:94 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:181 @@ -3613,13 +3643,13 @@ msgstr "selected" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" msgstr "untagged way" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 msgid "incomplete way" msgstr "incomplete way" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 msgid "highlight" msgstr "highlight" @@ -3641,5 +3671,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:113 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:89 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:77 msgid "incomplete" @@ -3669,14 +3699,14 @@ msgstr[1] "{0} members" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 msgid "Duplicate" msgstr "Duplicate" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 msgid "Duplicate selection by copy and immediate paste." msgstr "Duplicate selection by copy and immediate paste." -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 @@ -3685,5 +3715,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -3754,7 +3784,11 @@ msgstr "Display history information about OSM ways or nodes." -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:57 -msgid "Please select at least one node, way or relation." -msgstr "Please select at least one node, way or relation." +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:60 +msgid "" +"Please select at least one node, way or relation. Only already uploaded " +"elements have a history." +msgstr "" +"Please select at least one node, way or relation. Only already uploaded " +"elements have a history." #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 @@ -3776,7 +3810,7 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/TerracerAction.java:47 @@ -3914,5 +3948,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:123 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:314 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:315 msgid "Enter values for all conflicts." msgstr "Enter values for all conflicts." @@ -3920,5 +3954,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 msgid "Solve Conflicts" msgstr "Solve Conflicts" @@ -4054,5 +4088,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #, java-format @@ -4079,17 +4113,23 @@ msgstr[1] "The selected nodes are not in the middle of any way." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125 -msgid "" -"There is more than one way using the node(s) you selected. Please select the " +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 +msgid "" +"There is more than one way using the node you selected. Please select the " "way also." -msgstr "" -"There is more than one way using the node(s) you selected. Please select the " +msgid_plural "" +"There is more than one way using the nodes you selected. Please select the " "way also." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133 +msgstr[0] "" +"There is more than one way using the node you selected. Please select the " +"way also." +msgstr[1] "" +"There is more than one way using the nodes you selected. Please select the " +"way also." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137 msgid "The selected nodes do not share the same way." msgstr "The selected nodes do not share the same way." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -4097,10 +4137,10 @@ msgstr[1] "The selected way does not contain all the selected nodes." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229 msgid "You must select two or more nodes to split a circular way." msgstr "You must select two or more nodes to split a circular way." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -4110,5 +4150,5 @@ "middle of the way.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 msgid "" "A role based relation membership was copied to all new ways.\n" @@ -4118,5 +4158,5 @@ "You should verify this and correct it when necessary." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:296 #, java-format msgid "Split way {0} into {1} parts" @@ -4507,5 +4547,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 msgid "Align Nodes in Circle" msgstr "Align Nodes in Circle" @@ -4519,5 +4559,5 @@ msgstr "Some of the nodes are (almost) in the line" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 msgid "Please select at least four nodes." msgstr "Please select at least four nodes." @@ -4586,4 +4626,33 @@ msgstr "An error occurred while restoring backup file." +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "Show Status Report" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "" +"Show status report with useful information that can be attached to bugs" +msgstr "" +"Show status report with useful information that can be attached to bugs" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "Help: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92 +msgid "Status Report" +msgstr "Status Report" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +msgid "Copy to clipboard and close" +msgstr "Copy to clipboard and close" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 +msgid "Close" +msgstr "Close" + #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 @@ -4595,13 +4664,13 @@ msgstr "Redo the last undone action." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:44 msgid "Delete Mode" msgstr "Delete Mode" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:46 msgid "Delete nodes or ways." msgstr "Delete nodes or ways." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:84 @@ -4612,5 +4681,5 @@ msgstr "Mode: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:130 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -4622,9 +4691,9 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:87 msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." -msgstr "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronise audio at that point." +"Drag play head and release near track to play audio from there; " +"SHIFT+release to synchronize audio at that point." +msgstr "" +"Drag play head and release near track to play audio from there; " +"SHIFT+release to synchronise audio at that point." #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 @@ -4637,23 +4706,23 @@ msgstr "Create areas" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 msgid "Extrude Way" msgstr "Extrude Way" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:252 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:416 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:430 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/ExtrudeAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 msgid "Draw a rectangle of the desired size, then release the mouse button." msgstr "Draw a rectangle of the desired size, then release the mouse button." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:420 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:434 msgid "Release the mouse button to stop rotating." msgstr "Release the mouse button to stop rotating." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 msgid "Drag a way segment to make a rectangle." msgstr "Drag a way segment to make a rectangle." @@ -4721,14 +4790,14 @@ msgstr "Select, move and rotate objects" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:191 msgid "Add and move a virtual new node to way" msgstr "Add and move a virtual new node to way" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:220 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:223 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 msgid "Cannot move objects outside of the world." msgstr "Cannot move objects outside of the world." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:418 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:432 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -4736,5 +4805,5 @@ "Release the mouse button to stop moving. Ctrl to merge with nearest node." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:422 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:436 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to remove); Shift-" @@ -4809,30 +4878,30 @@ msgstr "Merge {0} nodes" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Orthogonalize Shape" msgstr "Orthogonalize Shape" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 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:60 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 msgid "Only two nodes allowed" msgstr "Only two nodes allowed" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 msgid "Selection must consist only of ways." msgstr "Selection must consist only of ways." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 msgid "Please select one or more closed ways of at least four nodes." msgstr "Please select one or more closed ways of at least four nodes." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 msgid "Please select ways with almost right angles to orthogonalize." msgstr "Please select ways with almost right angles to orthogonalise." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 msgid "" "You are using the EPSG:4326 projection which might lead
    to " @@ -4844,9 +4913,9 @@ "projection to get rid of this warning.
    Do you want to continue?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "Only one node selected" msgstr "Only one node selected" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 msgid "Orthogonalize" msgstr "Orthogonalise" @@ -4897,6 +4966,8 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101 -msgid "Please select exactly three nodes or one way with exactly three nodes." -msgstr "Please select exactly three nodes or one way with exactly three nodes." +msgid "" +"Please select exactly three nodes or one way with exactly three nodes." +msgstr "" +"Please select exactly three nodes or one way with exactly three nodes." #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121 @@ -4904,52 +4975,71 @@ msgstr "Those nodes are not in a circle." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../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:71 +msgid "Update Data" +msgstr "Update Data" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "Updates the current data layer from the server (re-downloads data)" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:72 +#, java-format +msgid "" +"This action will require {0} individual download requests. Do you wish to " +"continue?" +msgstr "" +"This action will require {0} individual download requests. Do you wish to " +"continue?" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 msgid "Open Location..." msgstr "Open Location..." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 msgid "Open an URL." msgstr "Open an URL." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 msgid "Separate Layer" msgstr "Separate Layer" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 msgid "Enter URL to download:" msgstr "Enter URL to download:" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 msgid "Download Location" msgstr "Download Location" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 msgid "Download URL" msgstr "Download URL" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 msgid "Add Node..." msgstr "Add Node..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 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:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 msgid "Enter the coordinates for the new node." msgstr "Enter the coordinates for the new node." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 msgid "Use decimal degrees." msgstr "Use decimal degrees." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negative values denote Western/Southern hemisphere." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 #: ../plugins/livegps/livegps/LiveGpsDialog.java:54 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93 @@ -4958,5 +5048,5 @@ msgstr "Latitude" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 #: ../plugins/livegps/livegps/LiveGpsDialog.java:56 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96 @@ -4999,14 +5089,14 @@ msgstr "Moves Objects {0}" +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "Overwrite" msgstr "Overwrite" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "File exists. Overwrite?" msgstr "File exists. Overwrite?" @@ -5025,42 +5115,48 @@ msgstr "Please select something to copy." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "UnGlue Ways" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "Duplicate nodes that are used by multiple ways." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 msgid "This node is not glued to anything else." msgstr "This node is not glued to anything else." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 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:90 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 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:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 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:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "Select either:" msgstr "Select either:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +msgid "* One tagged node, or" +msgstr "* One tagged node, or" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 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:103 -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:104 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +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:117 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -5068,5 +5164,5 @@ "* 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:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -5074,5 +5170,5 @@ "* 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:107 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -5086,10 +5182,14 @@ "own copy and all nodes will be selected." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:160 +msgid "Unglued Node" +msgstr "Unglued Node" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:373 #, java-format msgid "Dupe into {0} nodes" msgstr "Dupe into {0} nodes" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:320 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:397 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -5192,5 +5292,5 @@ msgstr "Undo the last action." -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 msgid "No Shortcut" msgstr "No Shortcut" @@ -5212,13 +5312,13 @@ msgstr "OpenStreetMap data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:29 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:28 msgid "Downloading GPS data" msgstr "Downloading GPS data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:41 msgid "Downloaded GPX Data" msgstr "Downloaded GPX Data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:71 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:69 msgid "Raw GPS data" msgstr "Raw GPS data" @@ -5442,6 +5542,8 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169 -msgid "Header contains several values and cannot be mapped to a single string" -msgstr "Header contains several values and cannot be mapped to a single string" +msgid "" +"Header contains several values and cannot be mapped to a single string" +msgstr "" +"Header contains several values and cannot be mapped to a single string" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76 @@ -5795,6 +5897,8 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69 -msgid "Maximum number of segments allowed in each generated way. Default 250." -msgstr "Maximum number of segments allowed in each generated way. Default 250." +msgid "" +"Maximum number of segments allowed in each generated way. Default 250." +msgstr "" +"Maximum number of segments allowed in each generated way. Default 250." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70 @@ -5816,9 +5920,11 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72 msgid "" -"Accuracy of Douglas-Peucker line simplification, measured in degrees." -"
    Lower values give more nodes, and more accurate lines. Default 0.0003." -msgstr "" -"Accuracy of Douglas-Peucker line simplification, measured in degrees." -"
    Lower values give more nodes, and more accurate lines. Default 0.0003." +"Accuracy of Douglas-Peucker line simplification, measured in " +"degrees.
    Lower values give more nodes, and more accurate lines. Default " +"0.0003." +msgstr "" +"Accuracy of Douglas-Peucker line simplification, measured in " +"degrees.
    Lower values give more nodes, and more accurate lines. Default " +"0.0003." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73 @@ -6438,5 +6544,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:431 msgid "Validate that property keys are valid checking against list of words." -msgstr "Validate that property keys are valid checking against list of words." +msgstr "" +"Validate that property keys are valid checking against list of words." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:438 @@ -6456,9 +6563,11 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:509 msgid "" -"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." -"org/index.php/User:JLS/speller) or tag checking data files." -msgstr "" -"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." -"org/index.php/User:JLS/speller) or tag checking data files." +"The sources (URL or filename) of spell check (see " +"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking " +"data files." +msgstr "" +"The sources (URL or filename) of spell check (see " +"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking " +"data files." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:510 @@ -6918,6 +7027,6 @@ msgstr "Add new layer" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:40 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:43 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 #, java-format @@ -6925,19 +7034,32 @@ msgstr "Downloading {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:51 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:55 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 msgid "Contacting WMS Server..." msgstr "Contacting WMS Server..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157 msgid "Create buildings" msgstr "Create buildings" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 msgid "CadastreGrabber: Illegal url." msgstr "CadastreGrabber: Illegal url." + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +msgid "" +"To avoid cadastre WMS overload,\n" +"building import size is limited to 1 km2 max." +msgstr "" +"To avoid cadastre WMS overload,\n" +"building import size is limited to 1 km2 max." + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +msgid "Please, enable auto-sourcing and check cadastre millesime." +msgstr "Please, enable auto-sourcing and check cadastre millesime." #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78 @@ -6959,5 +7081,22 @@ msgstr "Cadastre: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:128 +msgid "Cadastre" +msgstr "Cadastre" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:139 +msgid "Auto sourcing" +msgstr "Auto sourcing" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164 +msgid "Invalid projection" +msgstr "Invalid projection" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 +#, java-format +msgid "Change the projection to {0} first." +msgstr "Change the projection to {0} first." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:169 msgid "" "To enable the cadastre WMS plugin, change\n" @@ -6966,12 +7105,4 @@ "To enable the cadastre WMS plugin, change\n" "the JOSM projection to Lambert and restart" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132 -msgid "Cadastre" -msgstr "Cadastre" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 -msgid "Auto sourcing" -msgstr "Auto sourcing" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20 @@ -7045,9 +7176,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:43 msgid "" -"More than one WMS layer present.\n" -"Select one of them first, then retry." -msgstr "" -"More than one WMS layer present.\n" -"Select one of them first, then retry." +"More than one WMS layer present\n" +"Select one of them first, then retry" +msgstr "" +"More than one WMS layer present\n" +"Select one of them first, then retry" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:19 @@ -7055,5 +7186,5 @@ msgstr "Load location from cache (only if cache is enabled)" -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136 #, java-format @@ -7063,13 +7194,13 @@ msgstr[1] "Simplify Way (remove {0} nodes)" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61 msgid "Extract SVG ViewBox..." msgstr "Extract SVG ViewBox..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65 msgid "Extract best fitting boundary..." msgstr "Extract best fitting boundary..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:120 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126 msgid "Create boundary" msgstr "Create boundary" @@ -7105,15 +7236,15 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 msgid "Save WMS layer to file" msgstr "Save WMS layer to file" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "Load WMS layer from file" msgstr "Load WMS layer from file" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -7121,5 +7252,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 msgid "File Format Error" msgstr "File Format Error" @@ -7127,5 +7258,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 msgid "Error loading file" msgstr "Error loading file" @@ -7153,58 +7284,60 @@ msgstr "Cache Lambert Zone Error" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 msgid "Replace original background by JOSM background color." msgstr "Replace original background by JOSM background color." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30 msgid "Reverse grey colors (for black backgrounds)." msgstr "Reverse grey colors (for black backgrounds)." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 msgid "Set background transparent." msgstr "Set background transparent." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34 msgid "Draw boundaries of downloaded data." msgstr "Draw boundaries of downloaded data." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Enable automatic caching." msgstr "Enable automatic caching." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 msgid "Max. cache size (in MB)" msgstr "Max. cache size (in MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:53 -msgid "" -"A special handler of the french cadastre wms at www.cadastre.gouv." -"fr

    Please read the Terms and Conditions of Use here (in french): " -"
    http://www.cadastre.gouv.fr/scpc/html/" -"CU_01_ConditionsGenerales_fr.html
    before any upload of data created " -"by this plugin." -msgstr "" -"A special handler of the french cadastre wms at www.cadastre.gouv." -"fr

    Please read the Terms and Conditions of Use here (in french): " -"
    http://www.cadastre.gouv.fr/scpc/html/" -"CU_01_ConditionsGenerales_fr.html
    before any upload of data created " -"by this plugin." - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:58 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:55 +msgid "" +"A special handler of the french cadastre wms at " +"www.cadastre.gouv.fr

    Please read the Terms and Conditions of Use here " +"(in french):
    " +"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " +"
    before any upload of data created by this plugin." +msgstr "" +"A special handler of the french cadastre wms at " +"www.cadastre.gouv.fr

    Please read the Terms and Conditions of Use here " +"(in french):
    " +"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " +"
    before any upload of data created by this plugin." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 msgid "French cadastre WMS" msgstr "French cadastre WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64 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:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65 msgid "Source" msgstr "Source" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -7214,27 +7347,42 @@ "preferences." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 -msgid "" -"Invert the original texts from black to white (and all intermediate greys)." -msgstr "" -"Invert the original texts from black to white (and all intermediate greys)." - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +msgid "" +"Invert the original black and white colors (and all intermediate greys). " +"Useful for texts on dark backgrounds." +msgstr "" +"Invert the original black and white colours (and all intermediate greys). " +"Useful for texts on dark backgrounds." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Allows multiple layers stacking" msgstr "Allows multiple layers stacking" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:99 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 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:109 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Draw a rectangle around downloaded data from WMS server." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:113 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 msgid "Image grab multiplier:" msgstr "Image grab multiplier:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:162 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:125 +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:129 +msgid "Fixed size square (default is 100m)" +msgstr "Fixed size square (default is 100m)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +msgid "Fixed size (from 25 to 1000 meters)" +msgstr "Fixed size (from 25 to 1000 meters)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "Oldest files are automatically deleted when this size is exceeded" @@ -7346,5 +7494,5 @@ msgstr "No intersection found. Nothing was changed." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:254 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:255 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -7493,11 +7641,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:203 msgid "" -"Take a photo of your GPS receiver while it displays the time." -"
    Display that photo here.
    And then, simply capture the time you read " -"on the photo and select a timezone
    " -msgstr "" -"Take a photo of your GPS receiver while it displays the time." -"
    Display that photo here.
    And then, simply capture the time you read " -"on the photo and select a timezone
    " +"Take a photo of your GPS receiver while it displays the " +"time.
    Display that photo here.
    And then, simply capture the time you " +"read on the photo and select a timezone
    " +msgstr "" +"Take a photo of your GPS receiver while it displays the " +"time.
    Display that photo here.
    And then, simply capture the time you " +"read on the photo and select a timezone
    " #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:221 @@ -7563,5 +7711,6 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:484 -msgid "I can take a picture of my GPS receiver.
    Can this help?" +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?" @@ -7608,5 +7757,5 @@ msgstr "Invalid timezone" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #, java-format msgid "" @@ -7617,14 +7766,14 @@ "Expected format: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:579 msgid "Invalid offset" msgstr "Invalid offset" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:641 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:643 #, java-format msgid "Found {0} matchs of {1} in GPX track {2}" msgstr "Found {0} matchs of {1} in GPX track {2}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:642 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:644 msgid "GPX Track loaded" msgstr "GPX Track loaded" @@ -7632,5 +7781,5 @@ #: ../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/UploadDataGui.java:79 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 msgid "Upload Traces" msgstr "Upload Traces" @@ -7640,58 +7789,72 @@ msgstr "Uploads traces to openstreetmap.org" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 -msgid "Upload GPX track" -msgstr "Upload GPX track" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71 +msgid "Upload Trace" +msgstr "Upload Trace" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Public" msgstr "Public" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 msgid "Selected makes your trace public in openstreetmap.org" msgstr "Selected makes your trace public in openstreetmap.org" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Description" msgstr "Description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:123 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 msgid "Tags" msgstr "Tags" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:182 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:153 +#, java-format +msgid "Selected track: {0}" +msgstr "Selected track: {0}" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:176 msgid "Connecting..." msgstr "Connecting..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 -msgid "Uploading GPX track..." -msgstr "Uploading GPX track..." - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:214 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:199 +msgid "Upload cancelled" +msgstr "Upload cancelled" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:209 +msgid "Error while uploading" +msgstr "Error while uploading" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "GPX upload was successful" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:227 -msgid "Error while uploading" -msgstr "Error while uploading" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:235 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +msgid "Upload failed. Server returned the following message: " +msgstr "Upload failed. Server returned the following message: " + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 +#, java-format +msgid "Uploading GPX track: {0}% ({1} of {2})" +msgstr "Uploading GPX track: {0}% ({1} of {2})" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "No description provided. Please provide some description." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:252 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "No GPX layer selected. Cannot upload a trace." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:241 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "No username provided." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:244 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "No password provided." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "Uploading GPX Track" @@ -7914,15 +8077,15 @@ msgstr "Automatic downloading" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS layer ({0}), automatically downloading in zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS layer ({0}), downloading in zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -7930,17 +8093,17 @@ "The requested area is too big. Please zoom in a little, or change resolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:232 msgid "Download visible tiles" msgstr "Download visible tiles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241 msgid "Change resolution" msgstr "Change resolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:253 msgid "Reload erroneous tiles" msgstr "Reload erroneous tiles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:264 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:271 msgid "Alpha channel" msgstr "Alpha channel" @@ -7998,6 +8161,6 @@ "\n" "Full WMS URL input format example (landsat)\n" -"http://onearth.jpl.nasa.gov/wms.cgi?" -"request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n" +"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&style" +"s=&srs=EPSG:4326&format=image/jpeg\n" "\n" "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " @@ -8005,6 +8168,6 @@ "To add a Metacarta Map Rectifier menu item, manually create the URL like in " "this example,replacing 73 with your image id:\n" -"http://labs.metacarta.com/rectifier/wms.cgi?" -"id=73&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&\n" +"http://labs.metacarta.com/rectifier/wms.cgi?id=73&srs=EPSG:4326&Service=WMS&V" +"ersion=1.1.0&Request=GetMap&\n" "format=image/png" @@ -12831,7 +12994,11 @@ msgstr "to way" +#, java-format #~ msgid "Error while exporting {0}" #~ msgstr "Error while exporting {0}" +#~ msgid "Please select something from the conflict list." +#~ msgstr "Please select something from the conflict list." + #~ msgid "OSM History Information" #~ msgstr "OSM History Information" @@ -12840,4 +13007,5 @@ #~ msgstr "Search ..." +#, java-format #~ msgid " ({0} node)" #~ msgid_plural " ({0} nodes)" @@ -12849,13 +13017,13 @@ #~ msgid "" -#~ "This is the basic relation editor which allows you to change the " -#~ "relation's tags as well as the members. In addition to this we should " -#~ "have a smart editor that detects the type of relationship and limits your " -#~ "choices in a sensible way." +#~ "This is the basic relation editor which allows you to change the relation's " +#~ "tags as well as the members. In addition to this we should have a smart " +#~ "editor that detects the type of relationship and limits your choices in a " +#~ "sensible way." #~ msgstr "" -#~ "This is the basic relation editor which allows you to change the " -#~ "relation's tags as well as the members. In addition to this we should " -#~ "have a smart editor that detects the type of relationship and limits your " -#~ "choices in a sensible way." +#~ "This is the basic relation editor which allows you to change the relation's " +#~ "tags as well as the members. In addition to this we should have a smart " +#~ "editor that detects the type of relationship and limits your choices in a " +#~ "sensible way." #~ msgid "Highlight the member from the current table row as JOSM's selection" @@ -12865,4 +13033,39 @@ #~ msgstr "Selection: %d way(s) and %d node(s)" +#~ msgid "Upload this trace..." +#~ msgstr "Upload this trace..." + +#~ msgid "" +#~ "This functionality has been added only recently. Please
    use with " +#~ "care and check if it works as expected." +#~ msgstr "" +#~ "This functionality has been added only recently. Please
    use with " +#~ "care and check if it works as expected." + +#~ msgid "Upload track filtered by JOSM" +#~ msgstr "Upload track filtered by JOSM" + +#~ msgid "Upload raw file: " +#~ msgstr "Upload raw file: " + +#~ msgid "Description:" +#~ msgstr "Description:" + +#~ msgid "Tags (keywords in GPX):" +#~ msgstr "Tags (keywords in GPX):" + +#~ msgid "GPX-Upload" +#~ msgstr "GPX-Upload" + +#, java-format +#~ msgid "Upload raw file: {0}" +#~ msgstr "Upload raw file: {0}" + +#~ msgid "Tags:" +#~ msgstr "Tags:" + +#~ msgid "Choose the hue for the track color by the velocity at that point." +#~ msgstr "Choose the hue for the track colour by the velocity at that point." + #~ msgid "Unknown type" #~ msgstr "Unknown type" @@ -12871,4 +13074,5 @@ #~ msgstr "NullPointerException, Possibly some missing tags." +#, java-format #~ msgid "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..." #~ msgstr "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..." @@ -12895,4 +13099,5 @@ #~ msgstr "Natural" +#, java-format #~ msgid "Version: {0}
    Last change at {1}" #~ msgstr "Version: {0}
    Last change at {1}" @@ -12910,4 +13115,5 @@ #~ msgstr "SurveyorPlugin" +#, java-format #~ msgid "Version {0} - Last change at {1}" #~ msgstr "Version {0} - Last change at {1}" @@ -12919,7 +13125,4 @@ #~ msgstr "Similarly named ways." -#~ msgid "Untagged nodes." -#~ msgstr "Untagged nodes." - #~ msgid "Open waypoints file" #~ msgstr "Open waypoints file" @@ -12928,40 +13131,40 @@ #~ msgstr "Open a waypoints file." +#, java-format #~ msgid "Data error: lat value \"{0}\" is out of bounds." #~ msgstr "Data error: lat value \"{0}\" is out of bounds." +#, java-format #~ msgid "Data error: lon value \"{0}\" is out of bounds." #~ msgstr "Data error: lon value \"{0}\" is out of bounds." #~ msgid "" -#~ "Fulltext search:
    • Baker Street - 'Baker' and 'Street' " -#~ "in any key or name.
    • \"Baker Street\" - 'Baker Street' in " -#~ "any key or name.
    • name:Bak - 'Bak' anywhere in the name.
    • -name:Bak - not 'Bak' in the name.
    • foot: - " -#~ "key=foot set to any value.
    • Special targets:
    • type: " -#~ "- type of the object (node, way, relation)
    • user:... - all objects changed by user
    • id:... - object with given ID
    • nodes:... - object with given " -#~ "number of nodes
    • modified - all changed objects
    • selected - all selected objects
    • incomplete - " -#~ "all incomplete objects
    • Use | or OR to combine with " -#~ "logical or
    • Use \" to quote operators (e.g. if key " -#~ "contains :)
    • Use ( and ) to group expressions
      • " +#~ "Fulltext search:
      • Baker Street - 'Baker' and 'Street' in " +#~ "any key or name.
      • \"Baker Street\" - 'Baker Street' in any key " +#~ "or name.
      • name:Bak - 'Bak' anywhere in the name.
      • -" +#~ "name:Bak - not 'Bak' in the name.
      • foot: - key=foot set to " +#~ "any value.
      • Special targets:
      • type: - type of the " +#~ "object (node, way, relation)
      • user:... - " +#~ "all objects changed by user
      • id:... - object with given " +#~ "ID
      • nodes:... - object with given number of " +#~ "nodes
      • modified - all changed objects
      • selected -" +#~ " all selected objects
      • incomplete - all incomplete " +#~ "objects
      • Use | or OR to combine with logical " +#~ "or
      • Use \" to quote operators (e.g. if key contains " +#~ ":)
      • Use ( and ) to group expressions
      " #~ msgstr "" -#~ "Fulltext search:
      • Baker Street - 'Baker' and 'Street' " -#~ "in any key or name.
      • \"Baker Street\" - 'Baker Street' in " -#~ "any key or name.
      • name:Bak - 'Bak' anywhere in the name.
      • -name:Bak - not 'Bak' in the name.
      • foot: - " -#~ "key=foot set to any value.
      • Special targets:
      • type: " -#~ "- type of the object (node, way, relation)
      • user:... - all objects changed by user
      • id:... - object with given ID
      • nodes:... - object with given " -#~ "number of nodes
      • modified - all changed objects
      • selected - all selected objects
      • incomplete - " -#~ "all incomplete objects
      • Use | or OR to combine with " -#~ "logical or
      • Use \" to quote operators (e.g. if key " -#~ "contains :)
      • Use ( and ) to group expressions
        • " +#~ "Fulltext search:
        • Baker Street - 'Baker' and 'Street' in " +#~ "any key or name.
        • \"Baker Street\" - 'Baker Street' in any key " +#~ "or name.
        • name:Bak - 'Bak' anywhere in the name.
        • -" +#~ "name:Bak - not 'Bak' in the name.
        • foot: - key=foot set to " +#~ "any value.
        • Special targets:
        • type: - type of the " +#~ "object (node, way, relation)
        • user:... - " +#~ "all objects changed by user
        • id:... - object with given " +#~ "ID
        • nodes:... - object with given number of " +#~ "nodes
        • modified - all changed objects
        • selected -" +#~ " all selected objects
        • incomplete - all incomplete " +#~ "objects
        • Use | or OR to combine with logical " +#~ "or
        • Use \" to quote operators (e.g. if key contains " +#~ ":)
        • Use ( and ) to group expressions
        " #~ msgid "Add Node" @@ -12986,4 +13189,11 @@ #~ msgstr "bus" +#, java-format +#~ msgid "The \"{0}\" way must contain at least 2 nodes." +#~ msgstr "The \"{0}\" way must contain at least 2 nodes." + +#~ msgid "Upload GPX track" +#~ msgstr "Upload GPX track" + #~ msgid "Direct Upload to OpenStreetMap" #~ msgstr "Direct Upload to OpenStreetMap" Index: /applications/editors/josm/i18n/po/es.po =================================================================== --- /applications/editors/josm/i18n/po/es.po (revision 13832) +++ /applications/editors/josm/i18n/po/es.po (revision 13833) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-15 22:03+0100\n" -"PO-Revision-Date: 2009-02-15 16:59+0000\n" +"POT-Creation-Date: 2009-02-21 16:35+0100\n" +"PO-Revision-Date: 2009-02-22 11:07+0000\n" "Last-Translator: Emilio Gómez Fernández \n" "Language-Team: Spanish \n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-02-15 20:40+0000\n" +"X-Launchpad-Export-Date: 2009-02-22 20:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 #, java-format msgid "" @@ -26,10 +26,10 @@ "\n" msgstr "" -"No se pudo establecer el atajo de teclado \"{0}\" para la acción \"{1}" -"\" ({2})\n" +"No se pudo establecer el atajo de teclado \"{0}\" para la acción \"{1}\" " +"({2})\n" "porque ese atajo está actualmente establecido para \"{3}\" ({4}).\n" "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 msgid "" "This action will have no shortcut.\n" @@ -39,5 +39,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -48,5 +48,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Pista: Usted puede editar los atajos en las preferencias.)" @@ -57,17 +57,17 @@ #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 msgid "Information" msgstr "Información" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Do nothing" msgstr "No hacer nada" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Report Bug" msgstr "Informar del error" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 msgid "" "An unexpected exception occurred.\n" @@ -82,18 +82,18 @@ "de JOSM, por favor, considere enviar un informe de error." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Unexpected Exception" msgstr "Excepción inesperada" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 #, java-format msgid "Please report a ticket at {0}" msgstr "Por favor presente una \"ticket\" en {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "Incluya los pasos previos al error (lo más detalladamente posible)" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:78 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -103,9 +103,9 @@ "complementos antes de comunicar un fallo." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Be sure to include the following information:" msgstr "Asegúrese de incluir la siguiente información:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75 msgid "(The text has already been copied to your clipboard.)" msgstr "(El texto ya ha sido copiado a tu portapapeles.)" @@ -119,5 +119,5 @@ msgstr "Error reproduciendo sonido" -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:94 @@ -125,5 +125,5 @@ msgstr "Contactando con el servidor OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:48 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:32 @@ -131,10 +131,10 @@ msgstr "Descargando datos OSM..." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 msgid "NullPointerException, possibly some missing tags." msgstr "NullPointerException, Posiblemente faltan algunas etiquetas." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83 msgid "Preparing data..." msgstr "Preparando datos..." @@ -164,48 +164,48 @@ msgstr "Descargando puntos {0} al {1}..." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:164 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:168 msgid "Unknown version" msgstr "Versión desconocida" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 msgid "Found element in non-way." msgstr "Encontrado elemento en una no Vía" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 msgid " has zero ref" msgstr " no tiene ref" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 msgid "Found element in non-relation." msgstr "Encontrada una etiqueta fuera de una relación." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:252 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250 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:294 msgid "Illegal object with id=0" msgstr "Objeto con id=0 ilegal" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Falta el atributo necesario \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 #, java-format msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" msgstr "Obviando una vía porque incluye un nodo que no existe: {0}\n" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:502 msgid "Prepare OSM data..." msgstr "Preparar datos OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:518 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:516 msgid "Ill-formed node id" msgstr "id del nodo mal formado" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:280 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:287 msgid "Parse error: invalid document structure for gpx document" msgstr "" @@ -217,18 +217,18 @@ msgstr "Contactando con el servidor..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Introduzca un breve comentario a los cambios que se están subiendo:" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 msgid "Commit comment" msgstr "Envíe comentario" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" msgstr "{0}% ({1}/{2}), Faltan {3}. Actualizando {4}: {5} (id: {6})" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64 @@ -238,34 +238,32 @@ msgstr "Ha ocurrido un error: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:192 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190 msgid "Opening changeset..." msgstr "Abriendo conjunto de cambios..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:226 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224 msgid "Server does not support changesets" msgstr "El servidor no soporta conjuntos de cambios" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:246 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:428 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:609 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:184 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607 msgid "Unknown host" msgstr "Host desconocido" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282 msgid "Preparing..." msgstr "Preparando…" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:294 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292 msgid "Uploading..." msgstr "Subiendo..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375 msgid "Closing changeset..." msgstr "Cerrando conjunto de cambios..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:652 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650 msgid "Transfer aborted due to error (will wait for 5 seconds):" msgstr "Transferencia abortada debido a un error (se esperará 5 segundos):" @@ -287,5 +285,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85 msgid "Warning: The password is transferred unencrypted." -msgstr "Advertencia: La contraseña se transferirá sin encriptar." +msgstr "Advertencia: La contraseña se transferirá sin codificar." #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89 @@ -303,17 +301,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95 #: ../core/src/org/openstreetmap/josm/Main.java:348 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:29 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 @@ -326,11 +327,11 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:110 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -345,11 +346,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:186 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 msgid "Creating main GUI" msgstr "Creando la interfaz de usuario principal" #: ../core/src/org/openstreetmap/josm/Main.java:195 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:271 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:278 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:56 msgid "Help" @@ -364,5 +365,6 @@ #: ../core/src/org/openstreetmap/josm/Main.java:345 msgid "Hint: Some changes came from uploading new data to the server." -msgstr "Aviso: Algunos cambios provienen de nuevos datos subidos al servidor." +msgstr "" +"Aviso: Algunos cambios provienen de nuevos datos subidos al servidor." #: ../core/src/org/openstreetmap/josm/Main.java:346 @@ -393,21 +395,21 @@ msgstr "Ignorando archivo URL malformado: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109 msgid "min lat" msgstr "latitud mínima" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111 msgid "min lon" msgstr "longitud mínima" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:117 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "max lat" msgstr "latitud máxima" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 msgid "max lon" msgstr "longitud máxima" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:122 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -416,5 +418,5 @@ "URL de www.openstreetmap.org (puede pegar aquí una URL para bajar dicha área)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:134 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130 msgid "Bounding Box" msgstr "Cuadro delimitador" @@ -428,5 +430,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 msgid "Null pointer exception, possibly some missing tags." -msgstr "" +msgstr "Excepción de puntero nulo, posiblemente alguna etiqueta esté perdida" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 @@ -450,6 +452,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:96 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:894 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:956 msgid "name" msgstr "nombre" @@ -482,5 +484,5 @@ msgstr "zoom" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:107 msgid "" "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -490,7 +492,7 @@ "botón derecho del ratón y mueva el ratón. Seleccionar: Click" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:109 msgid "Slippy map" -msgstr "" +msgstr "Mapa desplazable (Slippy map)" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 @@ -499,7 +501,7 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:605 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:602 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:89 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -519,5 +521,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380 msgid "Remove" msgstr "Eliminar" @@ -663,20 +665,20 @@ msgstr "Si se especifica, reinicie la configuración en lugar de leerla." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:109 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:186 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:198 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:108 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:191 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:203 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 msgid "Java OpenStreetMap Editor" msgstr "Editor Java OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:111 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:110 msgid "Message of the day not available" msgstr "Mensaje del dia no está disponible" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:200 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:205 msgid "Downloading \"Message of the day\"" msgstr "Descargando \"Mensaje del día\"" @@ -716,33 +718,33 @@ msgstr "Alejarse" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:234 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:474 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:512 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:383 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:380 msgid "More information about this feature" msgstr "Más información sobre esta característica" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:393 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:390 msgid "Optional Attributes:" msgstr "Atributos opcionales" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:437 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Usar preferencia ''{0}'' del grupo ''{1}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:438 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:435 #, java-format msgid "Use preset ''{0}''" msgstr "Usar preferencia ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 msgid "way" @@ -751,11 +753,11 @@ msgstr[1] "vías" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:214 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 msgid "node" msgid_plural "nodes" @@ -763,6 +765,6 @@ msgstr[1] "nodos" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:81 @@ -772,14 +774,14 @@ msgstr[1] "relaciones" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 msgid "closedway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:475 +msgstr "vía sin salida" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 #, java-format msgid "Unknown type: {0}" msgstr "Tipo desconocido: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:549 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 #, java-format @@ -787,15 +789,15 @@ msgstr "No se pudo leer la fuente de las preferencias de etiquetas: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:555 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 #, java-format msgid "Error parsing {0}: " msgstr "Error analizando {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:572 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:569 #, 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:607 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595 #, java-format msgid "Change {0} object" @@ -804,9 +806,17 @@ msgstr[1] "Cambiar objetos {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 msgid "Nothing selected!" msgstr "¡No hay nada seleccionado!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 +msgid "Selection unsuitable!" +msgstr "¡Selección inadecuada!" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +msgid "Apply Preset" +msgstr "Aplicar predeterminado" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 msgid "Change Properties" msgstr "Cambiar propiedades" @@ -817,14 +827,14 @@ msgstr "Grupo de predefinidos ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:107 msgid "File" msgstr "Archivo" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:135 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:107 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:86 @@ -836,22 +846,22 @@ msgstr "Editar" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 msgid "View" msgstr "Vista" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:26 msgid "Tools" msgstr "Herramientas" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:141 msgid "Audio" msgstr "Audio" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:142 msgid "Presets" msgstr "Predefinidos" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:40 @@ -863,18 +873,18 @@ msgstr "Menú: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:210 msgid "Wireframe View" msgstr "Vista de rejilla" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212 msgid "Toggle Wireframe view" msgstr "Interruptor de la vista de rejilla" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:28 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 msgid "Contacting the OSM server..." msgstr "Contactando con el servidor OSM..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 #, java-format msgid "This will change up to {0} object." @@ -883,11 +893,11 @@ msgstr[1] "Esto cambiará {0} objetos." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 msgid "An empty value deletes the key." msgstr "Un valor vacío elimina la clave." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66 @@ -897,7 +907,7 @@ msgstr "Key" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 @@ -906,10 +916,10 @@ msgstr "Valor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333 msgid "Change values?" msgstr "¿Modificar valores?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:257 #, java-format msgid "Change properties of up to {0} object" @@ -918,33 +928,33 @@ msgstr[1] "Cambiar las propiedades de hasta {0} objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 msgid "Please select a key" msgstr "Por favor, selecciona una etiqueta" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321 msgid "Please select a value" msgstr "Por favor, selecciona un valor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:445 msgid "Please select the objects you want to change properties for." msgstr "Por favor, seleccione los objetos que desee cambiar las propiedades." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 msgid "Properties/Memberships" msgstr "Propiedades/Relaciones" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 msgid "Properties for selected objects." msgstr "Propiedades de los objetos seleccionados." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97 @@ -956,58 +966,58 @@ msgstr "Intercambiar: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 msgid "Member Of" msgstr "Miembro de" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Role" msgstr "Rol" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:559 msgid "Change relation" msgstr "Cambiar relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560 #, 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:564 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 msgid "Delete from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 +msgstr "Borrar desde relación" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:600 msgid "Add Properties" msgstr "Añadir propiedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 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:609 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 msgid "Edit Properties" msgstr "Editar propiedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609 msgid "Edit the value of the selected key for all objects" msgstr "Editar el valor de la clave seleccionada para todos los objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 msgid "Delete Properties" msgstr "Eliminar propiedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:77 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:293 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 @@ -1016,98 +1026,115 @@ msgstr "Borrar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 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:766 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:763 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Propiedades: {0} / Miembros: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:769 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 msgid "Properties / Memberships" msgstr "Propiedades / Miembros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178 +msgid "Apply Changes" +msgstr "Aplicar cambios" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 msgid "Create new relation" msgstr "Crear nueva relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208 msgid "Edit new relation" msgstr "Editar nueva relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209 #, java-format msgid "Edit relation #{0}" msgstr "Editar relación #{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230 +msgid "Basic" +msgstr "Básico" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Occupied By" msgstr "Ocupado por" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311 msgid "Tags (empty value deletes tag)" msgstr "Etiquetas (un valor nulo borra la etiqueta)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313 msgid "Members" msgstr "Miembros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 +msgid "Move Up" +msgstr "Mover hacia arriba" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 msgid "Move the currently selected members up" msgstr "Mover los miembro(s) seleccionos hacia arriba" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358 +msgid "Add Selected" +msgstr "Añadir seleccionado" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359 +msgid "Add all currently selected objects as members" +msgstr "Añadir todos los objetos" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365 +msgid "Remove Selected" +msgstr "Eliminar seleccionados" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366 +msgid "Remove all currently selected objects from relation" +msgstr "Eliminar todos los objetos seleccionados de la relación" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 +msgid "Move Down" +msgstr "Mueve hacia abajo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 msgid "Move the currently selected members down" msgstr "Mover los miembros seleccionados hacia abajo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356 -msgid "Add Selected" -msgstr "Añadir seleccionado" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:357 -msgid "Add all currently selected objects as members" -msgstr "Añadir todos los objetos" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:363 -msgid "Remove Selected" -msgstr "Eliminar seleccionados" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:364 -msgid "Remove all currently selected objects from relation" -msgstr "Eliminar todos los objetos seleccionados de la relación" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381 msgid "Remove the member in the current table row from this relation" msgstr "Quitar el miembro en la fila de tabla actual de esta relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394 msgid "Download Members" msgstr "Descargar miembros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:406 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395 msgid "Download all incomplete ways and nodes in relation" msgstr "Descargar todas las vías y nodos incompletos de esta relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:415 -msgid "Basic" -msgstr "Básico" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:453 #, java-format msgid "Members: {0}" msgstr "Miembros: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:587 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:461 +#, java-format +msgid "Relation Editor: {0}" +msgstr "Editor de relación: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:585 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 msgid "There were conflicts during import." msgstr "Existieron conflictos durante la importación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593 msgid "Error parsing server response." msgstr "Error analizando la respuesta del servidor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:600 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:594 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:598 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -1121,9 +1148,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:345 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 msgid "Error" msgstr "Error" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:599 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597 msgid "Cannot connect to server." msgstr "No se puede conectar con el servidor" @@ -1288,5 +1315,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:94 @@ -1296,5 +1323,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 msgid "" @@ -1361,16 +1388,24 @@ msgstr "Selección: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +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:67 +msgid "Delete the selected relation" +msgstr "Borrar la relación seleccionada" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 #: trans_presets.java:2904 msgid "Relations" msgstr "Relaciones" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 msgid "Open a list of all relations." msgstr "Abrir una lista de todas las relaciones." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 @@ -1378,17 +1413,9 @@ msgstr "Nuevo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 msgid "Create a new relation" msgstr "Crear un anueva relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -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:90 -msgid "Delete the selected relation" -msgstr "Borrar la relación seleccionada" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:130 #, java-format msgid "Relations: {0}" @@ -1416,49 +1443,49 @@ msgstr "Pila de comandos: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +msgid "Resolve" +msgstr "Resolver" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +msgid "Open a merge dialog of all selected items in the list above." +msgstr "" +"Abrir una ventana de diálogo de unión para todos los elementos seleccionados " +"en la lista superior." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Conflict" msgstr "Conflicto" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 msgid "Merging conflicts." msgstr "Combinar conflictos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67 -msgid "Resolve" -msgstr "Resolver" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:68 -msgid "Open a merge dialog of all selected items in the list above." -msgstr "" -"Abrir una ventana de diálogo de unión para todos los elementos seleccionados " -"en la lista superior." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:105 -msgid "Please select something from the conflict list." -msgstr "Por favor, selecciona algo de la lista de conflictos." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Resolve Conflicts" msgstr "Resolver conflictos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +msgid "Solve Conflict" +msgstr "Resolver conflicto" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 #, java-format msgid "Conflicts: {0}" msgstr "Conflictos: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Conflicts" msgstr "Conflictos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 msgid "conflict" msgstr "conflicto" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 msgid "background" msgstr "fondo" @@ -1482,5 +1509,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 msgid "Customize Color" @@ -1488,5 +1515,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1496,5 +1523,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1503,5 +1530,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:326 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:152 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -1520,5 +1547,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:265 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 #, java-format msgid "Audio synchronized at point {0}." @@ -1526,5 +1553,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232 msgid "Unable to synchronize in layer being played." msgstr "No se puede sincronizar en la capa que se escuchaba." @@ -1547,5 +1574,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:958 msgid "desc" msgstr "desc" @@ -1557,5 +1584,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 msgid "There was an error while trying to display the URL for this marker" -msgstr "Ha habido un error cuando se intentaba mostrar la URL de este marcador" +msgstr "" +"Ha habido un error cuando se intentaba mostrar la URL de este marcador" #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 @@ -1567,5 +1595,5 @@ msgstr "Error mostrando la URL" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -1575,5 +1603,5 @@ "audio estaba escuchando." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -1583,18 +1611,18 @@ "marcador de audio o a un punto de traza, en donde quiera sincronizar." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224 msgid "Unable to create new audio marker." msgstr "No se ha podido crear un marcador de audio nuevo" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 msgid "Convert to data layer" msgstr "Convertir en capa de datos" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:725 -msgid "" -"Upload of unprocessed GPS data as map data is considered harmful." -"
        If you want to upload traces, look here:" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:645 +msgid "" +"Upload of unprocessed GPS data as map data is considered " +"harmful.
        If you want to upload traces, look here:" msgstr "" "La subida de datos gps sin procesar como datos de mapa se considera " @@ -1602,66 +1630,22 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:646 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces (EN)" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:747 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:448 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:667 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "Converted from: {0}" msgstr "Convertido desde: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612 -msgid "Upload this trace..." -msgstr "Subir esta traza..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:616 -msgid "" -"This functionality has been added only recently. Please
        use with " -"care and check if it works as expected." -msgstr "" -"Esta funcionalidad se ha añadido hace poco. Por favor
        úsela con " -"precaución y verifique si funciona como esperaba." - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:102 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:107 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:626 -msgid "Upload track filtered by JOSM" -msgstr "Subir traza filtrada por JOSM" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:103 -#, java-format -msgid "Upload raw file: {0}" -msgstr "Subir archivo en crudo: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:108 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:627 -msgid "Upload raw file: " -msgstr "Subir archivo en crudo: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640 -msgid "Description:" -msgstr "Descripción:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:123 -msgid "Tags:" -msgstr "Etiquetas:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:129 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:648 -msgid "GPX-Upload" -msgstr "Subir-GPX" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:229 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:217 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113 msgid "gps point" msgstr "punto GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 #: trans_presets.java:1795 trans_presets.java:1801 trans_presets.java:1807 #: trans_presets.java:1813 trans_presets.java:1819 trans_presets.java:1825 @@ -1681,5 +1665,5 @@ msgstr[1] "pistas" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 msgid "point" msgid_plural "points" @@ -1687,5 +1671,5 @@ msgstr[1] "puntos" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 #, java-format msgid "a track with {0} point" @@ -1694,5 +1678,5 @@ msgstr[1] "una traza con {0} puntos" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} consists of {1} track" @@ -1701,5 +1685,5 @@ msgstr[1] "{0} formado por las trazas {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} point" @@ -1708,25 +1692,25 @@ msgstr[1] "{0} puntos" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117 msgid "Customize line drawing" msgstr "Personalice el dibujo de línea" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:296 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 msgid "Use global settings." msgstr "Usar las preferencias globales" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 msgid "Draw lines between points for this layer." msgstr "Dibujar las líneas entre puntos en esta capa" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:298 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123 msgid "Do not draw lines between points for this layer." msgstr "No dibujar las líneas entre puntos en esta capa" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:135 msgid "Select line drawing options" @@ -1760,5 +1744,5 @@ msgstr "Imágenes JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290 #, java-format msgid "{0} track, " @@ -1767,5 +1751,5 @@ msgstr[1] "{0} trazas, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 #, java-format msgid "{0} route, " @@ -1774,5 +1758,5 @@ msgstr[1] "{0} rutas, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 #, java-format msgid "{0} waypoint" @@ -1781,55 +1765,51 @@ msgstr[1] "{0} nodos de vía" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #, java-format msgid "Name: {0}" msgstr "Nombre: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "Description: {0}" msgstr "Descripción: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 msgid "Timespan: " msgstr "Rango de tiempo " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Length: " msgstr "Longitud: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:642 -msgid "Tags (keywords in GPX):" -msgstr "Etiquetas (palabras clave en gpx)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:655 msgid "time" msgstr "tiempo" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:780 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:679 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:700 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 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:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:686 msgid "Download everything within:" msgstr "Descargar todo entre:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 #, java-format msgid "{0} meters" msgstr "{0} metros" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:692 msgid "Maximum area per request:" msgstr "Área máxima por petición:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 #, java-format msgid "{0} sq km" msgstr "{0} km2" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787 #, java-format msgid "" @@ -1837,17 +1817,17 @@ "wish
        to continue?" msgstr "" -"Esta acción requiere {0} peticiones
        individuales de descarga." -"" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 +"Esta acción requiere {0} peticiones
        individuales de " +"descarga." + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:844 #, java-format msgid "Audio markers from {0}" msgstr "Marcadores de audio desde {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 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:1049 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "" "Some waypoints with timestamps from before the start of the track were " @@ -1857,5 +1837,5 @@ "traza se han omitido." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -1938,5 +1918,6 @@ #, java-format msgid "The date in file \"{0}\" could not be parsed." -msgstr "La fecha en el archivo \"{0}\" no pudo ser analizada sintácticamente." +msgstr "" +"La fecha en el archivo \"{0}\" no pudo ser analizada sintácticamente." #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:486 @@ -1966,19 +1947,19 @@ msgstr "La hora no pudo ser analizada sintácticamente." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:140 msgid "outside downloaded area" msgstr "fuera del área descargada" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 #, java-format msgid "{0} consists of:" msgstr "{0} formado por:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:353 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:347 #, java-format msgid " ({0} deleted.)" msgstr " ({0} borrados.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:445 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 msgid "Convert to GPX layer" msgstr "Convertir a capa de gpx" @@ -2006,37 +1987,37 @@ msgstr "No pudieron escribirse los marcadores." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 msgid "The geographic longitude at the mouse pointer." msgstr "La longitud geográfica en el puntero del ratón." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The name of the object at the mouse pointer." msgstr "El nombre del objeto en el puntero del ratón" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 msgid "The geographic latitude at the mouse pointer." msgstr "La latitud geográfica en el puntero del ratón." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The angle between the previous and the current way segment." msgstr "El ángulo entre el segmento actual de vía y el anterior." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The (compass) heading of the line segment being drawn." msgstr "La dirección (brújula) del segmento de línea dibujándose." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The length of the new way segment being drawn." msgstr "La longitud del nuevo segmento de línea dibujándose." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:160 msgid "(no object)" msgstr "(sin objeto)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:62 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:56 msgid "Color" msgstr "Color" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:57 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107 #: trans_presets.java:56 trans_presets.java:92 trans_presets.java:130 @@ -2137,27 +2118,36 @@ msgstr "Nombre" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:118 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:112 #, java-format msgid "Paint style {0}: {1}" msgstr "Estilo de pintura {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 msgid "Choose" msgstr "Seleccionar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 msgid "Please select a color." msgstr "Por favor, selecciona un color." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 #, java-format msgid "Choose a color for {0}" msgstr "Seleccionar un color para {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +msgid "Set to default" +msgstr "Establecer como predeterminado" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:172 +msgid "Set all to default" +msgstr "Establecer todo como predeterminado" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:184 msgid "Colors used by different objects in JOSM." msgstr "Colores usados por diferentes objetos en JOSM" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:171 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:198 msgid "Colors" msgstr "Colores" @@ -2192,7 +2182,7 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45 msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
        The password is transfered in plain text to the server, encoded in the " -"URL.
        Do not use a valuable Password." +"WARNING: The password is stored in plain text in the preferences " +"file.
        The password is transfered in plain text to the server, encoded in " +"the URL.
        Do not use a valuable Password." msgstr "" "ATENCIÓN: La contraseña está almacenada en texto plano en el archivo " @@ -2200,18 +2190,18 @@ "codificada en la URL.
        No usar una contraseña importante." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44 msgid "Sort presets menu" msgstr "Ordenar menú de preajustes" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46 msgid "Enable built-in defaults" msgstr "Activar los valores por defecto internos" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:58 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69 msgid "Tagging preset source" msgstr "Fuente de etiquetas preestablecidas" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:156 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 @@ -2219,5 +2209,5 @@ msgstr "Por favor, seleccione la fila a editar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500 @@ -2226,8 +2216,8 @@ msgstr "Por favor, seleccione la fila a borrar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89 -msgid "" -"The sources (URL or filename) of tagging preset definition files. See http://" -"josm.openstreetmap.de/wiki/TaggingPresets for help." +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88 +msgid "" +"The sources (URL or filename) of tagging preset definition files. See " +"http://josm.openstreetmap.de/wiki/TaggingPresets for help." msgstr "" "Las fuentes (URL o nombres de archivo) de los archivos de parametrización " @@ -2235,18 +2225,18 @@ "para ver ayuda." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89 msgid "Add a new tagging preset source to the list." msgstr "Añadir nueva fuente de etiquetas preestablecidas a la lista." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 msgid "Delete the selected source from the list." msgstr "Borrar la fuente seleccionada de la lista." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:94 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93 msgid "Tagging Presets" msgstr "Etiquetas preestablecidas" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97 msgid "Tagging preset sources" msgstr "Fuentes de etiquetas preestablecidas" @@ -2260,6 +2250,6 @@ msgstr "Al guardar, conserve los archivos de backup que terminen en ~" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:141 @@ -2267,34 +2257,34 @@ msgstr "Extensiones" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 msgid "Configure available plugins." msgstr "Configurar los complementos disponibles." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43 msgid "Download List" msgstr "Descargar lista" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:80 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51 msgid "Update" msgstr "Actualizar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:60 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 msgid "Configure Sites..." msgstr "Configurar sitios ..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add either site-josm.xml or Wiki Pages." msgstr "Añadir site-josm.xml o bien Páginas Wiki" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99 msgid "Please select an entry." msgstr "Por favor seleccione una entrada." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 msgid "Configure Plugin Sites" msgstr "Configurar los sitios de complementos" @@ -2321,13 +2311,13 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81 msgid "Draw rubber-band helper line" -msgstr "" +msgstr "Dibujar línea de ayuda" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35 msgid "Modeless working (Potlatch style)" -msgstr "" +msgstr "Trabajando sin modo (estilo Potlatch)" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85 msgid "Do not require to switch modes (potlatch style workflow)" -msgstr "" +msgstr "No requiere cambiar de modos (flujo de trabajo estilo Potlatch)" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91 @@ -2488,9 +2478,9 @@ msgstr "Calibración grabador de voz" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "Display Settings" msgstr "Opciones de visualización" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "" "Various settings that influence the visual representation of the whole " @@ -2498,55 +2488,65 @@ msgstr "Varios ajustes que manejan la presentación visual del programa." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings" msgstr "Ajustes de la conexión" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings for the OSM server." msgstr "Configuración del servidor OSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Map Settings" msgstr "Ajustes del mapa" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Settings for the map projection and data interpretation." msgstr "Ajustes para la proyección del mapa y la interpretación de datos" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Audio Settings" msgstr "Configuración de audio" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Settings for the audio player and audio markers." msgstr "Configuración del audio player y de los marcadores" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97 msgid "You have to restart JOSM for some settings to take effect." msgstr "Debes reiniciar JOSM para que las preferencias tengan efecto" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:25 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 msgid "Draw lines between raw gps points." msgstr "Dibujar lineas entre puntos obtenidos de los datos en bruto del GPS." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:27 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 msgid "Force lines if no segments imported." msgstr "Forzar lineas si no hay segmentos importados" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:28 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 msgid "Draw large GPS points." msgstr "Dibujar grandes los puntos de gps" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 -msgid "Color tracks by velocity." -msgstr "Colorear las trazas según la velocidad" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34 +msgid "Velocity (red = slow, green = fast)" +msgstr "Velocidad (rojo=lento, verde=rápido)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 +msgid "Dilution of Position (red = high, green = low, if available)" +msgstr "" +"Dispersión de la precisión, o incertidumbre (rojo=alta, verde=baja, si está " +"disponible)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 +msgid "Single Color (can be customized for named layers)" +msgstr "Color único (puede ser personalizado desde las capas nombradas)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:1346 msgid "Car" msgstr "Coche" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:309 trans_presets.java:635 trans_presets.java:833 #: trans_presets.java:842 trans_presets.java:851 trans_presets.java:864 @@ -2558,5 +2558,5 @@ msgstr "Bicicleta" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:310 trans_presets.java:637 trans_presets.java:832 #: trans_presets.java:841 trans_presets.java:850 trans_presets.java:863 @@ -2567,44 +2567,44 @@ msgstr "Pie" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 msgid "Draw Direction Arrows" msgstr "Dibujar las flechas de dirección" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 msgid "Fast drawing (looks uglier)" msgstr "Visualización rápida ( fea )" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180 msgid "Only interesting direction hints (e.g. with oneway tag)." msgstr "Solo marcar direcciones de interés (ej: vías con etiqueta oneway)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:186 msgid "Only on the head of a way." msgstr "Solo en la cabecera de la vía." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44 msgid "Draw segment order numbers" msgstr "Dibujar los números de orden de los segmentos" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45 msgid "Draw boundaries of downloaded data" msgstr "Dibujar los límites de los datos descargados" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46 msgid "Draw virtual nodes in select mode" msgstr "Dibujar nodos virtuales en el modo selección" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47 msgid "Draw inactive layers in other color" msgstr "Dibujar las capas inactivas en otro color" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 msgid "Smooth map graphics (antialiasing)" msgstr "Suavizar los gráficos del mapa (antialias)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 msgid "" "If your gps device draws too few lines, select this to draw lines along your " @@ -2614,5 +2614,5 @@ "líneas a lo largo de la vía" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:71 msgid "" "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines." @@ -2621,9 +2621,9 @@ "dibujarlas todas." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73 msgid "Maximum length (meters)" msgstr "Longitud máxima (en metros)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:77 msgid "" "Force drawing of lines if the imported data contain no line information." @@ -2632,15 +2632,16 @@ "información de la línea." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:84 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89 msgid "Draw direction arrows for lines, connecting GPS points." msgstr "Dibujar flechas de dirección en las líneas que conectan puntos gps." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90 -msgid "Draw the direction arrows using table lookups instead of complex math." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95 +msgid "" +"Draw the direction arrows using table lookups instead of complex math." msgstr "" "Dibujar flechas de dirección usando visualizaciones de tablas en vez de " "matemática compleja" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:96 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:101 msgid "" "Don't draw arrows if they are not at least this distance away from the last " @@ -2649,43 +2650,64 @@ "No dibujar flechas si no están por lo menos a esta distancia de la anterior" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104 msgid "Minimum distance (pixels)" msgstr "Distancia mínima en píxeles" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:109 -msgid "Choose the hue for the track color by the velocity at that point." -msgstr "Elija el tono del color de la traza por velocidad en ese punto" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116 -msgid "Allows to tune the track coloring for different average speeds." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122 msgid "Draw larger dots for the GPS points." msgstr "dibuje grandes los puntos gps" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136 +msgid "" +"All points and track segments will have the same color. Can be customized in " +"Layer Manager." +msgstr "" +"Todos los puntos y segmentos de trazas tendrán el mismo color. Puede ser " +"personalizado en el Gestor de Capas." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137 +msgid "Colors points and track segments by velocity." +msgstr "Colores de puntos y segmentos de trazas según velocidades." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:138 +msgid "" +"Colors points and track segments by dilution of position (HDOP). Your " +"capture device needs to logs that information." +msgstr "" +"Colores de puntos y segmentos de trazas según la dispersion de la precisión " +"(HPOP). Se requiere que su dispositivo de captura registre esa información." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143 +msgid "Allows to tune the track coloring for different average speeds." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148 +msgid "Track and Point Coloring" +msgstr "Coloreado de traza y punto" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 msgid "GPS Points" msgstr "Puntos GPS" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175 msgid "Draw direction hints for way segments." msgstr "Dibujar pistas de dirección para los segmentos de vía" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:163 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192 msgid "Draw the order numbers of all segments within their way." msgstr "Dibujar los números de orden de todos los segmentos de una vía" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:168 -msgid "Apply antialiasing to the map view resulting in a smoother appearance." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:197 +msgid "" +"Apply antialiasing to the map view resulting in a smoother appearance." msgstr "" "Aplicar antialias a la vista del mapa da como resultado una apariencia más " "suave" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202 msgid "Draw the boundaries of data loaded from the server." msgstr "Dibujar los límites de los datos descargados del servidor" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:178 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:207 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" @@ -2693,9 +2715,9 @@ "facilmente" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212 msgid "Draw the inactive data layers in a different color." msgstr "Dibujar las capas inactivas en un color diferente" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219 msgid "OSM Data" msgstr "Datos OSM" @@ -2808,6 +2830,6 @@ "a menu entry of button for the first time. So some of your changes may " "become active even without restart --- but also without collistion handling. " -"This is another reason to restart JOSM after making any changes here." -"

        " +"This is another reason to restart JOSM after making any changes " +"here.

        " msgstr "" "

        Además, los atajos de teclado se activan cuando las acciones se asignan a " @@ -2825,8 +2847,9 @@ "key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also " "there will be 'keys' listed that correspond to a shortcut on your keyboard " -"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/" -"Semicolon on US keyboards, '.'/Period on German keyboards, ...) instead. Not " -"doing so may result in conflicts, as there is no way for JOSM to know that " -"Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...

        " +"(e.g. ':'/Colon). Please also do not use them, use the base key " +"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) " +"instead. Not doing so may result in conflicts, as there is no way for JOSM " +"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US " +"keyboard...

        " msgstr "" "

        Debe saber que la lista de selección de teclas de la siguiente página, " @@ -2867,6 +2890,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183 msgid "" -"

        The pseudo-modifier 'disabled' will disable the shortcut when encountered." -"

        " +"

        The pseudo-modifier 'disabled' will disable the shortcut when " +"encountered.

        " msgstr "" "

        El pseudo modificador \"desactivar\" desactivará el atajo de teclado " @@ -2938,67 +2961,68 @@ msgstr "Grupos de modificadores" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:231 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:236 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:250 msgid "layer not in list." msgstr "capa no listada" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +"No se puede encontrar traducción para el escenario {0}. Revertiendo a {1}." + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "usage" msgstr "uso" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 msgid "options" msgstr "opciones" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 msgid "Show this help" msgstr "Mostrar esta ayuda" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Standard unix geometry argument" msgstr "Argumento de geometría standard de unix" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 msgid "Download the bounding box" msgstr "Bajar el rectángulo límite" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 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:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Open file (as raw gps, if .gpx)" msgstr "Abrir archivo (como gps crudo si es .gpx" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 msgid "Download the bounding box as raw gps" msgstr "Bajar el rectángulo límite como gps crudo" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Select with the given search" msgstr "Seleccionar dentro de la búsqueda" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 msgid "Don't launch in fullscreen mode" msgstr "No inicie el modo pantalla completa" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 msgid "Reset the preferences to default" msgstr "Restablecer las preferencias a los valores por defecto" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 msgid "Set the language." msgstr "Establezca idioma" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 msgid "examples" msgstr "ejemplos" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3008,21 +3032,21 @@ "asegúrese que carga algún dato antes de --seleccionar" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 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:161 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 msgid "Activating updated plugins" msgstr "Activando los complementos actualizados" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 msgid "Loading early plugins" msgstr "Cargando los primeros complementos" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Setting defaults" msgstr "Ajustes por defecto" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171 msgid "Loading plugins" msgstr "Cargando los complementos" @@ -3056,6 +3080,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:108 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:164 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:162 #: trans_presets.java:308 trans_presets.java:309 trans_presets.java:310 #: trans_presets.java:311 trans_presets.java:312 trans_presets.java:313 @@ -3072,5 +3096,5 @@ msgstr "desconocido" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:66 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 #, java-format msgid "" @@ -3081,25 +3105,25 @@ "ya no es necesario." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 #, java-format msgid "Plugin requires JOSM update: {0}." msgstr "El complemento requiere actualizar JOSM: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "El plugin {1} requiere el plugin {0} pero no se ha encontrado" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 #, java-format msgid "Plugin not found: {0}." msgstr "Complemento no encontrado: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "La última actualización del complemento fue hace más de {0} días" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 msgid "" "(You can change the number of days after which this warning appears
        by " @@ -3109,12 +3133,12 @@ "aviso
        cambiando la opción de configuración 'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 msgid "Disable plugin" msgstr "Deshabilitar plugin" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" @@ -3122,5 +3146,5 @@ "No se puede cargar el complemento {0}. ¿Desea borrarlo de las preferencias?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -3130,5 +3154,5 @@ "permiso para escribir sobre los existentes" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 #, java-format msgid "" @@ -3137,10 +3161,10 @@ "Sucedió una excepción imprevista. Pudo ser originada por el plugin \"{0}\"." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "De acuerdo a la información del plugin, el autor es {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:262 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -3149,9 +3173,9 @@ "error." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 msgid "Should the plugin be disabled?" msgstr "¿Se debe deshabilitar el plugin?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:278 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -3161,5 +3185,5 @@ "para descargar el plugin." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -3169,6 +3193,6 @@ "suministradores de JOSM." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:322 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:181 msgid "no description available" msgstr "no hay descripción disponible" @@ -3180,5 +3204,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 msgid "Update Plugins" msgstr "Actualizar complementos" @@ -3217,5 +3241,5 @@ "El complemento {0} parece roto o no se ha podido bajar de forma automática." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 #, java-format msgid "Downloaded plugin information from {0} site" @@ -3224,13 +3248,13 @@ msgstr[1] "Información del complemento descargada de {0} sitios" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 msgid "No plugin information found." msgstr "No se ha encontrado información del complemento." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:76 msgid "All installed plugins are up to date." msgstr "Todos los complementos instalados están actualizados." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 #, java-format msgid "" @@ -3243,9 +3267,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:105 msgid "Download missing plugins" msgstr "Descargar los complementos que faltan" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:106 #, java-format msgid "" @@ -3258,22 +3282,22 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 msgid "Download Plugins" msgstr "Descarga de complementos" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:170 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:168 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Versión {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:176 msgid "Plugin bundled with JOSM" msgstr "Complemento incluido en JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208 msgid "Plugin already exists" msgstr "Ya existe el complemento." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:211 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:209 #, java-format msgid "" @@ -3288,15 +3312,15 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 msgid "Delete and Download" msgstr "Eliminar y descargar" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:222 #, java-format msgid "Error deleting plugin file: {0}" msgstr "Error al borrar el archivo del complemento: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:281 #, java-format msgid "Error reading plugin information file: {0}" @@ -3331,5 +3355,5 @@ #, java-format msgid "Set {0}={1} for {2} ''{3}''" -msgstr "Establecer {0}={1} por {2} ''{3}''" +msgstr "Establecer {0}={1} para {2} ''{3}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 @@ -3351,5 +3375,5 @@ #, java-format msgid "Set {0}={1} for {2} {3}" -msgstr "Establecer {0}={1} por {2} {3}" +msgstr "Establecer {0}={1} para {2} {3}" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 @@ -3363,10 +3387,10 @@ msgstr "Borrar {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:165 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 msgid "Conflicting relation" msgstr "Relación con conclicto" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 #, java-format msgid "" @@ -3378,5 +3402,5 @@ "¿Borrar de la relación?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:166 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 #, java-format msgid "" @@ -3393,7 +3417,7 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:349 msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
        This can cause problems because other objects (that you don't see) might " -"use them.
        Do you really want to delete?" +"You are about to delete nodes outside of the area you have " +"downloaded.
        This can cause problems because other objects (that you don't " +"see) might use them.
        Do you really want to delete?" msgstr "" "Está a punto de borrar nodos fuera del área que a bajado.
        Esto puede " @@ -3429,5 +3453,5 @@ #, java-format msgid "Malformed config file at lines {0}" -msgstr "" +msgstr "Archivo de configurar malformado en lineas {0}" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:315 @@ -3526,124 +3550,135 @@ msgstr "No se han podido cargar las preferencias desd el servidor." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:232 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "Área sin cerrar." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:426 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:428 #, 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:527 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:765 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:776 msgid "Empty member in relation." msgstr "Miembro vacío en la relación." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:767 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:531 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Borrado miembro ''{0}'' en la relación." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:547 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "La vía ''{0}'' con menos de dos puntos." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:552 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:549 msgid "More than one \"from\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:558 +msgstr "Encontrado más de un \"desde\" en la vía." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555 msgid "More than one \"to\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +msgstr "Encontrado más de un \"hacia\" en la vía." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:561 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 +msgid "More than one \"via\" found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 #, java-format msgid "Unknown role ''{0}''." msgstr "Rol desconocido ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Tipo desconocido para el miembro \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 msgid "No \"from\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 +msgstr "Ningún \"desde\" encontrado en la vía." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 msgid "No \"to\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -msgid "No \"via\" node found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598 +msgstr "Ningún \"hacia\" encontrado en la vía." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +msgid "No \"via\" node or way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:636 -#, java-format -msgid "The \"{0}\" way must contain at least 2 nodes." -msgstr "La vía \"{0}\" debe contener al menos dos nodos." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:731 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +msgid "The \"to\" way doesn't start or end at a \"via\" node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:620 +msgid "The \"from\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:624 +msgid "The \"to\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:742 #, java-format msgid "Style for restriction {0} not found." msgstr "Stilo para la restricción {0} no encontrado." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 #, 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:847 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:858 #, 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:927 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 #, 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:938 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:949 #, 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:987 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:998 #, 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:1012 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1023 #, 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:1195 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1206 msgid "untagged" msgstr "sin etiquetas" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1196 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207 msgid "text" msgstr "texto" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" msgstr "inactivo" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:94 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:181 @@ -3651,15 +3686,15 @@ msgstr "seleccionado" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" msgstr "vía sin etiquetar" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 msgid "incomplete way" msgstr "vía incompleta" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 msgid "highlight" -msgstr "" +msgstr "resaltar" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -3679,5 +3714,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:113 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:89 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:77 msgid "incomplete" @@ -3707,14 +3742,14 @@ msgstr[1] "(miembros {0})" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 msgid "Duplicate" msgstr "Duplicar" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 msgid "Duplicate selection by copy and immediate paste." msgstr "Duplicar la selección por copiar y pegar de inmediato." -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 @@ -3723,5 +3758,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -3792,7 +3827,9 @@ msgstr "Mostrar la informacion de historial de las vías y nodos de OSM" -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:57 -msgid "Please select at least one node, way or relation." -msgstr "Por favor seleccione al menos un nodo, vía o relación." +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:60 +msgid "" +"Please select at least one node, way or relation. Only already uploaded " +"elements have a history." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 @@ -3814,7 +3851,7 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/TerracerAction.java:47 @@ -3951,5 +3988,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:123 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:314 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:315 msgid "Enter values for all conflicts." msgstr "Introduzca valores para todos los conflictos." @@ -3957,5 +3994,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 msgid "Solve Conflicts" msgstr "Resolver conflictos" @@ -4091,5 +4128,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #, java-format @@ -4116,17 +4153,19 @@ msgstr[1] "Los nodos seleccionados no están en medio de ninguna vía" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125 -msgid "" -"There is more than one way using the node(s) you selected. Please select the " +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 +msgid "" +"There is more than one way using the node you selected. Please select the " "way also." -msgstr "" -"Hay más de una vía usando el/los nodo/s que ha seleccionado. Por favor " -"seleccione la vía también." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133 +msgid_plural "" +"There is more than one way using the nodes you selected. Please select the " +"way also." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137 msgid "The selected nodes do not share the same way." msgstr "Los nodos seleccionados no comparten la misma vía." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -4134,10 +4173,10 @@ msgstr[1] "La vía seleccionada no contiene todos los nodos seleccionados." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229 msgid "You must select two or more nodes to split a circular way." msgstr "Debe seleccionardos o más nodos para separar una vía circular" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -4147,5 +4186,5 @@ "de la mitad de la vía)." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 msgid "" "A role based relation membership was copied to all new ways.\n" @@ -4156,5 +4195,5 @@ "Debe verificar esto y corregirlo donde sea necesario." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:296 #, java-format msgid "Split way {0} into {1} parts" @@ -4470,4 +4509,6 @@ msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" +"Usar \" para operadores de comillas (por ejemplo si la clave contiene " +":)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 @@ -4546,5 +4587,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 msgid "Align Nodes in Circle" msgstr "Alinear nodos en círculo" @@ -4558,5 +4599,5 @@ msgstr "Algunos nodos están (casi) en la línea" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 msgid "Please select at least four nodes." msgstr "Por favor, selecciona al menos cuatro nodos." @@ -4625,4 +4666,32 @@ msgstr "Ocurrió un error al restaurar el archivo de salvaguarda." +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "Mostrar Informe de estado" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "" +"Show status report with useful information that can be attached to bugs" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "Ayuda: : {0}" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92 +msgid "Status Report" +msgstr "Informe de estado" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +msgid "Copy to clipboard and close" +msgstr "Copiar al portapapeles y cerrar" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 +msgid "Close" +msgstr "Cerrar" + #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 @@ -4634,13 +4703,13 @@ msgstr "Restaurar la última acción deshecha" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:44 msgid "Delete Mode" msgstr "Modo de borrado" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:46 msgid "Delete nodes or ways." msgstr "Eliminar nodos o vías" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:84 @@ -4651,5 +4720,5 @@ msgstr "Modo: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:130 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -4662,6 +4731,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:87 msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." +"Drag play head and release near track to play audio from there; " +"SHIFT+release to synchronize audio at that point." msgstr "" @@ -4675,24 +4744,24 @@ msgstr "Crear áreas" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 msgid "Extrude Way" msgstr "Extruir vía" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:252 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:416 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:430 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Soltar el botón del ratón para seleccionar objetos en el rectángulo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 msgid "Draw a rectangle of the desired size, then release the mouse button." msgstr "" "Dibujar un rectángulo del tamaño deseado, después soltar el botón del ratón." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:420 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:434 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/ExtrudeAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 msgid "Drag a way segment to make a rectangle." msgstr "Arrastre el segmento de la vía para hacer un rectángulo." @@ -4760,14 +4829,14 @@ msgstr "Seleccionar, mover y rotar objetos" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:191 msgid "Add and move a virtual new node to way" msgstr "Añadir y mover un nuevo nodo virtual a la vía" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:220 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:223 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 msgid "Cannot move objects outside of the world." msgstr "Imposible mover objetos fuera del mundo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:418 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:432 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -4776,5 +4845,5 @@ "más cercano." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:422 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:436 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to remove); Shift-" @@ -4817,5 +4886,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 msgid "Merge nodes into the oldest one." -msgstr "Unir nodos en el mas antiguo." +msgstr "Unir nodos en el más antiguo." #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:73 @@ -4849,10 +4918,10 @@ msgstr "Unir {0} nodos" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Orthogonalize Shape" msgstr "Ortogonalizar forma" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "" @@ -4860,21 +4929,21 @@ "grados." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 msgid "Only two nodes allowed" msgstr "Solo se permiten dos nodos" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 msgid "Selection must consist only of ways." msgstr "La selección debe consistir solo en vías." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 msgid "Please select one or more closed ways of at least four nodes." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:90 +msgstr "Por favor, seleccione una o más vías de al menos cuatro nodos." + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 msgid "Please select ways with almost right angles to orthogonalize." msgstr "Por favor seleccione vías de ángulos casi rectos para ortogonalizar." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 msgid "" "You are using the EPSG:4326 projection which might lead
        to " @@ -4886,9 +4955,9 @@ "evitar este aviso.
        Desea continuar?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "Only one node selected" msgstr "Solo hay un nodo seleccionado" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 msgid "Orthogonalize" msgstr "Ortogonalizar" @@ -4939,5 +5008,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101 -msgid "Please select exactly three nodes or one way with exactly three nodes." +msgid "" +"Please select exactly three nodes or one way with exactly three nodes." msgstr "" "Por favor, elija exactamente tres nodos o una vía con exactamente tres nodos." @@ -4947,52 +5017,69 @@ msgstr "Esos nodos no están en un círculo." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../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:71 +msgid "Update Data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:72 +#, java-format +msgid "" +"This action will require {0} individual download requests. Do you wish to " +"continue?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 msgid "Open Location..." msgstr "Abrir dirección..." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 msgid "Open an URL." msgstr "Abrir una URL" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 msgid "Separate Layer" msgstr "Separar capa" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 msgid "Enter URL to download:" msgstr "Introduzca URL de donde descargar" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 msgid "Download Location" msgstr "Descargar ubicación" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 msgid "Download URL" msgstr "URL de descarga" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 msgid "Add Node..." msgstr "Añadir nodo..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 msgid "Add a node by entering latitude and longitude." msgstr "Añadir nodo definiendo latitud y longitud." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 msgid "Enter the coordinates for the new node." msgstr "Introduzca las coordenadas para el nuevo nodo." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 msgid "Use decimal degrees." msgstr "Usar grados decimales." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 msgid "Negative values denote Western/Southern hemisphere." msgstr "Valores negativos denotan hemisferio Oeste/Sur" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 #: ../plugins/livegps/livegps/LiveGpsDialog.java:54 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93 @@ -5001,5 +5088,5 @@ msgstr "Latitud" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 #: ../plugins/livegps/livegps/LiveGpsDialog.java:56 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96 @@ -5042,14 +5129,14 @@ msgstr "Mover objetos {0}" +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "Overwrite" msgstr "Sobrescribir" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "File exists. Overwrite?" msgstr "El archivo existe. ¿Sobreescribir?" @@ -5068,52 +5155,57 @@ msgstr "Por favor, seleccione algo que copiar." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Despegar vías" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "Duplicar nodos usados por varias vías." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 msgid "This node is not glued to anything else." msgstr "Este nodo no está pegado a ninguna otra cosa." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 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:90 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 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:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 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:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "Select either:" msgstr "Selecione alguno:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +msgid "* One tagged node, or" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "* One node that is used by more than one way, or" msgstr "* Un nodo que este usado por más de una vía, o" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 -msgid "* One node that is used by more than one way and one of those ways, or" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +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:104 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "" "* One way that has one or more nodes that are used by more than one way, or" msgstr "* Una vía que tiene un nodo o más usado por más de una vía, o" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 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:107 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -5123,10 +5215,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:160 +msgid "Unglued Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:373 #, java-format msgid "Dupe into {0} nodes" msgstr "Duplicado dentro de {0} nodos" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:320 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:397 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -5229,5 +5325,5 @@ msgstr "Deshacer la última acción" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 msgid "No Shortcut" msgstr "Sin acceso directo" @@ -5249,13 +5345,13 @@ msgstr "Datos OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:29 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:28 msgid "Downloading GPS data" msgstr "Descargando datos GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:41 msgid "Downloaded GPX Data" msgstr "Datos GPS descargardos" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:71 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:69 msgid "Raw GPS data" msgstr "Datos GPS en bruto" @@ -5487,5 +5583,6 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169 -msgid "Header contains several values and cannot be mapped to a single string" +msgid "" +"Header contains several values and cannot be mapped to a single string" msgstr "" @@ -5555,5 +5652,5 @@ msgstr "" "El área visible es demasiado pequeña o demasiado grande para descargar los " -"datos desde OpenStreetBugs" +"datos de OpenStreetBugs" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 @@ -5841,5 +5938,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69 -msgid "Maximum number of segments allowed in each generated way. Default 250." +msgid "" +"Maximum number of segments allowed in each generated way. Default 250." msgstr "" "Máximo numero de segmentos permitidos en cada vía generada. Por Defecto 250." @@ -5863,6 +5961,7 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72 msgid "" -"Accuracy of Douglas-Peucker line simplification, measured in degrees." -"
        Lower values give more nodes, and more accurate lines. Default 0.0003." +"Accuracy of Douglas-Peucker line simplification, measured in " +"degrees.
        Lower values give more nodes, and more accurate lines. Default " +"0.0003." msgstr "" "Precisión en la simplificación de linea Douglas-Peucker, medido en grados. " @@ -6520,6 +6619,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:509 msgid "" -"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." -"org/index.php/User:JLS/speller) or tag checking data files." +"The sources (URL or filename) of spell check (see " +"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking " +"data files." msgstr "" "Los archivos de datos de las fuentes (URL o nombre de archivo) del corrector " @@ -6940,6 +7040,6 @@ msgstr "" "No se puede cargar la biblioteca rxtxSerial. Si usted necesita ayuda para " -"instalarla inténtelo en la página web GlobalSat : http://www.raphael-mack.de/" -"josm-globalsat-gpx-import-plugin/" +"instalarla inténtelo en la página web GlobalSat : http://www.raphael-" +"mack.de/josm-globalsat-gpx-import-plugin/" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 @@ -6986,6 +7086,6 @@ msgstr "Añadir nueva capa" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:40 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:43 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 #, java-format @@ -6993,18 +7093,29 @@ msgstr "Descargando {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:51 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:55 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 msgid "Contacting WMS Server..." msgstr "Contactando con servidor WMS..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157 msgid "Create buildings" msgstr "Crear edificios" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 msgid "CadastreGrabber: Illegal url." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +msgid "" +"To avoid cadastre WMS overload,\n" +"building import size is limited to 1 km2 max." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" @@ -7027,17 +7138,26 @@ msgstr "Catastro: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:128 +msgid "Cadastre" +msgstr "Catastro" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:139 +msgid "Auto sourcing" +msgstr "Digitalización automática" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164 +msgid "Invalid projection" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 +#, java-format +msgid "Change the projection to {0} first." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:169 msgid "" "To enable the cadastre WMS plugin, change\n" "the JOSM projection to Lambert and restart" msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132 -msgid "Cadastre" -msgstr "Catastro" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 -msgid "Auto sourcing" -msgstr "Digitalización automática" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20 @@ -7109,6 +7229,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:43 msgid "" -"More than one WMS layer present.\n" -"Select one of them first, then retry." +"More than one WMS layer present\n" +"Select one of them first, then retry" msgstr "" @@ -7117,5 +7237,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136 #, java-format @@ -7125,13 +7245,13 @@ msgstr[1] "Vía simplificada (eliminados {0} nodos)" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61 msgid "Extract SVG ViewBox..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65 msgid "Extract best fitting boundary..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:120 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126 msgid "Create boundary" msgstr "Crear frontera" @@ -7167,15 +7287,15 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 msgid "Save WMS layer to file" msgstr "Guardar capa WMS como archivo" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "Load WMS layer from file" msgstr "Cargar capa WMS desde archivo" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -7183,5 +7303,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 msgid "File Format Error" msgstr "Error en el formato del archivo" @@ -7189,5 +7309,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 msgid "Error loading file" msgstr "Error al leer el archivo" @@ -7213,52 +7333,53 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 msgid "Replace original background by JOSM background color." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30 msgid "Reverse grey colors (for black backgrounds)." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 msgid "Set background transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34 msgid "Draw boundaries of downloaded data." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Enable automatic caching." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 msgid "Max. cache size (in MB)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:53 -msgid "" -"A special handler of the french cadastre wms at www.cadastre.gouv." -"fr

        Please read the Terms and Conditions of Use here (in french): " -"
        http://www.cadastre.gouv.fr/scpc/html/" -"CU_01_ConditionsGenerales_fr.html
        before any upload of data created " -"by this plugin." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:58 +msgstr "Tamaño máximo de caché (en MB)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:55 +msgid "" +"A special handler of the french cadastre wms at " +"www.cadastre.gouv.fr

        Please read the Terms and Conditions of Use here " +"(in french):
        " +"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " +"
        before any upload of data created by this plugin." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65 msgid "Source" msgstr "Fuente" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -7266,28 +7387,44 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 -msgid "" -"Invert the original texts from black to white (and all intermediate greys)." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +msgid "" +"Invert the original black and white colors (and all intermediate greys). " +"Useful for texts on dark backgrounds." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Allows multiple layers stacking" msgstr "Permitir múltiples capas apiladas" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:99 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:113 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 msgid "Image grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:162 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:125 +msgid "Grab smaller images (higher quality but use more memory)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +msgid "Fixed size square (default is 100m)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +msgid "Fixed size (from 25 to 1000 meters)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" +"Los archivos más antiguos serán borrados automáticamente cuando excedan del " +"tamaño" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 @@ -7397,5 +7534,5 @@ msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:254 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:255 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -7542,11 +7679,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:203 msgid "" -"Take a photo of your GPS receiver while it displays the time." -"
        Display that photo here.
        And then, simply capture the time you read " -"on the photo and select a timezone

        " -msgstr "" -"Tome una foto de su receptor GPS mientras muestra la hora exacta." -"
        Exponga esa foto aquí.
        Y luego, simplemente tome la hora que usted " -"lee en la foto y seleccione una zona horaria
        " +"Take a photo of your GPS receiver while it displays the " +"time.
        Display that photo here.
        And then, simply capture the time you " +"read on the photo and select a timezone
        " +msgstr "" +"Tome una foto de su receptor GPS mientras muestra la hora " +"exacta.
        Exponga esa foto aquí.
        Y luego, simplemente tome la hora que " +"usted lee en la foto y seleccione una zona horaria
        " #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:221 @@ -7612,8 +7749,9 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:484 -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?" +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?" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:501 @@ -7658,5 +7796,5 @@ msgstr "Zona horaria no válida" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #, java-format msgid "" @@ -7665,14 +7803,14 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:579 msgid "Invalid offset" msgstr "Desplazamiento inválido" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:641 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:643 #, java-format msgid "Found {0} matchs of {1} in GPX track {2}" msgstr "Encontradas {0} coincidencias de {1} en la traza GPX {2}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:642 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:644 msgid "GPX Track loaded" msgstr "Traza GPX cargada" @@ -7680,5 +7818,5 @@ #: ../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/UploadDataGui.java:79 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 msgid "Upload Traces" msgstr "Subir trazas" @@ -7688,58 +7826,72 @@ msgstr "Trazas subidas a openstreetmap.org" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 -msgid "Upload GPX track" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71 +msgid "Upload Trace" +msgstr "Subir traza" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Public" msgstr "Público" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 msgid "Selected makes your trace public in openstreetmap.org" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Description" msgstr "Descripción" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:123 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 msgid "Tags" msgstr "Etiquetas" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:182 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:153 +#, java-format +msgid "Selected track: {0}" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:176 msgid "Connecting..." msgstr "Conectando..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 -msgid "Uploading GPX track..." -msgstr "Subiendo traza GPX" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:214 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:199 +msgid "Upload cancelled" +msgstr "Subida cancelada" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:209 +msgid "Error while uploading" +msgstr "Error al actualizar" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "GPX subido correctamente" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:227 -msgid "Error while uploading" -msgstr "Error al actualizar" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:235 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +msgid "Upload failed. Server returned the following message: " +msgstr "Subida fallida. El servidor retorna el siguiente mensaje " + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 +#, java-format +msgid "Uploading GPX track: {0}% ({1} of {2})" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:252 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "No hay ninguna capa gpx seleccionada. No se puede subir la traza." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:241 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "Ningún nombre de usuario facilitado." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:244 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "Ninguna contraseña facilitada." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "Subiendo traza GPX" @@ -7927,6 +8079,6 @@ msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "" -"Modificar la lista de servidores WMS mostrados en el menú del componente " -"WMS \n" +"Modificar la lista de servidores WMS mostrados en el menú del componente WMS " +"\n" "(seleccionar de la lista inferior de servidores posibles y pulsar botón " "\"añadir\" \n" @@ -7967,15 +8119,15 @@ msgstr "Descarga automática" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "Capa WMS ({0}) descargándose automáticamente en el zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Capa WMS ({0}), descargando en zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -7984,17 +8136,17 @@ "o cambe la resolución" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:232 msgid "Download visible tiles" msgstr "Descargar las teselas visibles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241 msgid "Change resolution" msgstr "Cambiar resolución" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:253 msgid "Reload erroneous tiles" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:264 +msgstr "Recargar teselas erróneas" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:271 msgid "Alpha channel" msgstr "Canal alfa" @@ -8053,5 +8205,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:197 msgid "Grid rotation" -msgstr "Rotación de la malla" +msgstr "Rotación de la rejilla" #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -8283,5 +8435,5 @@ #: trans_style.java:1196 trans_style.java:1204 msgid "aerialway" -msgstr "" +msgstr "pista de rodadura" #: trans_style.java:1214 @@ -8329,5 +8481,5 @@ #: trans_style.java:1493 msgid "marina" -msgstr "" +msgstr "puerto deportivo" #: trans_style.java:1575 trans_style.java:1583 trans_style.java:1591 @@ -8916,5 +9068,5 @@ #: trans_presets.java:1287 trans_presets.java:1463 trans_presets.java:1504 msgid "Width (meters)" -msgstr "" +msgstr "Anchura (metros)" #: trans_presets.java:217 @@ -8974,13 +9126,13 @@ #: trans_presets.java:257 msgid "Serviceway type" -msgstr "" +msgstr "Tipo de vía de servicio" #: trans_presets.java:257 msgid "alley" -msgstr "" +msgstr "callejón" #: trans_presets.java:257 msgid "driveway" -msgstr "" +msgstr "pista de rodadura" #: trans_presets.java:257 @@ -9426,5 +9578,5 @@ #: trans_presets.java:754 msgid "Pedestrian crossing type" -msgstr "" +msgstr "Tipo de cruce peatonal" #: trans_presets.java:754 trans_presets.java:769 trans_presets.java:1309 @@ -9454,9 +9606,9 @@ #: trans_presets.java:757 trans_presets.java:772 trans_presets.java:1312 msgid "Crossing attendant" -msgstr "" +msgstr "Guarda cruces" #: trans_presets.java:758 msgid "Crossing type name (UK)" -msgstr "" +msgstr "Tipo de nombre de cruce (Reino Unido)" #: trans_presets.java:758 trans_presets.java:773 @@ -9498,5 +9650,5 @@ #: trans_presets.java:773 msgid "Type name (UK)" -msgstr "" +msgstr "Tupo de nombre (Reino Unido)" #: trans_presets.java:775 @@ -10607,5 +10759,5 @@ #: trans_presets.java:1662 trans_presets.java:2307 msgid "Shelter" -msgstr "refugio" +msgstr "Refugio" #: trans_presets.java:1663 @@ -11610,9 +11762,9 @@ #: trans_presets.java:2137 msgid "Address Interpolation" -msgstr "Interpolación de direcciones" +msgstr "Direcciones interpoladas" #: trans_presets.java:2140 msgid "Edit address interpolation" -msgstr "Editar interpolación de direcciones" +msgstr "Editar direcciones interpoladas" #: trans_presets.java:2142 @@ -12142,5 +12294,5 @@ #: trans_presets.java:2406 msgid "Edit Hifi Shop" -msgstr "" +msgstr "Editar Tienda Hifi" #: trans_presets.java:2410 @@ -12250,5 +12402,5 @@ #: trans_presets.java:2481 msgid "optician" -msgstr "óptica" +msgstr "Óptica" #: trans_presets.java:2482 @@ -12869,5 +13021,5 @@ #: trans_presets.java:2930 msgid "via node or way" -msgstr "" +msgstr "a través de nodo o vía" #: trans_presets.java:2931 @@ -12875,7 +13027,11 @@ msgstr "a la vía" +#, java-format #~ msgid "Error while exporting {0}" #~ msgstr "Error mientras se exportaba {0}" +#~ msgid "Please select something from the conflict list." +#~ msgstr "Por favor, selecciona algo de la lista de conflictos." + #~ msgid "OSM History Information" #~ msgstr "Información histórica OSM" @@ -12884,4 +13040,5 @@ #~ msgstr "Buscar..." +#, java-format #~ msgid " ({0} node)" #~ msgid_plural " ({0} nodes)" @@ -12895,8 +13052,8 @@ #~ msgid "" -#~ "This is the basic relation editor which allows you to change the " -#~ "relation's tags as well as the members. In addition to this we should " -#~ "have a smart editor that detects the type of relationship and limits your " -#~ "choices in a sensible way." +#~ "This is the basic relation editor which allows you to change the relation's " +#~ "tags as well as the members. In addition to this we should have a smart " +#~ "editor that detects the type of relationship and limits your choices in a " +#~ "sensible way." #~ msgstr "" #~ "Este editor básico de relaciones le permite cambiar tanto etiquetas de " @@ -12911,4 +13068,39 @@ #~ msgstr "Selección: %d vía(s) y %d nodo(s)" +#~ msgid "Upload this trace..." +#~ msgstr "Subir esta traza..." + +#~ msgid "" +#~ "This functionality has been added only recently. Please
        use with " +#~ "care and check if it works as expected." +#~ msgstr "" +#~ "Esta funcionalidad se ha añadido hace poco. Por favor
        úsela con " +#~ "precaución y verifique si funciona como esperaba." + +#~ msgid "Upload track filtered by JOSM" +#~ msgstr "Subir traza filtrada por JOSM" + +#~ msgid "Upload raw file: " +#~ msgstr "Subir archivo en crudo: " + +#~ msgid "Description:" +#~ msgstr "Descripción:" + +#~ msgid "Tags (keywords in GPX):" +#~ msgstr "Etiquetas (palabras clave en gpx)" + +#~ msgid "GPX-Upload" +#~ msgstr "Subir-GPX" + +#, java-format +#~ msgid "Upload raw file: {0}" +#~ msgstr "Subir archivo en crudo: {0}" + +#~ msgid "Tags:" +#~ msgstr "Etiquetas:" + +#~ msgid "Choose the hue for the track color by the velocity at that point." +#~ msgstr "Elija el tono del color de la traza por velocidad en ese punto" + #~ msgid "Unknown type" #~ msgstr "Tipo desconocido" @@ -12917,7 +13109,9 @@ #~ msgstr "NullPointerException, Posiblemente faltan algunas etiquetas." +#, java-format #~ msgid "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..." #~ msgstr "Subiendo {0} {1} (id: {2}) {3}% {4}/{5} (quedan {6})..." +#, java-format #~ msgid "" #~ "Please report a ticket at {0}
        Include your steps to get to the " @@ -12925,7 +13119,7 @@ #~ "information:" #~ msgstr "" -#~ "Por favor, informe del problema en {0}
        Incluya los pasos " -#~ "realizados hasta obtener el error (tan detallados como sea posible)" -#~ "
        Asegúrese de incluir la siguiente información:" +#~ "Por favor, informe del problema en {0}
        Incluya los pasos realizados " +#~ "hasta obtener el error (tan detallados como sea posible)
        Asegúrese de " +#~ "incluir la siguiente información:" #~ msgid "Highway Exit" @@ -12950,4 +13144,5 @@ #~ msgstr "Natural" +#, java-format #~ msgid "Version: {0}
        Last change at {1}" #~ msgstr "Version: {0}
        último cambio {1}" @@ -12965,4 +13160,5 @@ #~ msgstr "Componente Surveyor" +#, java-format #~ msgid "Version {0} - Last change at {1}" #~ msgstr "Versión {0} - Último cambio el {1}" @@ -12974,7 +13170,4 @@ #~ msgstr "Vías con nombres iguales." -#~ msgid "Untagged nodes." -#~ msgstr "Nodos sin etiquetar" - #~ msgid "Open waypoints file" #~ msgstr "Abrir archivo de nodos de vía" @@ -12983,7 +13176,9 @@ #~ msgstr "Abrir un archivo de waypoints." +#, java-format #~ msgid "Data error: lat value \"{0}\" is out of bounds." #~ msgstr "Error en los datos: el valor lat \"{0} esta fuera del límite" +#, java-format #~ msgid "Data error: lon value \"{0}\" is out of bounds." #~ msgstr "Error en los datos: el valor lon \"{0} esta fuera del límite" @@ -12993,35 +13188,34 @@ #~ msgid "" -#~ "Fulltext search:
        • Baker Street - 'Baker' and 'Street' " -#~ "in any key or name.
        • \"Baker Street\" - 'Baker Street' in " -#~ "any key or name.
        • name:Bak - 'Bak' anywhere in the name.
        • -name:Bak - not 'Bak' in the name.
        • foot: - " -#~ "key=foot set to any value.
        • Special targets:
        • type: " -#~ "- type of the object (node, way, relation)
        • user:... - all objects changed by user
        • id:... - object with given ID
        • nodes:... - object with given " -#~ "number of nodes
        • modified - all changed objects
        • selected - all selected objects
        • incomplete - " -#~ "all incomplete objects
        • Use | or OR to combine with " -#~ "logical or
        • Use \" to quote operators (e.g. if key " -#~ "contains :)
        • Use ( and ) to group expressions
          • " +#~ "Fulltext search:
          • Baker Street - 'Baker' and 'Street' in " +#~ "any key or name.
          • \"Baker Street\" - 'Baker Street' in any key " +#~ "or name.
          • name:Bak - 'Bak' anywhere in the name.
          • -" +#~ "name:Bak - not 'Bak' in the name.
          • foot: - key=foot set to " +#~ "any value.
          • Special targets:
          • type: - type of the " +#~ "object (node, way, relation)
          • user:... - " +#~ "all objects changed by user
          • id:... - object with given " +#~ "ID
          • nodes:... - object with given number of " +#~ "nodes
          • modified - all changed objects
          • selected -" +#~ " all selected objects
          • incomplete - all incomplete " +#~ "objects
          • Use | or OR to combine with logical " +#~ "or
          • Use \" to quote operators (e.g. if key contains " +#~ ":)
          • Use ( and ) to group expressions
          " #~ msgstr "" -#~ "Buscar texto completo:
          • Calle Mayor - 'Calle' y " -#~ "'Mayor' en cualquier etiqueta o nombre.
          • \"Calle Mayor\" - " -#~ "'Calle Mayor' en cualquier etiqueta o nombre.
          • name:May - " -#~ "'May' en cualquier parte del nombre.
          • -name:May - sin 'May' " -#~ "en el nombre.
          • foot: - key=foot existente en cualquier " +#~ "Buscar texto completo:
            • Calle Mayor - 'Calle' y 'Mayor' " +#~ "en cualquier etiqueta o nombre.
            • \"Calle Mayor\" - 'Calle " +#~ "Mayor' en cualquier etiqueta o nombre.
            • name:May - 'May' en " +#~ "cualquier parte del nombre.
            • -name:May - sin 'May' en el " +#~ "nombre.
            • foot: - key=foot existente en cualquier " #~ "valor.
            • Búsquedas especiales:
            • type: - tipología de " #~ "objeto (, way, relation)
            • user:... - " -#~ "todos los objetos modificados por un usuario
            • id:... - " -#~ "objeto con el identificador dado
            • nodes:... - objeto con un " -#~ "número dado de nodos
            • modified - todos los objetos que han " -#~ "sido modificados
            • selected - todos los objetos " -#~ "seleccionados
            • incomplete - todos los objetos incompletos
            • Usar | o OR para combinar con operadores lógicos o
            • Usar \" para operadores comillas (por ejemplo si contiene :)" -#~ "
            • Usar ( y ) para agrupar expresiones
            " +#~ "todos los objetos modificados por un usuario
          • id:... - objeto " +#~ "con el identificador dado
          • nodes:... - objeto con un número " +#~ "dado de nodos
          • modified - todos los objetos que han sido " +#~ "modificados
          • selected - todos los objetos " +#~ "seleccionados
          • incomplete - todos los objetos " +#~ "incompletos
          • Usar | o OR para combinar con operadores " +#~ "lógicos o
          • Usar \" para operadores comillas (por ejemplo si " +#~ "contiene :)
          • Usar ( y ) para agrupar " +#~ "expresiones
          " #~ msgid "Add Node" Index: /applications/editors/josm/i18n/po/fi.po =================================================================== --- /applications/editors/josm/i18n/po/fi.po (revision 13832) +++ /applications/editors/josm/i18n/po/fi.po (revision 13833) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-15 22:03+0100\n" -"PO-Revision-Date: 2009-02-10 15:47+0000\n" -"Last-Translator: osy \n" +"POT-Creation-Date: 2009-02-21 16:35+0100\n" +"PO-Revision-Date: 2009-02-21 18:59+0000\n" +"Last-Translator: Teemu Koskinen \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-02-15 20:40+0000\n" +"X-Launchpad-Export-Date: 2009-02-22 20:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 #, java-format msgid "" @@ -30,13 +30,13 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 msgid "" "This action will have no shortcut.\n" "\n" msgstr "" -"Toiminnolle ei ole asetettua pikanäppäintä.\n" +"Toiminnolle ei ole asetettu pikanäppäintä.\n" "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -47,5 +47,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Vihje: Voit muokata pikanäppäimiä asetuksista.)" @@ -56,17 +56,17 @@ #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 msgid "Information" msgstr "Tiedot" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Do nothing" msgstr "Älä tee mitään" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Report Bug" msgstr "Ilmoita ohjelmavirheestä" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 msgid "" "An unexpected exception occurred.\n" @@ -80,14 +80,14 @@ "JOSM:n versiota, ilmoita ohjelmavirheestä." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Unexpected Exception" msgstr "Odottamaton poikkeus" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 #, java-format msgid "Please report a ticket at {0}" -msgstr "Ole hyvä, ja täytä vikaraportti osoitteessa {0}" - -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 +msgstr "Tee virheilmoitus osoitteessa {0}" + +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" @@ -95,5 +95,5 @@ "virhetilanteeseen." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:78 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -103,9 +103,9 @@ "kirjoittamista." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Be sure to include the following information:" msgstr "Varmista, että ilmoituksesa on ainakin seuraavat tiedot:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75 msgid "(The text has already been copied to your clipboard.)" msgstr "(Teksti on jo kopioitu leikepöydälle)" @@ -119,5 +119,5 @@ msgstr "Virhe äänentoistossa" -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:94 @@ -125,18 +125,18 @@ msgstr "Yhdistetään OSM-palvelimeen..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:48 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:32 msgid "Downloading OSM data..." -msgstr "Ladataan OSM-dataa..." - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +msgstr "Ladataan OSM-karttatietoja..." + +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 msgid "NullPointerException, possibly some missing tags." -msgstr "Null-osoitin-poikkeus, mahdollisesti puuttuvia tageja." - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99 +msgstr "Null-osoitinpoikkeus, mahdollisesti puuttuvia tageja." + +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83 msgid "Preparing data..." -msgstr "Valmistellaan dataa..." +msgstr "Valmistellaan karttatietoja..." #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 @@ -147,5 +147,5 @@ msgid "" "Couldn't connect to the osm server. Please check your internet connection." -msgstr "Ei pystytty yhdistämään osm palvelimeen. Tarkista internetyhteytesi." +msgstr "OSM-palvelimeen ei voitu yhdistää. Tarkista internetyhteytesi." #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:69 @@ -162,48 +162,48 @@ msgstr "Ladataan pisteet {0}-{1}..." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:164 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:168 msgid "Unknown version" msgstr "Tuntematon versio" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 msgid "Found element in non-way." msgstr "-elementti muussa kuin polussa." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 msgid " has zero ref" -msgstr "Pisteeltä () puuttuu id." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 msgid "Found element in non-relation." msgstr "-tagi muussa kuin relaatiossa." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:252 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250 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:294 msgid "Illegal object with id=0" msgstr "Virheellinen objekti (id=0)" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Puuttuva pakollinen attribuutti \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 #, java-format msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "Ohitetaan polku jonka jotain pistettä ei ole olemassa: {0}\n" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +msgstr "Ohitetaan polku, jonka jotain pistettä ei ole olemassa: {0}\n" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:502 msgid "Prepare OSM data..." msgstr "Valmistellaan OSM-karttatietoja..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:518 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:516 msgid "Ill-formed node id" msgstr "Vääränlainen pisteen id" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:280 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:287 msgid "Parse error: invalid document structure for gpx document" msgstr "Virhe luettaessa gpx-tiedostoa: tiedoston rakenne virheellinen." @@ -213,18 +213,18 @@ msgstr "Yhdistetään palvelimeen..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Anna lyhyt kuvaus lähetettävistä muutoksista:" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 msgid "Commit comment" msgstr "Lähetä kommentti" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:164 +msgstr "{0}% ({1}/{2}), {3} jäljellä. Lähetetään {4}: {5} (id: {6})" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64 @@ -234,34 +234,32 @@ msgstr "Virhe tapahtui: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:192 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190 msgid "Opening changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:226 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224 msgid "Server does not support changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:246 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:428 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:609 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:184 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607 msgid "Unknown host" msgstr "Tuntematon palvelin" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282 msgid "Preparing..." msgstr "Valmistellaan..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:294 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292 msgid "Uploading..." msgstr "Lähetetään..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375 msgid "Closing changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:652 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650 msgid "Transfer aborted due to error (will wait for 5 seconds):" msgstr "Siirto keskeytettiin virheen takia (odotetaan viisi sekuntia):" @@ -295,21 +293,24 @@ #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95 msgid "Login" -msgstr "" +msgstr "Kirjaudu sisään" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95 #: ../core/src/org/openstreetmap/josm/Main.java:348 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:29 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 @@ -322,11 +323,11 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:110 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -341,11 +342,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:186 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 msgid "Creating main GUI" msgstr "Luodaan pääikkuna" #: ../core/src/org/openstreetmap/josm/Main.java:195 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:271 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:278 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:56 msgid "Help" @@ -389,27 +390,29 @@ msgstr "Jätetään huomioimatta virheellinen URL-osoite: ”{0}”" +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109 +msgid "min lat" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111 +msgid "min lon" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 -msgid "min lat" +msgid "max lat" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 -msgid "min lon" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:117 -msgid "max lat" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119 msgid "max lon" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:122 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " "area)" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:134 +"URL-osoite www.openstreetmap.org-sivustolta (voit liittää URL-osoitteen " +"tähän ladataksesi alueen)" + +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130 msgid "Bounding Box" msgstr "Rajoittava alue" @@ -445,6 +448,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:96 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:894 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:956 msgid "name" msgstr "nimi" @@ -477,5 +480,5 @@ msgstr "zoom" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:107 msgid "" "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -483,5 +486,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:109 msgid "Slippy map" msgstr "" @@ -492,7 +495,7 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:605 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:602 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:89 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -512,5 +515,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380 msgid "Remove" msgstr "Poista" @@ -518,5 +521,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 msgid "Select a bookmark first." -msgstr "Valitse ensiksi kirjanmerkki." +msgstr "Valitse ensin kirjanmerkki." #: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38 @@ -648,22 +651,22 @@ msgstr "Jos määritetty, nollaa asetukset niiden lukemisen sijaan." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:109 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:186 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:198 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:108 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:191 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:203 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 msgid "Java OpenStreetMap Editor" msgstr "Java OpenStreetMap -editori" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:111 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:110 msgid "Message of the day not available" -msgstr "Päivän viesti ei ole saatavilla" - -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:200 +msgstr "Päivän viestiä ei ole saatavilla" + +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:205 msgid "Downloading \"Message of the day\"" -msgstr "" +msgstr "Ladataan \"Päivän viestiä\"" #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84 @@ -701,33 +704,33 @@ msgstr "Loitonna" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:234 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:474 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:512 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:383 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:380 msgid "More information about this feature" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:393 +msgstr "Lisää tietoja tästä ominaisuudesta" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:390 msgid "Optional Attributes:" msgstr "Lisäominaisuudet:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:437 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Käytä esivalintaa \"{0}\" ryhmästä \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:438 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:435 #, java-format msgid "Use preset ''{0}''" msgstr "Käytä esivalintaa ”{0}”" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 msgid "way" @@ -736,11 +739,11 @@ msgstr[1] "polkua" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:214 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 msgid "node" msgid_plural "nodes" @@ -748,6 +751,6 @@ msgstr[1] "pistettä" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:81 @@ -757,14 +760,14 @@ msgstr[1] "relaatiot" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:475 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 #, java-format msgid "Unknown type: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 +msgstr "Tuntematon tyyppi: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:549 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 #, java-format @@ -772,15 +775,15 @@ msgstr "Tagien esiasetuslähdettä ei voitu lukea: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:555 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 #, java-format msgid "Error parsing {0}: " msgstr "Virhe käsiteltäessä {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:572 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:569 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595 #, java-format msgid "Change {0} object" @@ -789,9 +792,17 @@ msgstr[1] "Muuta {0} objektia" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 msgid "Nothing selected!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 +msgstr "Ei mitään valittuna!" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 +msgid "Selection unsuitable!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +msgid "Apply Preset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 msgid "Change Properties" msgstr "Muuta ominaisuuksia" @@ -802,14 +813,14 @@ msgstr "Esivalintaryhmä ”{0}”" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:107 msgid "File" msgstr "Tiedosto" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:135 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:107 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:86 @@ -821,22 +832,22 @@ msgstr "Muokkaa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 msgid "View" msgstr "Näytä" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:26 msgid "Tools" msgstr "Työkalut" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:141 msgid "Audio" msgstr "Ääni" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:142 msgid "Presets" msgstr "Esivalinnat" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:40 @@ -848,18 +859,18 @@ msgstr "Valikko: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:210 msgid "Wireframe View" msgstr "Rautalankanäkymä" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212 msgid "Toggle Wireframe view" msgstr "Vaihda rautalankanäkymän päälläoloa" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:28 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 msgid "Contacting the OSM server..." msgstr "Yhdistetään OSM-palvelimeen..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 #, java-format msgid "This will change up to {0} object." @@ -868,11 +879,11 @@ msgstr[1] "Olet muuttamassa {0} kohdetta." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 msgid "An empty value deletes the key." msgstr "Tyhjä arvo poistaa avaimen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66 @@ -882,7 +893,7 @@ msgstr "Avain" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 @@ -891,10 +902,10 @@ msgstr "Arvo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333 msgid "Change values?" msgstr "Muutetaanko arvot?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:257 #, java-format msgid "Change properties of up to {0} object" @@ -903,33 +914,33 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 msgid "Please select a key" msgstr "Valitse avain" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321 msgid "Please select a value" msgstr "Valitse arvo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:445 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:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 msgid "Properties/Memberships" msgstr "Ominaisuudet/jäsenyydet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 msgid "Properties for selected objects." msgstr "Valittujen objektien ominaisuudet." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97 @@ -941,58 +952,58 @@ msgstr "Vaihda: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 msgid "Member Of" msgstr "Jäsenyydet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Role" msgstr "Rooli" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:559 msgid "Change relation" msgstr "Muuta relaatiota" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Poistetaanko valinta relaatiosta {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 msgid "Delete from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 +msgstr "Poista relaatiosta" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:600 msgid "Add Properties" msgstr "Lisää ominaisuuksia" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 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:609 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 msgid "Edit Properties" msgstr "Muokkaa ominaisuuksia" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609 msgid "Edit the value of the selected key for all objects" msgstr "Muokkaa valitun avaimen arvoa kaikissa objekteissa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 msgid "Delete Properties" msgstr "Poista asetukset" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:77 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:293 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 @@ -1001,98 +1012,115 @@ msgstr "Poista" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 msgid "Delete the selected key in all objects" msgstr "Poista valittu avain kaikista objekteista" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:763 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Ominaisuudet: {0} / Jäsenyydet: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:769 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 msgid "Properties / Memberships" msgstr "Ominaisuudet / Jäsenyydet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178 +msgid "Apply Changes" +msgstr "Toteuta muutokset" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 msgid "Create new relation" msgstr "Luo uusi relaatio" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208 msgid "Edit new relation" msgstr "Muokkaa uutta relaatiota" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209 #, java-format msgid "Edit relation #{0}" msgstr "Muokkaa relaatiota #{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230 +msgid "Basic" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Occupied By" msgstr "Jäsen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311 msgid "Tags (empty value deletes tag)" msgstr "Tagit (tyhjä arvo poistaa tagin)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313 msgid "Members" msgstr "Jäsenet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 +msgid "Move Up" +msgstr "Siirrä ylöspäin" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 msgid "Move the currently selected members up" msgstr "Siirrä valittuja jäseniä ylöspäin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358 +msgid "Add Selected" +msgstr "Lisää valitut" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359 +msgid "Add all currently selected objects as members" +msgstr "Lisää valitut objektit jäseniksi" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365 +msgid "Remove Selected" +msgstr "Poista valitut" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366 +msgid "Remove all currently selected objects from relation" +msgstr "Poista kaikki valitut objektit relaatiosta" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 +msgid "Move Down" +msgstr "Siirrä alaspäin" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 msgid "Move the currently selected members down" msgstr "Siirrä valittuja jäseniä alaspäin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356 -msgid "Add Selected" -msgstr "Lisää valitut" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:357 -msgid "Add all currently selected objects as members" -msgstr "Lisää valitut objektit jäseniksi" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:363 -msgid "Remove Selected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:364 -msgid "Remove all currently selected objects from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381 msgid "Remove the member in the current table row from this relation" msgstr "Poista taulukon aktiivisella rivillä oleva jäsen relaatiosta" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394 msgid "Download Members" msgstr "Lataa jäsenet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:406 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395 msgid "Download all incomplete ways and nodes in relation" msgstr "Lataa kaikki keskeneräiset polut ja pisteet relaatiossa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:415 -msgid "Basic" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:453 #, java-format msgid "Members: {0}" msgstr "Jäsenet: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:587 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:461 +#, java-format +msgid "Relation Editor: {0}" +msgstr "Relaatioeditori: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:585 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 msgid "There were conflicts during import." msgstr "Tuonnin aikana oli ristiriitoja." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593 msgid "Error parsing server response." msgstr "Virhe palvelimen vastauksen käsittelyssä." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:600 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:594 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:598 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -1106,9 +1134,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:345 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 msgid "Error" msgstr "Virhe" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:599 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597 msgid "Cannot connect to server." msgstr "Palvelimeen ei voida yhdistää." @@ -1189,5 +1217,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159 msgid "Undock the panel" -msgstr "" +msgstr "Irroita paneeli" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208 @@ -1212,5 +1240,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 msgid "Delete Layer" -msgstr "" +msgstr "Poista taso" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 @@ -1271,5 +1299,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:94 @@ -1279,5 +1307,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 msgid "" @@ -1343,16 +1371,24 @@ msgstr "Valinta: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +msgid "Open an editor for the selected relation" +msgstr "Avaa valittu relaatio muokkaimeen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +msgid "Delete the selected relation" +msgstr "Poista valittu relaatio" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 #: trans_presets.java:2904 msgid "Relations" msgstr "Relaatiot" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 msgid "Open a list of all relations." msgstr "Avaa lista kaikista relaatioista." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 @@ -1360,17 +1396,9 @@ msgstr "Uusi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 msgid "Create a new relation" msgstr "Luo uusi relaatio" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open an editor for the selected relation" -msgstr "Avaa valittu relaatio muokkaimeen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -msgid "Delete the selected relation" -msgstr "Poista valittu relaatio" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:130 #, java-format msgid "Relations: {0}" @@ -1399,47 +1427,47 @@ msgstr "Komentolista: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +msgid "Resolve" +msgstr "Selvitä" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +msgid "Open a merge dialog of all selected items in the list above." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Conflict" msgstr "Ristiriita" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 msgid "Merging conflicts." msgstr "Yhdistämisristiriidat" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67 -msgid "Resolve" -msgstr "Selvitä" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:68 -msgid "Open a merge dialog of all selected items in the list above." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:105 -msgid "Please select something from the conflict list." -msgstr "Ole hyvä ja valitse jotain ristiriitalistasta" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Resolve Conflicts" msgstr "Ratkaise ristiriidat" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +msgid "Solve Conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 #, java-format msgid "Conflicts: {0}" msgstr "Ristiriidat: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Conflicts" msgstr "Ristiriidat" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 msgid "conflict" msgstr "ristiriita" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 msgid "background" msgstr "tausta" @@ -1463,5 +1491,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 msgid "Customize Color" @@ -1469,5 +1497,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1477,5 +1505,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1484,5 +1512,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:326 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:152 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -1500,5 +1528,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:265 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 #, java-format msgid "Audio synchronized at point {0}." @@ -1506,5 +1534,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232 msgid "Unable to synchronize in layer being played." msgstr "" @@ -1525,5 +1553,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:958 msgid "desc" msgstr "kuvaus" @@ -1545,5 +1573,5 @@ msgstr "Virhe näytettäessä URL:ia" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -1551,5 +1579,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -1557,18 +1585,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224 msgid "Unable to create new audio marker." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 msgid "Convert to data layer" msgstr "Muuta datatasoksi" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:725 -msgid "" -"Upload of unprocessed GPS data as map data is considered harmful." -"
          If you want to upload traces, look here:" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:645 +msgid "" +"Upload of unprocessed GPS data as map data is considered " +"harmful.
          If you want to upload traces, look here:" msgstr "" "Käsittelemättömän GPS-datan lähettämistä karttadatana pidetään " @@ -1576,66 +1604,22 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:646 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:747 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:448 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:667 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "Converted from: {0}" msgstr "Muutettu jäljestä {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612 -msgid "Upload this trace..." -msgstr "Lähetä tämä jälki..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:616 -msgid "" -"This functionality has been added only recently. Please
          use with " -"care and check if it works as expected." -msgstr "" -"Tämä toiminnallisuus on lisätty vasta lähiaikoina.
          Käytä sitä " -"varoen ja tarkista, että se toimii odotetusti," - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:102 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:107 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:626 -msgid "Upload track filtered by JOSM" -msgstr "Lähetä JOSM:n käsittelemä jälki" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:103 -#, java-format -msgid "Upload raw file: {0}" -msgstr "Lähetä raakatiedosto: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:108 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:627 -msgid "Upload raw file: " -msgstr "Lähetä raakatiedosto: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640 -msgid "Description:" -msgstr "Kuvaus:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:123 -msgid "Tags:" -msgstr "Tagit:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:129 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:648 -msgid "GPX-Upload" -msgstr "GPX-lähetys" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:229 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:217 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113 msgid "gps point" msgstr "gps-piste" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 #: trans_presets.java:1795 trans_presets.java:1801 trans_presets.java:1807 #: trans_presets.java:1813 trans_presets.java:1819 trans_presets.java:1825 @@ -1655,5 +1639,5 @@ msgstr[1] "jäljet" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 msgid "point" msgid_plural "points" @@ -1661,5 +1645,5 @@ msgstr[1] "pisteet" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 #, java-format msgid "a track with {0} point" @@ -1668,5 +1652,5 @@ msgstr[1] "jälki, jossa on {0} pistettä" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} consists of {1} track" @@ -1675,5 +1659,5 @@ msgstr[1] "{0}:ssä on {1} jälkeä" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} point" @@ -1682,25 +1666,25 @@ msgstr[1] "{0} pistettä" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117 msgid "Customize line drawing" msgstr "Muokkaa viivanpiirtotyyliä" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:296 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 msgid "Use global settings." msgstr "Käytä globaaleja asetuksia." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 msgid "Draw lines between points for this layer." msgstr "Piirrä viivat pisteiden välillä tällä tasolla." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:298 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123 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/RawGpsLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:135 msgid "Select line drawing options" @@ -1734,5 +1718,5 @@ msgstr "JPEG-kuvat (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290 #, java-format msgid "{0} track, " @@ -1741,5 +1725,5 @@ msgstr[1] "{0} jälkeä, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 #, java-format msgid "{0} route, " @@ -1748,5 +1732,5 @@ msgstr[1] "{0} reittiä, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 #, java-format msgid "{0} waypoint" @@ -1755,71 +1739,68 @@ msgstr[1] "{0} reittipistettä" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #, java-format msgid "Name: {0}" msgstr "Nimi: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "Description: {0}" msgstr "Kuvaus: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 msgid "Timespan: " msgstr "Ajanjakso: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Length: " msgstr "Pituus: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:642 -msgid "Tags (keywords in GPX):" -msgstr "Tagit (avainsanat GPX-tiedostossa):" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:655 msgid "time" msgstr "aika" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:780 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:679 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:700 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 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:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:686 msgid "Download everything within:" msgstr "Lataa kaikki alueella:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 #, java-format msgid "{0} meters" msgstr "{0} metriä" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:692 msgid "Maximum area per request:" msgstr "Yhden pyynnön enimmäisalue:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 #, java-format msgid "{0} sq km" msgstr "{0} neliökilometriä" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787 #, java-format msgid "" "This action will require {0} individual
          download requests. Do you " "wish
          to continue?" -msgstr "Tämä vaatii {0} erillistä latauspyyntöä.
          Jatketaanko?" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 +msgstr "" +"Tämä vaatii {0} erillistä latauspyyntöä.
          Jatketaanko?" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:844 #, java-format msgid "Audio markers from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 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:1049 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "" "Some waypoints with timestamps from before the start of the track were " @@ -1827,5 +1808,5 @@ msgstr "Reittipisteet ajalta ennen reittijäljen alkua ohitettiin." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -1933,19 +1914,19 @@ msgstr "Syötettyä aikaa ei voitu tulkita oikein." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:140 msgid "outside downloaded area" msgstr "ladatun alueen ulkopuolella" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 #, java-format msgid "{0} consists of:" msgstr "{0} koostuu:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:353 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:347 #, java-format msgid " ({0} deleted.)" msgstr " ({0} poistettu)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:445 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 msgid "Convert to GPX layer" msgstr "Muuta GPX-tasoksi" @@ -1973,37 +1954,37 @@ msgstr "Kirjanmerkkiä ei voitu kirjoittaa." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 msgid "The geographic longitude at the mouse pointer." msgstr "Pituusaste osoittimen kohdalla." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The name of the object at the mouse pointer." msgstr "Osoittmen kohdalla olevan objektin nimi." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 msgid "The geographic latitude at the mouse pointer." msgstr "Leveysaste osoittimen kohdalla." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The angle between the previous and the current way segment." msgstr "Edellisen ja tämänhetkisen segmentin välinen kulma." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The (compass) heading of the line segment being drawn." msgstr "Piirrettävän segmentin suuntima." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The length of the new way segment being drawn." msgstr "Piirrettävän segmentin pituus." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:160 msgid "(no object)" msgstr "(ei objektia)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:62 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:56 msgid "Color" msgstr "Väri" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:57 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107 #: trans_presets.java:56 trans_presets.java:92 trans_presets.java:130 @@ -2104,27 +2085,36 @@ msgstr "Nimi" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:118 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:112 #, java-format msgid "Paint style {0}: {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148 +msgstr "Piirtotyyli {0}: {1}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 msgid "Choose" msgstr "Valitse" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 msgid "Please select a color." msgstr "Valitse väri." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 #, java-format msgid "Choose a color for {0}" msgstr "Valitse väri {0}:lle" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +msgid "Set to default" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:172 +msgid "Set all to default" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:184 msgid "Colors used by different objects in JOSM." msgstr "Eri objekteille käytetyt värit." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:171 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:198 msgid "Colors" msgstr "Värit" @@ -2157,26 +2147,26 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45 msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
          The password is transfered in plain text to the server, encoded in the " -"URL.
          Do not use a valuable Password." +"WARNING: The password is stored in plain text in the preferences " +"file.
          The password is transfered in plain text to the server, encoded in " +"the URL.
          Do not use a valuable Password." msgstr "" "VAROITUS: Salasana on tallennettu asetustiedostoon ilman minkäänlaista " -"salausta.
          Salasana lähetetään salaamattomana palvelimelle URL-osoitteessa." -"
          Älä käytä arvokasta salasanaa." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:45 +"salausta.
          Salasana lähetetään salaamattomana palvelimelle URL-" +"osoitteessa.
          Älä käytä arvokasta salasanaa." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44 msgid "Sort presets menu" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46 msgid "Enable built-in defaults" msgstr "Käytä sisäänrakennettuja oletusarvoja" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:58 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69 msgid "Tagging preset source" msgstr "Tagien esiasetusten lähde" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:156 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 @@ -2184,5 +2174,5 @@ msgstr "Ole hyvä ja valitse muokattava rivi." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500 @@ -2191,24 +2181,24 @@ msgstr "Ole hyvä ja valitse poistettava rivi." +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88 +msgid "" +"The sources (URL or filename) of tagging preset definition files. See " +"http://josm.openstreetmap.de/wiki/TaggingPresets for help." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89 -msgid "" -"The sources (URL or filename) of tagging preset definition files. See http://" -"josm.openstreetmap.de/wiki/TaggingPresets for help." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 msgid "Add a new tagging preset source to the list." msgstr "Lisää uusi tagien esivalintalähde listaan." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 msgid "Delete the selected source from the list." msgstr "Poista valittu lähde listasta." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:94 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93 msgid "Tagging Presets" msgstr "Tagien esivalinnat" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97 msgid "Tagging preset sources" msgstr "Tagien esivalintojen lähteet" @@ -2222,6 +2212,6 @@ msgstr "Lisää tallennettaessa varmuuskopiotiedostojen loppuun ~-merkki" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:141 @@ -2229,34 +2219,34 @@ msgstr "Liitännäiset" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 msgid "Configure available plugins." msgstr "Muokkaa käytettävien liitännäisten asetuksia." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43 msgid "Download List" msgstr "Lataa lista" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:80 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51 msgid "Update" msgstr "Päivitä" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:60 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 msgid "Configure Sites..." msgstr "Muokkaa sivustoja..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add either site-josm.xml or Wiki Pages." msgstr "Lisää joko site-josm.xml tai Wiki-sivusto." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99 msgid "Please select an entry." msgstr "Valitse kohta." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 msgid "Configure Plugin Sites" msgstr "Muokkaa liitännäissivustoja" @@ -2432,9 +2422,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "Display Settings" msgstr "Näyttöasetukset" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "" "Various settings that influence the visual representation of the whole " @@ -2442,29 +2432,29 @@ msgstr "Asetukset, jotka vaikuttavat ohjelman visuaaliseen ilmeeseen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings" msgstr "Yhteysasetukset" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings for the OSM server." msgstr "OSM-palvelimen yhteysasetukset." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Map Settings" msgstr "Kartta-asetukset" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Settings for the map projection and data interpretation." msgstr "Karttaprojektion ja datatulkinnan asetukset." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Audio Settings" msgstr "Ääniasetukset" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Settings for the audio player and audio markers." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97 msgid "You have to restart JOSM for some settings to take effect." msgstr "" @@ -2472,27 +2462,35 @@ "käyttöön." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:25 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 msgid "Draw lines between raw gps points." msgstr "Piirrä viivat GPS-pisteiden välille." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:27 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 msgid "Force lines if no segments imported." msgstr "Pakota viivojen piirto, jos segmenttejä ei ole." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:28 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 msgid "Draw large GPS points." msgstr "Piirrä isot GPS-pisteet." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 -msgid "Color tracks by velocity." -msgstr "Väritä jäljet nopeuden perusteella." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34 +msgid "Velocity (red = slow, green = fast)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 +msgid "Dilution of Position (red = high, green = low, if available)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 +msgid "Single Color (can be customized for named layers)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:1346 msgid "Car" msgstr "Auto" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:309 trans_presets.java:635 trans_presets.java:833 #: trans_presets.java:842 trans_presets.java:851 trans_presets.java:864 @@ -2504,5 +2502,5 @@ msgstr "Polkupyörä" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:310 trans_presets.java:637 trans_presets.java:832 #: trans_presets.java:841 trans_presets.java:850 trans_presets.java:863 @@ -2513,44 +2511,44 @@ msgstr "Jalankulku (foot)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 msgid "Draw Direction Arrows" msgstr "Piirrä suuntanuolet" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 msgid "Fast drawing (looks uglier)" msgstr "Nopea piirto (näyttää rumemmalta)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180 msgid "Only interesting direction hints (e.g. with oneway tag)." msgstr "Vain kiinnostavat suuntatiedot (esim. yksisuuntaiset kadut)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:186 msgid "Only on the head of a way." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 +msgstr "Vain polun päähän." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44 msgid "Draw segment order numbers" msgstr "Piirrä segmenttien järjestysnumerot" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45 msgid "Draw boundaries of downloaded data" msgstr "Piirrä ladatun alueen rajat" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46 msgid "Draw virtual nodes in select mode" msgstr "Piirrä virtuaalipisteet valintatilassa" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47 msgid "Draw inactive layers in other color" msgstr "Piirrä epäaktiiviset tasot eri värillä" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 msgid "Smooth map graphics (antialiasing)" msgstr "Pehmeä karttagrafiikka (antialisointi)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 msgid "" "If your gps device draws too few lines, select this to draw lines along your " @@ -2558,5 +2556,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:71 msgid "" "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines." @@ -2565,23 +2563,24 @@ "piirretään aina peräkkäisten pisteiden välit." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73 msgid "Maximum length (meters)" msgstr "Enimmäispituus (metreinä)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:77 msgid "" "Force drawing of lines if the imported data contain no line information." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:84 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89 msgid "Draw direction arrows for lines, connecting GPS points." msgstr "Piirrä GPS-pisteitä yhdistäviin viivoihin suuntanuolet" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90 -msgid "Draw the direction arrows using table lookups instead of complex math." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95 +msgid "" +"Draw the direction arrows using table lookups instead of complex math." msgstr "" "Piirrä suuntanuolet käyttäen etsintätaulukkoa kompleksilukulaskujen sijaan." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:96 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:101 msgid "" "Don't draw arrows if they are not at least this distance away from the last " @@ -2589,50 +2588,67 @@ msgstr "Älä piirrä nuolta, jos se on tätä lähempänä edellistä." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104 msgid "Minimum distance (pixels)" msgstr "Vähimmäisetäisyys (pikseleinä)" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:109 -msgid "Choose the hue for the track color by the velocity at that point." -msgstr "Valitse jäljen värisävy nopeuden perusteella kussakin kohdassa." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116 -msgid "Allows to tune the track coloring for different average speeds." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122 msgid "Draw larger dots for the GPS points." msgstr "Piirrä isommat pisteet GPS-pisteille" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136 +msgid "" +"All points and track segments will have the same color. Can be customized in " +"Layer Manager." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137 +msgid "Colors points and track segments by velocity." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:138 +msgid "" +"Colors points and track segments by dilution of position (HDOP). Your " +"capture device needs to logs that information." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143 +msgid "Allows to tune the track coloring for different average speeds." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148 +msgid "Track and Point Coloring" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 msgid "GPS Points" msgstr "GPS-pisteet" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175 msgid "Draw direction hints for way segments." msgstr "Piirrä suuntanuolet polkujen segmenteille." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:163 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192 msgid "Draw the order numbers of all segments within their way." msgstr "Piirrä polkujen segmenteille järjestysnumerot." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:168 -msgid "Apply antialiasing to the map view resulting in a smoother appearance." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:197 +msgid "" +"Apply antialiasing to the map view resulting in a smoother appearance." msgstr "Käytä antialisointia, joka antaa pehmeämmän ulkoasun." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202 msgid "Draw the boundaries of data loaded from the server." msgstr "Piirrä palvelimelta ladatun datan alueen reunat." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:178 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:207 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" "Piirrä valintatilassa virtuaalipisteet polkuihin muokkauksen helpottamiseksi." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212 msgid "Draw the inactive data layers in a different color." msgstr "Piirrä epäaktiiviset tasot eri värillä." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219 msgid "OSM Data" msgstr "OSM-data" @@ -2743,6 +2759,6 @@ "a menu entry of button for the first time. So some of your changes may " "become active even without restart --- but also without collistion handling. " -"This is another reason to restart JOSM after making any changes here." -"

          " +"This is another reason to restart JOSM after making any changes " +"here.

          " msgstr "" @@ -2755,8 +2771,9 @@ "key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also " "there will be 'keys' listed that correspond to a shortcut on your keyboard " -"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/" -"Semicolon on US keyboards, '.'/Period on German keyboards, ...) instead. Not " -"doing so may result in conflicts, as there is no way for JOSM to know that " -"Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...

          " +"(e.g. ':'/Colon). Please also do not use them, use the base key " +"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) " +"instead. Not doing so may result in conflicts, as there is no way for JOSM " +"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US " +"keyboard...

          " msgstr "" "

          Huomaathan, että seuraavan sivun listassa on myös näppäimiä, joita ei " @@ -2789,6 +2806,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183 msgid "" -"

          The pseudo-modifier 'disabled' will disable the shortcut when encountered." -"

          " +"

          The pseudo-modifier 'disabled' will disable the shortcut when " +"encountered.

          " msgstr "" @@ -2858,67 +2875,67 @@ msgstr "Muuttujaryhmät" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:231 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:236 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:250 msgid "layer not in list." msgstr "taso ei ole listassa." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "usage" msgstr "käyttö" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 msgid "options" msgstr "valinnat" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 msgid "Show this help" msgstr "Näytä tämä ohje" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +msgid "Standard unix geometry argument" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +msgid "Download the bounding box" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 -msgid "Standard unix geometry argument" +msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 -msgid "Download the bounding box" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 -msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Open file (as raw gps, if .gpx)" msgstr "Avaa tiedosto (gps-datana, jos *.gpx)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +msgid "Download the bounding box as raw gps" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +msgid "Select with the given search" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 -msgid "Download the bounding box as raw gps" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 -msgid "Select with the given search" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 msgid "Don't launch in fullscreen mode" msgstr "Älä käynnistä kokonäyttötilassa" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 msgid "Reset the preferences to default" msgstr "Palauta oletusasetukset" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 msgid "Set the language." msgstr "Aseta kieli." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 msgid "examples" msgstr "esimerkkejä" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -2926,21 +2943,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 msgid "Instead of --download= you may specify osm://\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 msgid "Activating updated plugins" msgstr "Aktivoidaan päivitetyt liitännäiset" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 msgid "Loading early plugins" msgstr "Ladataan aikaisia liitännäisiä" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Setting defaults" msgstr "Asetetaan oletuksia" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171 msgid "Loading plugins" msgstr "Ladataan liitännäiset" @@ -2974,6 +2991,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:108 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:164 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:162 #: trans_presets.java:308 trans_presets.java:309 trans_presets.java:310 #: trans_presets.java:311 trans_presets.java:312 trans_presets.java:313 @@ -2990,5 +3007,5 @@ msgstr "tuntematon" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:66 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 #, java-format msgid "" @@ -2999,10 +3016,10 @@ "tarpeellinen." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 #, java-format msgid "Plugin requires JOSM update: {0}." msgstr "Liitännäinen vaatii JOSM:n päivityksen: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." @@ -3010,35 +3027,35 @@ "{1}-liitännäinen edellyttää toimiakseen, että {0}-liitännäinen on asennettu." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 #, java-format msgid "Plugin not found: {0}." msgstr "Liitännäistä ei löytynyt: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Viimeisin liitännäisten päivitys oli yli {0} päivää sitten." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 msgid "" "(You can change the number of days after which this warning appears
          by " "setting the config option 'pluginmanager.warntime'.)" msgstr "" -"(Voit vaihtaa päivien määrän, jonka jälkeen tämä varoitus tulee," -"
          asettamalla ”plginmanager.warntime”-asetuksen)" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 +"(Voit vaihtaa päivien määrän, jonka jälkeen tämä varoitus " +"tulee,
          asettamalla ”plginmanager.warntime”-asetuksen)" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 msgid "Disable plugin" msgstr "Poista liitännäinen käytöstä" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Liitännäistä {0} ei voitu ladata. Poistetaanko se asetuksista?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -3048,16 +3065,17 @@ "on oikeus korvata vanhat tiedostot." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 #, java-format msgid "" "An unexpected exception occurred that may have come from the ''{0}'' plugin." -msgstr "Tapahtui odottamaton poikkeus, joka ilmeni ehkä liitännäisessä ”{0}”." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:259 +msgstr "" +"Tapahtui odottamaton poikkeus, joka ilmeni ehkä liitännäisessä ”{0}”." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Liitännäisen sisältämien tietojen mukaan tekijä on {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:262 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -3065,9 +3083,9 @@ "Koita päivittää liitännäinen uusimpaan versioon ennen virheilmoituksen tekoa." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 msgid "Should the plugin be disabled?" msgstr "Pitäisikö liitännäinen poistaa käytöstä?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:278 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -3077,5 +3095,5 @@ "liitännäisen käytöstä." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -3083,6 +3101,6 @@ msgstr "Liitännäistä ei voitu poistaa. Tee ongelmasta virheilmoitus." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:322 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:181 msgid "no description available" msgstr "kuvausta ei ole saatavilla" @@ -3094,5 +3112,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 msgid "Update Plugins" msgstr "Päivitä liitännäiset" @@ -3133,5 +3151,5 @@ "automaattisesti." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 #, java-format msgid "Downloaded plugin information from {0} site" @@ -3140,13 +3158,13 @@ msgstr[1] "Ladattiin liitännäistiedot {0} sivustolta" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 msgid "No plugin information found." msgstr "Liitännäistietoja ei löytynyt." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:76 msgid "All installed plugins are up to date." msgstr "Kaikki asennetut liitännäiset ovat ajantasalla." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 #, java-format msgid "" @@ -3159,9 +3177,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:105 msgid "Download missing plugins" msgstr "Lataa puuttuvat liitännäiset" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:106 #, java-format msgid "" @@ -3174,22 +3192,22 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 msgid "Download Plugins" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:170 +msgstr "Lataa liitännäiset" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:168 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Versio {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:176 msgid "Plugin bundled with JOSM" msgstr "Liitännäinen tulee JOSM:n mukana" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208 msgid "Plugin already exists" msgstr "Liitännäinen on jo olemassa" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:211 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:209 #, java-format msgid "" @@ -3204,15 +3222,15 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 msgid "Delete and Download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:222 #, java-format msgid "Error deleting plugin file: {0}" msgstr "Virhe poistettaessa liitännäistiedostoa: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:281 #, java-format msgid "Error reading plugin information file: {0}" @@ -3279,10 +3297,10 @@ msgstr "Poista {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:165 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 msgid "Conflicting relation" msgstr "Ristiriidassa oleva relaatio" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 #, java-format msgid "" @@ -3293,5 +3311,5 @@ "Poistetaanko relaatiosta?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:166 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 #, java-format msgid "" @@ -3308,11 +3326,11 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:349 msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
          This can cause problems because other objects (that you don't see) might " -"use them.
          Do you really want to delete?" +"You are about to delete nodes outside of the area you have " +"downloaded.
          This can cause problems because other objects (that you don't " +"see) might use them.
          Do you really want to delete?" msgstr "" "Olet aikeissa poistaa pisteitä ladatun alueen ulkopuolelta.
          Tämä voi " -"johtaa ongelmiin, koska objektit, joita et näe voivat käyttää niitä." -"
          Oletko varma, että haluat poistaa ne?" +"johtaa ongelmiin, koska objektit, joita et näe voivat käyttää " +"niitä.
          Oletko varma, että haluat poistaa ne?" #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 @@ -3436,124 +3454,135 @@ msgstr "Asetuksia ei voitu ladata palvelimelta." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:232 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:426 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:428 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:527 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:765 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:776 msgid "Empty member in relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:767 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:531 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Poistettu jäsen \"{0}\" relaatiossa." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:547 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 #, 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:552 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:549 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:558 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:561 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 +msgid "More than one \"via\" found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 #, java-format msgid "Unknown role ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 #, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 msgid "No \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 msgid "No \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -msgid "No \"via\" node found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +msgid "No \"via\" node or way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:636 -#, java-format -msgid "The \"{0}\" way must contain at least 2 nodes." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:731 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +msgid "The \"to\" way doesn't start or end at a \"via\" node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:620 +msgid "The \"from\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:624 +msgid "The \"to\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:742 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:847 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:858 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:949 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:987 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:998 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1012 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1023 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1195 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1206 msgid "untagged" msgstr "ei tageja" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1196 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207 msgid "text" msgstr "teksti" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" msgstr "epäaktiivinen" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:94 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:181 @@ -3561,15 +3590,15 @@ msgstr "valitut" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" msgstr "tagiton polku" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 msgid "incomplete way" msgstr "keskeneräinen polku" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 msgid "highlight" -msgstr "" +msgstr "korostus" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -3589,5 +3618,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:113 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:89 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:77 msgid "incomplete" @@ -3617,14 +3646,14 @@ msgstr[1] "{0} jäsentä" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 msgid "Duplicate" msgstr "Monista" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 msgid "Duplicate selection by copy and immediate paste." msgstr "Monista valinta kopioimalla ja liittämällä samantien." -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 @@ -3633,5 +3662,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -3702,6 +3731,8 @@ msgstr "Näytä pisteiden tai polkujen historia." -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:57 -msgid "Please select at least one node, way or relation." +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:60 +msgid "" +"Please select at least one node, way or relation. Only already uploaded " +"elements have a history." msgstr "" @@ -3724,7 +3755,7 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/TerracerAction.java:47 @@ -3856,10 +3887,10 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 msgid "Reverse and Combine" -msgstr "" +msgstr "Käännä ja yhdistä" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:123 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:314 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:315 msgid "Enter values for all conflicts." msgstr "Syötä arvot kaikille ristiriidoille." @@ -3867,5 +3898,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 msgid "Solve Conflicts" msgstr "" @@ -3906,9 +3937,9 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 msgid "GPX Files" -msgstr "" +msgstr "GPX-tiedostot" #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28 msgid "NMEA-0183 Files" -msgstr "" +msgstr "NMEA-0183 -tiedostot" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 @@ -4000,5 +4031,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #, java-format @@ -4025,17 +4056,19 @@ msgstr[1] "Valitut pisteet eivät ole keskellä mitään polkua." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125 -msgid "" -"There is more than one way using the node(s) you selected. Please select the " +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 +msgid "" +"There is more than one way using the node you selected. Please select the " "way also." -msgstr "" -"Enemmän kuin yksi polku käyttää valittua pistettä. Valitse myös katkaistava " -"polku." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133 +msgid_plural "" +"There is more than one way using the nodes you selected. Please select the " +"way also." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137 msgid "The selected nodes do not share the same way." msgstr "Valitut pisteet eivät ole samalla polulla." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -4043,10 +4076,10 @@ msgstr[1] "Valittu polku ei sisällä kaikkia valittuja pisteitä." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229 msgid "You must select two or more nodes to split a circular way." msgstr "Vähintään kaksi pistettä tulee valita ympyräpolun katkaisemiseksi." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -4056,5 +4089,5 @@ "pisteitä, jotka eivät ole polun päissä.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 msgid "" "A role based relation membership was copied to all new ways.\n" @@ -4065,5 +4098,5 @@ "korjaa tarvittaessa." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:296 #, java-format msgid "Split way {0} into {1} parts" @@ -4157,5 +4190,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Upload Changes" -msgstr "" +msgstr "Lähetä muutokset" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 @@ -4454,5 +4487,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 msgid "Align Nodes in Circle" msgstr "Siirrä pisteet ympyrän kehälle" @@ -4466,5 +4499,5 @@ msgstr "Jotkin pisteet ovat (melkein) viivalla" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 msgid "Please select at least four nodes." msgstr "Valitse ainakin neljä pistettä." @@ -4499,4 +4532,6 @@ "if you rejected all. Continue?" msgstr "" +"Et ole ratkaissut ristiriitoja. Vain omat versiosi tallennetaan, ei tietoa " +"ristiriidoista. Jatka tallennusta?" #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 @@ -4531,4 +4566,32 @@ msgstr "Varmuuskopion palauttamisessa tapahtui virhe." +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "" +"Show status report with useful information that can be attached to bugs" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92 +msgid "Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +msgid "Copy to clipboard and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 +msgid "Close" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 @@ -4540,13 +4603,13 @@ msgstr "Toista edellinen kumottu toiminto" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:44 msgid "Delete Mode" msgstr "Poistotila" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:46 msgid "Delete nodes or ways." msgstr "Poista pisteitä tai polkuja." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:84 @@ -4557,5 +4620,5 @@ msgstr "Tila: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:130 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -4568,6 +4631,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:87 msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." +"Drag play head and release near track to play audio from there; " +"SHIFT+release to synchronize audio at that point." msgstr "" @@ -4581,24 +4644,25 @@ msgstr "Luo alueita" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 msgid "Extrude Way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:252 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:416 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:430 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/ExtrudeAction.java:254 +msgstr "" +"Vapauta hiiren painike valitaksesi suorakaiteen sisään jäävät kohteet." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 msgid "Draw a rectangle of the desired size, then release the mouse button." msgstr "" "Piirrä halutun kokoinen suorakaide, sen jälkeen vapauta hiiren painike." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:420 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:434 msgid "Release the mouse button to stop rotating." msgstr "Vapauta hiiren painike pyörityksen lopettamiseksi." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 msgid "Drag a way segment to make a rectangle." msgstr "Raahaa pisteiden välistä yhteyttä piirtääksesi suorakulmion." @@ -4666,19 +4730,19 @@ msgstr "Valitse, siirrä ja pyöritä objekteja" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:191 msgid "Add and move a virtual new node to way" msgstr "Lisää ja siirrä uutta virtuaalipistettä." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:220 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:223 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 msgid "Cannot move objects outside of the world." msgstr "Objekteja ei voi siirtää maailman ulkopuolelle" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:418 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:432 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:422 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:436 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to remove); Shift-" @@ -4686,6 +4750,6 @@ msgstr "" "Siirrä kohteita raahaamalla; Valitse napsauttamalla. Napsautus Vaihto-" -"näppäimen kanssa lisää nykyiseen valintaan, Ctrl poistaa valituista. Vaihto" -"+Ctrl ja raahaus pyörittää valittua kohdetta." +"näppäimen kanssa lisää nykyiseen valintaan, Ctrl poistaa valituista. " +"Vaihto+Ctrl ja raahaus pyörittää valittua kohdetta." #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 @@ -4747,5 +4811,6 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239 msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "Pisteitä ei voitu yhdistää. Käytössä oleva polku tulisi poistaa ensin." +msgstr "" +"Pisteitä ei voitu yhdistää. Käytössä oleva polku tulisi poistaa ensin." #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:277 @@ -4754,30 +4819,31 @@ msgstr "Yhdistä {0} pistettä" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Orthogonalize Shape" msgstr "Suorakulmaista muoto" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 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:60 +msgstr "" +"Siirtää polun pisteitä niin, että kaikki kulmat ovat joko 90° tai 270°" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 msgid "Only two nodes allowed" msgstr "Vain kaksi pistettä sallittu" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 msgid "Selection must consist only of ways." msgstr "Valinnan pitää muodostua pelkistä poluista." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 msgid "Please select one or more closed ways of at least four nodes." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 msgid "Please select ways with almost right angles to orthogonalize." msgstr "Valitse polkuja, joiden segmenttien välillä on melkein suora kulma." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 msgid "" "You are using the EPSG:4326 projection which might lead
          to " @@ -4789,9 +4855,9 @@ "eroon tästä varoituksesta.
          Haluatko jatkaa?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "Only one node selected" msgstr "Vain yksi piste valittuna" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 msgid "Orthogonalize" msgstr "Suorakulmaista" @@ -4842,6 +4908,8 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101 -msgid "Please select exactly three nodes or one way with exactly three nodes." -msgstr "Valitse tasan kolme pistettä tai polku, jossa on tasan kolme pistettä." +msgid "" +"Please select exactly three nodes or one way with exactly three nodes." +msgstr "" +"Valitse tasan kolme pistettä tai polku, jossa on tasan kolme pistettä." #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121 @@ -4849,52 +4917,69 @@ msgstr "Valituista pisteistä ei voi muodostaa ympyrää." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../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:71 +msgid "Update Data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:72 +#, java-format +msgid "" +"This action will require {0} individual download requests. Do you wish to " +"continue?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 msgid "Open Location..." msgstr "Avaa sijainti..." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 msgid "Open an URL." msgstr "Avaa URL-osoite." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 msgid "Separate Layer" msgstr "Erota taso" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 msgid "Enter URL to download:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 msgid "Download Location" msgstr "Latauksen sijainti" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 msgid "Download URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 msgid "Add Node..." msgstr "Lisää piste..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 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:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 msgid "Enter the coordinates for the new node." msgstr "Syötä uuden pisteen koordinaatit." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 msgid "Use decimal degrees." msgstr "Anna asteet desimaalilukuna." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negatiiviset arvot tarkoittavat läntistä/eteläistä pallonpuoliskoa." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 #: ../plugins/livegps/livegps/LiveGpsDialog.java:54 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93 @@ -4903,5 +4988,5 @@ msgstr "Leveysaste" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 #: ../plugins/livegps/livegps/LiveGpsDialog.java:56 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96 @@ -4944,14 +5029,14 @@ msgstr "Siirtää objektit {0}" +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "Overwrite" msgstr "Korvaa" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "File exists. Overwrite?" msgstr "Tiedosto on jo olemassa. Korvataanko?" @@ -4970,43 +5055,48 @@ msgstr "Valitse jotain kopioitavaksi." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Erota polut" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "Monistaa pisteet, jotka ovat monen polun käytössä." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 msgid "This node is not glued to anything else." msgstr "Tämä piste ei ole yhdistettynä mihinkään muuhun." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 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:90 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 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:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 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:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "Select either:" msgstr "Valitse joko:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +msgid "* One tagged node, or" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 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:103 -msgid "* One node that is used by more than one way and one of those ways, or" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +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:104 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -5015,5 +5105,5 @@ "polkujen käytössä, tai" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -5022,5 +5112,5 @@ "käytössä." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -5033,10 +5123,14 @@ "kaikki polut saavat oman kopionsa ja kaikki pisteet tulevat valituiksi." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:160 +msgid "Unglued Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:373 #, java-format msgid "Dupe into {0} nodes" msgstr "Monista {0} pisteeksi" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:320 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:397 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -5139,5 +5233,5 @@ msgstr "Peru viimeisin toiminto." -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 msgid "No Shortcut" msgstr "Ei pikanäppäintä" @@ -5159,13 +5253,13 @@ msgstr "OpenStreeMap-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:29 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:28 msgid "Downloading GPS data" msgstr "Ladataan GPS-dataa" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:41 msgid "Downloaded GPX Data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:71 +msgstr "Ladattu GPX-data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:69 msgid "Raw GPS data" msgstr "Raaka GPS-data" @@ -5373,5 +5467,5 @@ #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 msgid "Open Visible..." -msgstr "Avaa näkyvä..." +msgstr "Avaa näkymään osuvat..." #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 @@ -5388,5 +5482,6 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169 -msgid "Header contains several values and cannot be mapped to a single string" +msgid "" +"Header contains several values and cannot be mapped to a single string" msgstr "" @@ -5738,5 +5833,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69 -msgid "Maximum number of segments allowed in each generated way. Default 250." +msgid "" +"Maximum number of segments allowed in each generated way. Default 250." msgstr "" "Suurin sallittu yhteyksien määrä kussakin luodussa polussa. Oletusarvo on " @@ -5761,6 +5857,7 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72 msgid "" -"Accuracy of Douglas-Peucker line simplification, measured in degrees." -"
          Lower values give more nodes, and more accurate lines. Default 0.0003." +"Accuracy of Douglas-Peucker line simplification, measured in " +"degrees.
          Lower values give more nodes, and more accurate lines. Default " +"0.0003." msgstr "" "Douglas-Peucker-yksinkertaistamisen tarkkuus asteina.
          Pienemmät arvot " @@ -6391,4 +6488,5 @@ msgid "Validate that property keys are valid checking against list of words." msgstr "" +"Tarkista ominaisuuksien avaimet vertaamalla tunnettujen avainten listaan." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:438 @@ -6408,7 +6506,11 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:509 msgid "" -"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." -"org/index.php/User:JLS/speller) or tag checking data files." -msgstr "" +"The sources (URL or filename) of spell check (see " +"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking " +"data files." +msgstr "" +"Oikeinkirjoitustarkistimen ja ominaisuustarkistimen sääntötiedostot (URL-" +"osoite tai tiedostonimi) (lisätietoja " +"http://wiki.openstreetmap.org/index.php/User:JLS/speller )" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:510 @@ -6515,5 +6617,6 @@ #: ../plugins/livegps/livegps/LiveGpsPlugin.java:41 msgid "Connect to gpsd server and show current position in LiveGPS layer." -msgstr "Kytkeydy gpsd-palvelimeen ja näytä nykyinen sijainti LiveGPS-tasossa." +msgstr "" +"Kytkeydy gpsd-palvelimeen ja näytä nykyinen sijainti LiveGPS-tasossa." #: ../plugins/livegps/livegps/LiveGpsPlugin.java:53 @@ -6633,5 +6736,6 @@ #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:48 msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!" -msgstr "Surveyor-liitännäinen ei löytänyt tarvitsemaansa LiveGPS-liitännäistä!" +msgstr "" +"Surveyor-liitännäinen ei löytänyt tarvitsemaansa LiveGPS-liitännäistä!" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:61 @@ -6867,6 +6971,6 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:40 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:43 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 #, java-format @@ -6874,18 +6978,29 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:51 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:55 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 msgid "Contacting WMS Server..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157 msgid "Create buildings" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 msgid "CadastreGrabber: Illegal url." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +msgid "" +"To avoid cadastre WMS overload,\n" +"building import size is limited to 1 km2 max." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" @@ -6908,16 +7023,25 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:128 +msgid "Cadastre" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:139 +msgid "Auto sourcing" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164 +msgid "Invalid projection" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 +#, java-format +msgid "Change the projection to {0} first." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:169 msgid "" "To enable the cadastre WMS plugin, change\n" "the JOSM projection to Lambert and restart" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132 -msgid "Cadastre" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 -msgid "Auto sourcing" msgstr "" @@ -6990,6 +7114,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:43 msgid "" -"More than one WMS layer present.\n" -"Select one of them first, then retry." +"More than one WMS layer present\n" +"Select one of them first, then retry" msgstr "" @@ -6998,5 +7122,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136 #, java-format @@ -7006,13 +7130,13 @@ msgstr[1] "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61 msgid "Extract SVG ViewBox..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65 msgid "Extract best fitting boundary..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:120 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126 msgid "Create boundary" msgstr "" @@ -7048,15 +7172,15 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 msgid "Save WMS layer to file" msgstr "Tallenna WMS-taso tiedostoon" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "Load WMS layer from file" msgstr "Lataa WMS-taso tiedostosta" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -7064,5 +7188,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 msgid "File Format Error" msgstr "" @@ -7070,5 +7194,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 msgid "Error loading file" msgstr "Virhe ladattaessa tiedostoa" @@ -7094,52 +7218,53 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 msgid "Replace original background by JOSM background color." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30 msgid "Reverse grey colors (for black backgrounds)." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 msgid "Set background transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34 msgid "Draw boundaries of downloaded data." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Enable automatic caching." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:53 -msgid "" -"A special handler of the french cadastre wms at www.cadastre.gouv." -"fr

          Please read the Terms and Conditions of Use here (in french): " -"
          http://www.cadastre.gouv.fr/scpc/html/" -"CU_01_ConditionsGenerales_fr.html
          before any upload of data created " -"by this plugin." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:58 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:55 +msgid "" +"A special handler of the french cadastre wms at " +"www.cadastre.gouv.fr

          Please read the Terms and Conditions of Use here " +"(in french):
          " +"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " +"
          before any upload of data created by this plugin." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -7147,26 +7272,40 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 -msgid "" -"Invert the original texts from black to white (and all intermediate greys)." +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +msgid "" +"Invert the original black and white colors (and all intermediate greys). " +"Useful for texts on dark backgrounds." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 +msgid "Allows multiple layers stacking" msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 -msgid "Allows multiple layers stacking" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:99 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:113 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 msgid "Image grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:162 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:125 +msgid "Grab smaller images (higher quality but use more memory)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +msgid "Fixed size square (default is 100m)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +msgid "Fixed size (from 25 to 1000 meters)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -7240,4 +7379,6 @@ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." msgstr "" +"TÄMÄ ON KOKEELLINEN. Tallenna työsi ja tarkista lopputulos ennen " +"lähettämistä." #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125 @@ -7279,5 +7420,5 @@ msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:254 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:255 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -7423,7 +7564,7 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:203 msgid "" -"Take a photo of your GPS receiver while it displays the time." -"
          Display that photo here.
          And then, simply capture the time you read " -"on the photo and select a timezone
          " +"Take a photo of your GPS receiver while it displays the " +"time.
          Display that photo here.
          And then, simply capture the time you " +"read on the photo and select a timezone
          " msgstr "" "Ota kuva GPS-vastaanottimesi kellonäytöstä.
          Valitse tähän ottamasi " @@ -7492,5 +7633,6 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:484 -msgid "I can take a picture of my GPS receiver.
          Can this help?" +msgid "" +"I can take a picture of my GPS receiver.
          Can this help?" msgstr "" @@ -7534,5 +7676,5 @@ msgstr "Virheellinen aikavyöhyke" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #, java-format msgid "" @@ -7541,14 +7683,14 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:579 msgid "Invalid offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:641 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:643 #, java-format msgid "Found {0} matchs of {1} in GPX track {2}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:642 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:644 msgid "GPX Track loaded" msgstr "" @@ -7556,68 +7698,82 @@ #: ../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/UploadDataGui.java:79 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 msgid "Upload Traces" -msgstr "" +msgstr "Lähetä jäljet" #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 msgid "Uploads traces to openstreetmap.org" +msgstr "Lähettää jäljet openstreetmap.org:iin" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71 +msgid "Upload Trace" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +msgid "Public" msgstr "" #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 -msgid "Upload GPX track" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -msgid "Public" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 msgid "Selected makes your trace public in openstreetmap.org" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Description" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:123 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 msgid "Tags" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:182 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:153 +#, java-format +msgid "Selected track: {0}" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:176 msgid "Connecting..." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 -msgid "Uploading GPX track..." -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:214 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:199 +msgid "Upload cancelled" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:209 +msgid "Error while uploading" +msgstr "Virhe lähetettäessä" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:227 -msgid "Error while uploading" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:235 +msgstr "GPX-jäljen lähetys onnistui" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +msgid "Upload failed. Server returned the following message: " +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 +#, java-format +msgid "Uploading GPX track: {0}% ({1} of {2})" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:252 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:241 +msgstr "GPX-tasoa ei valittuna. Ei voida lähettää jälkeä." + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:244 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" -msgstr "" +msgstr "Lähetetään GPX-jälkeä" #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67 @@ -7836,15 +7992,15 @@ msgstr "Automaattinen lataus" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -7853,17 +8009,17 @@ "resoluutiota" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:232 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241 msgid "Change resolution" msgstr "Vaihda resoluutiota" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:253 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:264 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:271 msgid "Alpha channel" msgstr "" @@ -7964,5 +8120,5 @@ #: trans_style.java:133 trans_style.java:140 msgid "bridge" -msgstr "" +msgstr "silta" #: trans_style.java:112 trans_style.java:147 trans_style.java:154 @@ -8074,5 +8230,5 @@ #: trans_style.java:714 msgid "turningcircle" -msgstr "" +msgstr "kääntöympyrä" #: trans_style.java:722 trans_style.java:2822 trans_style.java:2823 @@ -8125,5 +8281,5 @@ #: trans_style.java:1042 msgid "subway" -msgstr "" +msgstr "metro" #: trans_style.java:1050 trans_style.java:1058 trans_style.java:1066 @@ -8137,5 +8293,5 @@ #: trans_style.java:1130 msgid "terminal" -msgstr "" +msgstr "terminaali" #: trans_style.java:1138 trans_style.java:1146 @@ -8262,5 +8418,5 @@ #: trans_style.java:2538 msgid "hotel" -msgstr "" +msgstr "hotelli" #: trans_style.java:2604 trans_style.java:2612 trans_style.java:2620 @@ -8278,5 +8434,5 @@ #: trans_style.java:2701 msgid "quarry" -msgstr "" +msgstr "louhos" #: trans_style.java:2709 @@ -8290,5 +8446,5 @@ #: trans_style.java:2733 msgid "forest" -msgstr "" +msgstr "talousmetsä" #: trans_style.java:2757 trans_presets.java:334 @@ -8339,5 +8495,5 @@ #: trans_style.java:2932 msgid "volcano" -msgstr "" +msgstr "tulivuori" #: trans_style.java:2940 trans_style.java:2948 trans_style.java:2964 @@ -8356,5 +8512,5 @@ #: trans_style.java:2980 msgid "wood" -msgstr "" +msgstr "metsä" #: trans_style.java:2988 trans_presets.java:1114 @@ -8374,5 +8530,5 @@ #: trans_style.java:3108 trans_style.java:3116 msgid "route" -msgstr "" +msgstr "reitti" #: trans_style.java:3126 trans_style.java:3134 trans_style.java:3142 @@ -8478,5 +8634,5 @@ #: trans_validator.java:51 msgid "cycleway with tag bicycle" -msgstr "" +msgstr "bicycle-merkitty pyörätie" #: trans_validator.java:52 @@ -9475,5 +9631,5 @@ #: trans_presets.java:869 msgid "Edit a Drawbridge" -msgstr "" +msgstr "Muokkaa laskusillan ominaisuuksia" #: trans_presets.java:880 @@ -9747,5 +9903,5 @@ #: trans_presets.java:1145 msgid "Ferry Route" -msgstr "" +msgstr "Lauttareitti" #: trans_presets.java:1147 @@ -9823,9 +9979,9 @@ #: trans_presets.java:1211 msgid "Ferry Terminal" -msgstr "" +msgstr "Lauttaterminaali" #: trans_presets.java:1213 msgid "Edit Ferry Terminal" -msgstr "" +msgstr "Muokkaa lauttaterminaalin ominaisuuksia" #: trans_presets.java:1217 @@ -11474,9 +11630,9 @@ #: trans_presets.java:2137 msgid "Address Interpolation" -msgstr "" +msgstr "Talonumeroiden interpolointilinja" #: trans_presets.java:2140 msgid "Edit address interpolation" -msgstr "" +msgstr "Muokkaa interpolointilinjaa" #: trans_presets.java:2142 @@ -12732,19 +12888,58 @@ msgstr "" +#~ msgid "Please select something from the conflict list." +#~ msgstr "Ole hyvä ja valitse jotain ristiriitalistasta" + #~ msgid "Please select objects for which you want to change properties." #~ msgstr "Ole hyvä ja valitse objektit, joiden ominaisuuksia haluat muokata." #~ msgid "" -#~ "This is the basic relation editor which allows you to change the " -#~ "relation's tags as well as the members. In addition to this we should " -#~ "have a smart editor that detects the type of relationship and limits your " -#~ "choices in a sensible way." +#~ "This is the basic relation editor which allows you to change the relation's " +#~ "tags as well as the members. In addition to this we should have a smart " +#~ "editor that detects the type of relationship and limits your choices in a " +#~ "sensible way." #~ msgstr "" -#~ "Tämä on yksinkertainen relaatiomuokkain, joka mahdollistaa relaation " -#~ "tagien ja jäsenien muokkauksen." +#~ "Tämä on yksinkertainen relaatiomuokkain, joka mahdollistaa relaation tagien " +#~ "ja jäsenien muokkauksen." + +#~ msgid "Upload this trace..." +#~ msgstr "Lähetä tämä jälki..." + +#~ msgid "" +#~ "This functionality has been added only recently. Please
          use with " +#~ "care and check if it works as expected." +#~ msgstr "" +#~ "Tämä toiminnallisuus on lisätty vasta lähiaikoina.
          Käytä sitä " +#~ "varoen ja tarkista, että se toimii odotetusti," + +#~ msgid "Upload track filtered by JOSM" +#~ msgstr "Lähetä JOSM:n käsittelemä jälki" + +#~ msgid "Upload raw file: " +#~ msgstr "Lähetä raakatiedosto: " + +#~ msgid "Description:" +#~ msgstr "Kuvaus:" + +#~ msgid "Tags (keywords in GPX):" +#~ msgstr "Tagit (avainsanat GPX-tiedostossa):" + +#~ msgid "GPX-Upload" +#~ msgstr "GPX-lähetys" + +#, java-format +#~ msgid "Upload raw file: {0}" +#~ msgstr "Lähetä raakatiedosto: {0}" + +#~ msgid "Tags:" +#~ msgstr "Tagit:" + +#~ msgid "Choose the hue for the track color by the velocity at that point." +#~ msgstr "Valitse jäljen värisävy nopeuden perusteella kussakin kohdassa." #~ msgid "Unknown type" #~ msgstr "Tuntematon tyyppi" +#, java-format #~ msgid "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..." #~ msgstr "Lähetetään {0} {1} (id: {2}) {3}% {4}/{5} ({6} jäljellä)..." @@ -12768,4 +12963,5 @@ #~ msgstr "Luonto" +#, java-format #~ msgid "Version: {0}
          Last change at {1}" #~ msgstr "Versio: {0}
          Viimeisin muutos: {1}" @@ -12780,4 +12976,5 @@ #~ msgstr "Surveyor -liitännäinen on poistettu käytöstä." +#, java-format #~ msgid "Version {0} - Last change at {1}" #~ msgstr "Versio {0} - Viimeisin muutos: {1}" @@ -12789,7 +12986,9 @@ #~ msgstr "Avaa reittipistetiedosto." +#, java-format #~ msgid "Data error: lat value \"{0}\" is out of bounds." #~ msgstr "Datavirhe: leveysaste \"{0}\" on rajojen ulkopuolella." +#, java-format #~ msgid "Data error: lon value \"{0}\" is out of bounds." #~ msgstr "Datavirhe: pituusaste \"{0}\" on rajojen ulkopuolella." @@ -12800,2 +12999,5 @@ #~ msgid "Download \"Message of the day\"" #~ msgstr "Ladataan \"Päivän viestiä\"" + +#~ msgid "Upload GPX track" +#~ msgstr "Lähetä GPX-jälki" Index: /applications/editors/josm/i18n/po/fr.po =================================================================== --- /applications/editors/josm/i18n/po/fr.po (revision 13832) +++ /applications/editors/josm/i18n/po/fr.po (revision 13833) @@ -6,6 +6,6 @@ "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-15 22:03+0100\n" -"PO-Revision-Date: 2009-02-15 20:17+0000\n" +"POT-Creation-Date: 2009-02-21 16:35+0100\n" +"PO-Revision-Date: 2009-02-22 11:28+0000\n" "Last-Translator: nin2jardin \n" "Language-Team: Fr\n" @@ -14,8 +14,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2009-02-15 20:41+0000\n" +"X-Launchpad-Export-Date: 2009-02-22 20:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 #, java-format msgid "" @@ -28,5 +28,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 msgid "" "This action will have no shortcut.\n" @@ -36,5 +36,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -45,5 +45,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "" @@ -55,17 +55,17 @@ #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 msgid "Information" -msgstr "Informations" - -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +msgstr "Information" + +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Do nothing" msgstr "Ne rien faire" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Report Bug" -msgstr "Signaler un bug" - -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60 +msgstr "Signaler une erreur" + +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 msgid "" "An unexpected exception occurred.\n" @@ -74,21 +74,20 @@ "version of JOSM, please consider being kind and file a bug report." msgstr "" -"Une exception inattendue s'est produite.\n" +"Une erreur exceptionnelle s'est produite.\n" "\n" -"Celle-ci est due à une erreur de programmation et non à une erreur de votre " -"part. Si vous utilisez la dernière\n" -"version de JOSM, et afin d'améliorer celle-ci, merci de remplir un rapport " -"de bogue." - -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63 +"Ceci est toujours une erreur de programmation. Si vous utilisez la dernière\n" +"version de JOSM, et afin d'améliorer celle-ci, merci de nous fournir un " +"rapport d'erreur." + +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Unexpected Exception" msgstr "Exception inattendue" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 #, java-format msgid "Please report a ticket at {0}" -msgstr "Veuillez rapporter un incident à {0}" - -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 +msgstr "Veuillez rapporter un billet à {0}" + +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" @@ -96,5 +95,5 @@ "que possible) !" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:78 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -104,9 +103,9 @@ "rapporter un bogue." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Be sure to include the following information:" msgstr "Soyez sûr(e) d'inclure l'information suivante :" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75 msgid "(The text has already been copied to your clipboard.)" msgstr "(Ce texte a déjà été copié dans votre presse-papier.)" @@ -120,5 +119,5 @@ msgstr "Erreur lors de la lecture du son" -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:94 @@ -126,5 +125,5 @@ msgstr "Contact du serveur OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:48 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:32 @@ -132,6 +131,6 @@ msgstr "Téléchargement des données OSM..." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 msgid "NullPointerException, possibly some missing tags." msgstr "" @@ -139,5 +138,5 @@ "manquantes." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83 msgid "Preparing data..." msgstr "Préparation des données..." @@ -145,5 +144,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." -msgstr "Erreur pendant l’analyse." +msgstr "Erreur pendant l’analyse syntaxique." #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:62 @@ -167,52 +166,52 @@ msgstr "Téléchargement des points {0} à {1}..." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:164 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:168 msgid "Unknown version" msgstr "Version inconnue" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 msgid "Found element in non-way." msgstr "Élément trouvé sur un non-chemin." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 msgid " has zero ref" msgstr " n’a pas de ref" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 msgid "Found element in non-relation." msgstr "Élément trouvé dans une non-relation." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:252 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250 msgid "Incomplete specification with ref=0" msgstr "Champ incomplet avec ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294 msgid "Illegal object with id=0" msgstr "L’objet avec l’id=0 est illégal" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Attribut requis manquant \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 #, java-format msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" msgstr "Chemin ignoré car il contient un nœud inexistant : {0}\n" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:502 msgid "Prepare OSM data..." msgstr "Préparation des données de OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:518 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:516 msgid "Ill-formed node id" msgstr "id du nœud mal formé" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:280 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:287 msgid "Parse error: invalid document structure for gpx document" msgstr "" -"Erreur de traitement : la structure du document n’est pas valide pour un " -"document gpx" +"Erreur d'analyse syntaxique : la structure du document n’est pas valide pour " +"un document gpx" #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:27 @@ -220,18 +219,18 @@ msgstr "Contact du serveur..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Fournissez un bref comentaire aux changements que vous envoyez :" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118 +msgstr "Fournissez un bref commentaire aux changements que vous envoyez :" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 msgid "Commit comment" -msgstr "Commentaire du commit" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 +msgstr "Commentaire sur cette déposition" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" msgstr "{0}% ({1}/{2}), {3} restant(s). Chargement de {4}: {5} (id: {6})" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64 @@ -241,34 +240,32 @@ msgstr "Une erreur est survenue : {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:192 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190 msgid "Opening changeset..." msgstr "Ouverture de la révision..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:226 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224 msgid "Server does not support changesets" msgstr "Le serveur ne supporte pas les révisions" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:246 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:428 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:609 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:184 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607 msgid "Unknown host" msgstr "Hôte inconnu" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282 msgid "Preparing..." msgstr "Préparation en cours..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:294 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292 msgid "Uploading..." msgstr "Envoi en cours..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375 msgid "Closing changeset..." msgstr "Fermeture de la révision..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:652 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650 msgid "Transfer aborted due to error (will wait for 5 seconds):" msgstr "Le transfert a été interrompu sur erreur (attente de 5 secondes) :" @@ -306,17 +303,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95 #: ../core/src/org/openstreetmap/josm/Main.java:348 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:29 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 @@ -329,11 +329,11 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:110 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -345,14 +345,14 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 msgid "Aborting..." -msgstr "Échec..." +msgstr "Interruption en cours..." #: ../core/src/org/openstreetmap/josm/Main.java:186 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 msgid "Creating main GUI" -msgstr "Création de l’environnement graphique (GUI)" +msgstr "Création de l’interface graphique d'utilisateur (GUI)" #: ../core/src/org/openstreetmap/josm/Main.java:195 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:271 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:278 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:56 msgid "Help" @@ -362,5 +362,6 @@ msgid "The projection could not be read from preferences. Using EPSG:4326" msgstr "" -"La projection ne peut être lue dans les préférences. Utilisation de EPSG:4326" +"La projection n'a pas pu être lue dans les préférences. Utilisation de " +"EPSG:4326" #: ../core/src/org/openstreetmap/josm/Main.java:345 @@ -373,11 +374,11 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 msgid "Unsaved Changes" -msgstr "Changements non sauvegardés" +msgstr "Modifications non enregistrées" #: ../core/src/org/openstreetmap/josm/Main.java:347 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "" -"Des modifications n'ont pas été sauvegardées. Annuler les modifications et " -"continuer ?" +"Il existe des modifications qui n'ont pas été sauvegardées. Ecarter les " +"modifications et continuer ?" #: ../core/src/org/openstreetmap/josm/Main.java:348 @@ -399,21 +400,21 @@ msgstr "Ignore le fichier malformé d’URL : \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109 msgid "min lat" msgstr "lat min" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111 msgid "min lon" msgstr "lon min" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:117 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "max lat" msgstr "lat max" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 msgid "max lon" msgstr "lon max" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:122 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -423,5 +424,5 @@ "télécharger la zone)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:134 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130 msgid "Bounding Box" msgstr "Zone de délimitation" @@ -439,9 +440,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 msgid "Please enter a search string" -msgstr "Veuillez saisir une chaîne de recherche" +msgstr "Veuillez saisir une chaîne de caractères pour la recherche" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 msgid "Cannot read place search results from server" -msgstr "Impossible de lire les résultats de recherche depuis le serveur" +msgstr "" +"Impossible de lire les résultats de recherche du lieu depuis le serveur" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206 @@ -452,11 +454,11 @@ #: trans_presets.java:2554 msgid "Places" -msgstr "Toponymie" +msgstr "Lieux/endroits" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:96 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:894 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:956 msgid "name" msgstr "nom" @@ -489,5 +491,5 @@ msgstr "zoom" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:107 msgid "" "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -497,5 +499,5 @@ "bouton droit de souris enfoncé et déplacer la souris. Sélection : Clic" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:109 msgid "Slippy map" msgstr "Carte glissante" @@ -506,7 +508,7 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:605 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:602 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:89 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -526,5 +528,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380 msgid "Remove" msgstr "Supprimer" @@ -553,9 +555,9 @@ #: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84 msgid "Tile Numbers" -msgstr "Numéros des dalles" +msgstr "Numéros des tuiles" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Data Sources and Types" -msgstr "Sources de données et types" +msgstr "Sources et types de données" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:143 @@ -582,5 +584,6 @@ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." msgstr "" -"Vous pouvez utiliser la souris ou Ctrl+flèches pour zoomer et se déplacer." +"Vous pouvez utiliser la souris ou les boutons Ctrl+flèches pour zoomer et " +"faire glisser." #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104 @@ -615,5 +618,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "Upload the current preferences to the server" -msgstr "Charger les préférences courantes vers le serveur" +msgstr "Charger les préférences actuelles vers le serveur" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 @@ -621,13 +624,13 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "string" -msgstr "texte" +msgstr "chaîne de caractères" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." -msgstr "Nom de l’utilisateur" +msgstr "Nom de l’utilisateur." #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." -msgstr "Mot de passe OSM" +msgstr "Mot de passe OSM." #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 @@ -655,6 +658,6 @@ "lat=y&lon=x&zoom=z or a filename" msgstr "" -"Télécharger comme données GPS brutes. Peut être sous la forme x1,y1,x2," -"y2·un·URL·contenant·lat=y&lon=x&zoom=z ou un nom de fichier." +"Télécharger comme données GPS brutes. Peut être sous la forme " +"x1,y1,x2,y2·un·URL·contenant·lat=y&lon=x&zoom=z ou un nom de fichier." #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 @@ -663,6 +666,6 @@ "URL which returns osm-xml" msgstr "" -"Les ajoute tous à la sélection initale. Cela peut être un texte de recherche " -"comme pour Google ou un URL retournant du osm-xml" +"Les ajoute chacuns à la sélection initale. Cela peut être une chaîne de " +"caractères comme pour Google ou un URL retournant du osm-xml" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 @@ -675,20 +678,20 @@ "Si spécifié, rétablir la configuration par défaut au lieu de lire ceci." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:109 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:186 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:198 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:108 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:191 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:203 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 msgid "Java OpenStreetMap Editor" msgstr "Java OpenStreetMap Editor" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:111 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:110 msgid "Message of the day not available" msgstr "Message du jour non disponible" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:200 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:205 msgid "Downloading \"Message of the day\"" msgstr "Téléchargement du \"Message du jour\"" @@ -714,9 +717,9 @@ #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94 msgid "Move up" -msgstr "Monter d'un niveau" +msgstr "Déplacer vers le haut" #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99 msgid "Move down" -msgstr "Descendre d'un niveau" +msgstr "Déplacer vers le bas" #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104 @@ -728,46 +731,46 @@ msgstr "Zoom arrière" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:234 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:474 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:512 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:383 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:380 msgid "More information about this feature" -msgstr "Plus d'informations à propos de cette fonctionnalité" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:393 +msgstr "Plus d'informations à propos de cette particularité" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:390 msgid "Optional Attributes:" -msgstr "Attributs optionnels" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:437 +msgstr "Attributs optionnels:" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Utiliser l’étiquette prédéfinie \"{0}\" du groupe \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:438 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:435 #, java-format msgid "Use preset ''{0}''" msgstr "Utiliser l’étiquette prédéfinie \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 msgid "way" msgid_plural "ways" -msgstr[0] "chemin" -msgstr[1] "chemins" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +msgstr[0] "voie" +msgstr[1] "voies" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:214 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 msgid "node" msgid_plural "nodes" @@ -775,6 +778,6 @@ msgstr[1] "nœuds" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:81 @@ -784,14 +787,14 @@ msgstr[1] "relations" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 msgid "closedway" msgstr "voie sans issue" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:475 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 #, java-format msgid "Unknown type: {0}" msgstr "Type inconnu : {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:549 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 #, java-format @@ -799,15 +802,15 @@ msgstr "Impossible de lire la source des étiquettes prédéfinies : {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:555 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 #, java-format msgid "Error parsing {0}: " msgstr "Erreur de traitement {0} : " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:572 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:569 #, java-format msgid "Elements of type {0} are supported." -msgstr "Les éléments de type {0} sont supportés." - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +msgstr "Les éléments de type {0} sont avalisés." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595 #, java-format msgid "Change {0} object" @@ -816,9 +819,17 @@ msgstr[1] "Changer {0} objets." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 msgid "Nothing selected!" msgstr "Rien n'est sélectionné !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 +msgid "Selection unsuitable!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +msgid "Apply Preset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 msgid "Change Properties" msgstr "Changer les propriétés" @@ -829,14 +840,14 @@ msgstr "Groupe d’étiquettes prédéfinies \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:107 msgid "File" msgstr "Fichier" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:135 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:107 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:86 @@ -848,22 +859,22 @@ msgstr "Édition" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 msgid "View" msgstr "Affichage" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:26 msgid "Tools" msgstr "Outils" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:141 msgid "Audio" msgstr "Audio" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:142 msgid "Presets" msgstr "Prédéfinis" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:40 @@ -875,18 +886,18 @@ msgstr "Menu : {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:210 msgid "Wireframe View" msgstr "Vue avec couleurs et icônes" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212 msgid "Toggle Wireframe view" msgstr "Passer à la vue \"fil de fer\"" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:28 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 msgid "Contacting the OSM server..." msgstr "Contact du serveur OSM..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 #, java-format msgid "This will change up to {0} object." @@ -895,11 +906,11 @@ msgstr[1] "Cela modifiera {0} objets maximum." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 msgid "An empty value deletes the key." msgstr "Une valeur vide supprime la clé." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66 @@ -909,7 +920,7 @@ msgstr "Clé" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 @@ -918,10 +929,10 @@ msgstr "Valeur" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333 msgid "Change values?" msgstr "Changer les valeurs ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:257 #, java-format msgid "Change properties of up to {0} object" @@ -930,33 +941,34 @@ msgstr[1] "Modifier les propriétés de {0} objets maximum." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 msgid "Please select a key" -msgstr "Sélectionner une clé" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322 +msgstr "Veuillez sélectionner une clé" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321 msgid "Please select a value" -msgstr "Sélectionner une valeur" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +msgstr "Veuillez sélectionner une valeur" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:445 msgid "Please select the objects you want to change properties for." -msgstr "Sélectionner les objets dont vous voulez changer les propriétés." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +msgstr "" +"Veuillez sélectionner les objets dont vous voulez changer les propriétés." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 msgid "Properties/Memberships" msgstr "Propriétés/Appartenances" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 msgid "Properties for selected objects." msgstr "Propriétés des objets sélectionnés." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97 @@ -968,58 +980,58 @@ msgstr "Bascule: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 msgid "Member Of" msgstr "Membre de" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Role" msgstr "Rôle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:559 msgid "Change relation" msgstr "Changer la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560 #, java-format msgid "Really delete selection from relation {0}?" -msgstr "Supprimer la sélection de la relation {0} ?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +msgstr "Supprimer vraiment la sélection de la relation {0} ?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 msgid "Delete from relation" msgstr "Supprimer de la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:600 msgid "Add Properties" msgstr "Ajouter des Propriétés" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 +msgid "Add a new key/value pair to all objects" +msgstr "Ajouter une nouvelle paire clé/valeur à tous les objets" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 -msgid "Add a new key/value pair to all objects" -msgstr "Ajouter un nouveau couple clé/valeur à tous les objets" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609 msgid "Edit Properties" msgstr "Éditer les propriétés" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609 msgid "Edit the value of the selected key for all objects" msgstr "Éditer la valeur de la clé selectionnée pour tous les objets" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 msgid "Delete Properties" msgstr "Supprimer les propriétés" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:77 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:293 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 @@ -1028,98 +1040,117 @@ msgstr "Supprimer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 msgid "Delete the selected key in all objects" msgstr "Supprimer la clé sélectionnée de tous les objets" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:763 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Propriétés : {0} / Appartenances : {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:769 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 msgid "Properties / Memberships" msgstr "Propriétés / Appartenances" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178 +msgid "Apply Changes" +msgstr "Appliquer les modifications" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 msgid "Create new relation" msgstr "Créer une nouvelle relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208 msgid "Edit new relation" msgstr "Éditer une nouvelle relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209 #, java-format msgid "Edit relation #{0}" msgstr "Editer la relation #{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230 +msgid "Basic" +msgstr "Basique" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Occupied By" msgstr "Occupé par" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311 msgid "Tags (empty value deletes tag)" msgstr "Étiquettes (une valeur vide supprime l’étiquette)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313 msgid "Members" msgstr "Membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 +msgid "Move Up" +msgstr "Déplacer vers le haut" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 msgid "Move the currently selected members up" msgstr "Déplacer les membres sélectionnés vers le haut" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358 +msgid "Add Selected" +msgstr "Ajouter la sélection" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359 +msgid "Add all currently selected objects as members" +msgstr "Ajouter les objets sélectionnés en tant que membres" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365 +msgid "Remove Selected" +msgstr "Supprimer la sélection" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366 +msgid "Remove all currently selected objects from relation" +msgstr "Retirer tous les objets sélectionnés de la relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 +msgid "Move Down" +msgstr "Déplacer vers le bas" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 msgid "Move the currently selected members down" msgstr "Déplacer les membres sélectionnés vers le bas" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356 -msgid "Add Selected" -msgstr "Ajouter la sélection" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:357 -msgid "Add all currently selected objects as members" -msgstr "Ajouter les objets sélectionnés en tant que memebres" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:363 -msgid "Remove Selected" -msgstr "Supprimer la sélection" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:364 -msgid "Remove all currently selected objects from relation" -msgstr "Retirer tous les objets sélectionnés de la relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381 msgid "Remove the member in the current table row from this relation" -msgstr "Supprimer le membre de la ligne actuelle de cette relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:405 +msgstr "" +"Supprimer le membre de cette relation de l'entrée actuelle de la table" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394 msgid "Download Members" msgstr "Télécharger les membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:406 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395 msgid "Download all incomplete ways and nodes in relation" -msgstr "Télécharger tous les chemins et les nœuds incomplets dans la relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:415 -msgid "Basic" -msgstr "Basique" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:457 +msgstr "" +"Télécharger tous les chemins et les nœuds incomplets dans la relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:453 #, java-format msgid "Members: {0}" msgstr "Membres : {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:587 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:461 +#, java-format +msgid "Relation Editor: {0}" +msgstr "Editeur de relation : {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:585 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 msgid "There were conflicts during import." -msgstr "Il y a eu des conflits pendant l’import." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:595 +msgstr "Il y a eu des conflits pendant l’importation." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593 msgid "Error parsing server response." msgstr "Erreur d'analyse de la réponse du serveur" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:600 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:594 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:598 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -1133,9 +1164,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:345 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 msgid "Error" msgstr "Erreur" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:599 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597 msgid "Cannot connect to server." msgstr "Impossible de se connecter au serveur." @@ -1143,5 +1174,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87 msgid "Click Reload to refresh list" -msgstr "Cliquer sur Recharger pour rafraichir la liste" +msgstr "Cliquer sur Recharger pour rafraîchir la liste" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:90 @@ -1152,5 +1183,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:90 msgid "Display the history of all selected items." -msgstr "Afficher l’historique des objets sélectionnés." +msgstr "Afficher l’historique de tous less articles sélectionnés." #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:102 @@ -1172,9 +1203,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:128 msgid "Reload all currently selected objects and refresh the list." -msgstr "Recharger les objets sélectionnés et rafraichir la liste." +msgstr "" +"Recharger les objets actuellement sélectionnés et rafraîchir la liste." #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:134 msgid "Revert" -msgstr "Reverter" +msgstr "Rétablir" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135 @@ -1183,6 +1215,6 @@ "in the history list." msgstr "" -"Rétablir l’état des objets sélectionnés à la version sélectionnée dans " -"l’historique." +"Rétablir l’état des objets actuellement sélectionnés à la version " +"préalablement sélectionnée dans la liste de l’historique." #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:137 @@ -1232,5 +1264,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 msgid "Delete the selected layer." -msgstr "Supprimer la couche sélectionnée." +msgstr "Supprimer le calque sélectionné." #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80 @@ -1241,9 +1273,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 msgid "Delete Layer" -msgstr "Supprimer la couche" +msgstr "Supprimer le calque" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 msgid "Do you really want to delete the whole layer?" -msgstr "Voulez-vous vraiment supprimer la couche complète ?" +msgstr "Voulez-vous vraiment supprimer la totalité du calque ?" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103 @@ -1253,5 +1285,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104 msgid "Toggle visible state of the selected layer." -msgstr "Change la visibilité du calque sélectionné." +msgstr "Bascule l'état de visibilité du calque sélectionné." #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123 @@ -1261,5 +1293,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 msgid "Toggle visible state of the marker text and icons." -msgstr "Afficher l'état des marqueurs sous forme de texte ou d'icônes." +msgstr "Bascule l'état de visibilté du marqueur de texte et d'icônes." #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 @@ -1267,17 +1299,17 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 msgid "Layers" -msgstr "Couches" +msgstr "Calques" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 msgid "Open a list of all loaded layers." -msgstr "Ouvrir une liste de toutes les couches chargées." +msgstr "Ouvrir une liste de tous les calques chargés." #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:250 msgid "Move the selected layer one row up." -msgstr "Déplacer la couche sélectionnée un étage au-dessus." +msgstr "Déplacer le calque sélectionné un niveau vers le haut." #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:253 msgid "Move the selected layer one row down." -msgstr "Déplacer la couche sélectionnée un étage en-dessous." +msgstr "Déplacer le calque sélectionné un niveau vers le bas." #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 @@ -1289,5 +1321,5 @@ #, java-format msgid "Layers: {0}" -msgstr "Couches : {0}" +msgstr "Calques: {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 @@ -1298,8 +1330,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 msgid "Open a selection list window." -msgstr "Afficher une liste de la sélection" +msgstr "Ouvrir une fenêtre de liste de sélection." #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:94 @@ -1309,5 +1341,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 msgid "" @@ -1323,5 +1355,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 msgid "Refresh the selection list." -msgstr "Actualiser la liste de sélection" +msgstr "Actualiser la liste de sélection." #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 @@ -1333,5 +1365,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40 msgid "Search for objects." -msgstr "Rechercher des objets" +msgstr "Rechercher des objets." #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 @@ -1352,6 +1384,6 @@ msgid "{0} way" msgid_plural "{0} ways" -msgstr[0] "{0} chemin" -msgstr[1] "{0} chemins" +msgstr[0] "{0} voie" +msgstr[1] "{0} voies" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323 @@ -1375,16 +1407,24 @@ msgstr "Sélection : {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +msgid "Open an editor for the selected relation" +msgstr "Ouvrir un éditeur pour la relation sélectionnée" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +msgid "Delete the selected relation" +msgstr "Supprimer la relation sélectionnée" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 #: trans_presets.java:2904 msgid "Relations" msgstr "Relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 msgid "Open a list of all relations." msgstr "Ouvrir une liste de toutes les relations." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 @@ -1392,17 +1432,9 @@ msgstr "Nouveau" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 msgid "Create a new relation" msgstr "Créer une nouvelle relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open an editor for the selected relation" -msgstr "Ouvrir un éditeur pour la relation sélectionnée" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -msgid "Delete the selected relation" -msgstr "Supprimer la relation sélectionnée" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:130 #, java-format msgid "Relations: {0}" @@ -1423,5 +1455,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 msgid "Open a list of all commands (undo buffer)." -msgstr "Ouvrir une liste de toutes les commandes (annuler le buffer)" +msgstr "Ouvrir une liste de toutes les commandes (tampon d'annulation)." #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63 @@ -1430,50 +1462,51 @@ msgstr "Pile de commande : {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +msgid "Resolve" +msgstr "Résoudre" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +msgid "Open a merge dialog of all selected items in the list above." +msgstr "" +"Ouvrir une une fenêtre de fusion de tous les éléments sélectionnés dans la " +"liste ci-dessus." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Conflict" msgstr "Conflit" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 msgid "Merging conflicts." msgstr "Gérer les conflits" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67 -msgid "Resolve" -msgstr "Résoudre" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:68 -msgid "Open a merge dialog of all selected items in the list above." -msgstr "" -"Ouvrir une une fenêtre de fusion des éléments sélectionnés dans cette liste." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:105 -msgid "Please select something from the conflict list." -msgstr "Sélectionnez un élément de la liste des conflits." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Resolve Conflicts" msgstr "Résoudre les conflits" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +msgid "Solve Conflict" +msgstr "Résoudre le conflit" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 #, java-format msgid "Conflicts: {0}" msgstr "Conflits : {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Conflicts" msgstr "Conflits" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 msgid "conflict" msgstr "le conflit" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 msgid "background" -msgstr "arrière plan" +msgstr "arrière-plan" #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151 @@ -1495,5 +1528,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 msgid "Customize Color" @@ -1501,5 +1534,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1509,5 +1542,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1516,5 +1549,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:326 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:152 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -1534,5 +1567,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:265 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 #, java-format msgid "Audio synchronized at point {0}." @@ -1540,7 +1573,7 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232 msgid "Unable to synchronize in layer being played." -msgstr "Impossible de synchroniser la couche avec ce qui est actuellemnt lu." +msgstr "Impossible de synchroniser dans le calque actuellemnt lu." #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 @@ -1558,8 +1591,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 msgid "No existing audio markers in this layer to offset from." -msgstr "Aucun marqueur audio existant pour cette couche." +msgstr "" +"Il n'existe pas de marqueurs audio dans ce calque pour y appliquer un " +"décalage ." #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:958 msgid "desc" msgstr "desc" @@ -1579,7 +1614,7 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "Error displaying URL" -msgstr "Impossible d'afficher l'URL" - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203 +msgstr "Erreur à l'affichage de l'URL" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -1589,5 +1624,5 @@ "piste de lecture que vous lisiez." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -1597,18 +1632,18 @@ "marqueur audio ou sur le point de la trace où vous voulez synchroniser." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224 msgid "Unable to create new audio marker." msgstr "Impossible de créer un nouveau marqueur audio." #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 msgid "Convert to data layer" -msgstr "Convertir en un couche de données" +msgstr "Convertir en calque de données" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:725 -msgid "" -"Upload of unprocessed GPS data as map data is considered harmful." -"
          If you want to upload traces, look here:" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:645 +msgid "" +"Upload of unprocessed GPS data as map data is considered " +"harmful.
          If you want to upload traces, look here:" msgstr "" "L’envoi de données GPS non mises en forme comme données
          sur la " @@ -1617,66 +1652,22 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:646 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:747 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:448 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:667 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "Converted from: {0}" msgstr "Converti depuis: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612 -msgid "Upload this trace..." -msgstr "Charger cette trace..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:616 -msgid "" -"This functionality has been added only recently. Please
          use with " -"care and check if it works as expected." -msgstr "" -"Cette fonctionnalité n’a été ajoutée que récemment. À " -"utiliser
          prudemment et vérifier si cela marche comme attendu." - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:102 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:107 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:626 -msgid "Upload track filtered by JOSM" -msgstr "Envoi des traces filtrées par JOSM" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:103 -#, java-format -msgid "Upload raw file: {0}" -msgstr "Envoi du fichier brut : {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:108 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:627 -msgid "Upload raw file: " -msgstr "Envoyer le fichier brut : " - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640 -msgid "Description:" -msgstr "Description :" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:123 -msgid "Tags:" -msgstr "Balises:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:129 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:648 -msgid "GPX-Upload" -msgstr "Envoi du GPX" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:229 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:217 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113 msgid "gps point" msgstr "point GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 #: trans_presets.java:1795 trans_presets.java:1801 trans_presets.java:1807 #: trans_presets.java:1813 trans_presets.java:1819 trans_presets.java:1825 @@ -1696,5 +1687,5 @@ msgstr[1] "traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 msgid "point" msgid_plural "points" @@ -1702,5 +1693,5 @@ msgstr[1] "points" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 #, java-format msgid "a track with {0} point" @@ -1709,12 +1700,12 @@ msgstr[1] "une trace avec {0} points" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} consists of {1} track" msgid_plural "{0} consists of {1} tracks" -msgstr[0] "{0} est consistué de {1} trace" -msgstr[1] "{0} est consistué de {1} traces" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +msgstr[0] "{0} est constitué de {1} trace" +msgstr[1] "{0} est constitué de {1} traces" + +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} point" @@ -1723,25 +1714,25 @@ msgstr[1] "{0} points" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117 msgid "Customize line drawing" msgstr "Personnaliser le dessin des lignes" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:296 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 msgid "Use global settings." msgstr "Utiliser les réglages généraux." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 msgid "Draw lines between points for this layer." msgstr "Dessiner des lignes entre les points pour ce calque." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:298 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123 msgid "Do not draw lines between points for this layer." msgstr "Ne pas dessiner de ligne entre les points pour ce calque." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:135 msgid "Select line drawing options" @@ -1767,5 +1758,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Import images" -msgstr "Import des images" +msgstr "Importer des images" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233 @@ -1775,5 +1766,5 @@ msgstr "images JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290 #, java-format msgid "{0} track, " @@ -1782,5 +1773,5 @@ msgstr[1] "{0} traces, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 #, java-format msgid "{0} route, " @@ -1789,5 +1780,5 @@ msgstr[1] "{0} chemins, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 #, java-format msgid "{0} waypoint" @@ -1796,55 +1787,51 @@ msgstr[1] "{0} chemins" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #, java-format msgid "Name: {0}" msgstr "Nom : {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "Description: {0}" msgstr "Description : {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 msgid "Timespan: " msgstr "Intervalle de temps : " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Length: " msgstr "Longueur : " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:642 -msgid "Tags (keywords in GPX):" -msgstr "Étiquettes (mots clés dans le GPX) :" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:655 msgid "time" msgstr "temps" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:780 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:679 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:700 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 msgid "Download from OSM along this track" msgstr "Télécharger depuis OSM le long de cette trace" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:686 msgid "Download everything within:" msgstr "Tout télécharger dans un rayon de :" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 #, java-format msgid "{0} meters" msgstr "{0} mètres" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:692 msgid "Maximum area per request:" -msgstr "Surface maximum par requête :" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775 +msgstr "Aire maximale par requête:" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 #, java-format msgid "{0} sq km" msgstr "{0} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787 #, java-format msgid "" @@ -1852,18 +1839,19 @@ "wish
          to continue?" msgstr "" -"Cette action nécessitera {0} demandes
          de téléchargement. Voulez-" -"vous
          continuer ?" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 +"Cette action nécessitera {0} demandes
          de téléchargement séparées. " +"Voulez-vous
          continuer ?" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:844 #, java-format msgid "Audio markers from {0}" msgstr "Marqueurs audio de {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 msgid "No GPX track available in layer to associate audio with." msgstr "" -"Aucune trace GPX disponible dans la couche à associer avec le fichier audio." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1049 +"Aucune trace GPX disponible dans le calque pour l'associer avec le fichier " +"audio." + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "" "Some waypoints with timestamps from before the start of the track were " @@ -1873,5 +1861,5 @@ "ont été omis." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -1928,5 +1916,5 @@ #, java-format msgid "current delta: {0}s" -msgstr "variation actuelle : {0}s" +msgstr "variation différentielle actuelle : {0}s" #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:360 @@ -1953,5 +1941,5 @@ #, java-format msgid "The date in file \"{0}\" could not be parsed." -msgstr "La date du fichier \"{0}\" ne peut pas être analysée." +msgstr "La date du fichier \"{0}\" n'a pas pu être analysée." #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:486 @@ -1970,32 +1958,32 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:495 msgid "GPS unit timezone (difference to photo)" -msgstr "Fuseau horaire du GPS (différence avec la photo)" +msgstr "Fuseau horaire de l'instrument GPS (différence avec la photo)" #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:503 msgid "Synchronize Time with GPS Unit" -msgstr "Synchroniser l’heure avec l’unité GPS" +msgstr "Synchroniser l’heure avec l’instrument GPS" #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:519 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:521 msgid "Time entered could not be parsed." -msgstr "L’heure indiquée ne peut être analysée." - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141 +msgstr "La date indiquée ne peut être analysée." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:140 msgid "outside downloaded area" msgstr "en dehors de la zone téléchargée" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 #, java-format msgid "{0} consists of:" msgstr "{0} est consistué de :" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:353 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:347 #, java-format msgid " ({0} deleted.)" msgstr " ({0} supprimés)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:445 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 msgid "Convert to GPX layer" -msgstr "Convertir en couche GPX" +msgstr "Convertir en calque GPX" #: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47 @@ -2021,37 +2009,37 @@ msgstr "Impossible d’écrire un marque-page." +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +msgid "The geographic longitude at the mouse pointer." +msgstr "La longitude géographique au niveau du pointeur de souris." + #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 -msgid "The geographic longitude at the mouse pointer." -msgstr "Longitude au niveau du pointeur de souris." - -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." -msgstr "Nom de l’objet au niveau du pointeur de souris." +msgstr "Le nom de l’objet au niveau du pointeur de souris." + +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +msgid "The geographic latitude at the mouse pointer." +msgstr "La latitude géographique au niveau du pointeur de souris." #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 -msgid "The geographic latitude at the mouse pointer." -msgstr "Latitude au niveau du pointeur de souris." +msgid "The angle between the previous and the current way segment." +msgstr "L'angle entre le segment de chemin précédent et l’actuel." #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 -msgid "The angle between the previous and the current way segment." -msgstr "Angle entre le segment de chemin précédent et l’actuel;" - -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The (compass) heading of the line segment being drawn." msgstr "L’orientation (boussole) du segment en train d’être dessiné." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The length of the new way segment being drawn." -msgstr "Longueur du nouveau segment du chemin étant actuellement dessiné." - -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:161 +msgstr "La longueur du nouveau segment du chemin étant actuellement dessiné." + +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:160 msgid "(no object)" -msgstr "(pas d'objet sélectionné)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:62 +msgstr "(aucun objet)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:56 msgid "Color" msgstr "Couleur" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:57 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107 #: trans_presets.java:56 trans_presets.java:92 trans_presets.java:130 @@ -2152,27 +2140,36 @@ msgstr "Nom" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:118 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:112 #, java-format msgid "Paint style {0}: {1}" msgstr "Style de rendu {0} : {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 msgid "Choose" msgstr "Choisir" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 +msgid "Please select a color." +msgstr "Veuillez sélectionner une couleur." + #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 -msgid "Please select a color." -msgstr "Sélectionner une couleur" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157 #, java-format msgid "Choose a color for {0}" msgstr "Choisir une couleur pour {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +msgid "Set to default" +msgstr "Mettre la valeur par défaut" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:172 +msgid "Set all to default" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:184 msgid "Colors used by different objects in JOSM." -msgstr "Couleurs utilisées par les différents objets de JOSM." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:171 +msgstr "Couleurs utilisées par les différents objets dans JOSM." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:198 msgid "Colors" msgstr "Couleurs" @@ -2184,5 +2181,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36 msgid "Login name (email) to the OSM account." -msgstr "Nom d’utilisateur (e-mail) de votre compte OSM." +msgstr "Nom d’utilisateur (e-mail) du compte OSM." #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37 @@ -2199,5 +2196,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41 msgid "OSM username (email)" -msgstr "Nom d’utilisateur OSM (e-mail)" +msgstr "Nom d’utilisateur OSM (courriel)" #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43 @@ -2207,7 +2204,7 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45 msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
          The password is transfered in plain text to the server, encoded in the " -"URL.
          Do not use a valuable Password." +"WARNING: The password is stored in plain text in the preferences " +"file.
          The password is transfered in plain text to the server, encoded in " +"the URL.
          Do not use a valuable Password." msgstr "" "ATTENTION : Le mot de passe est stocké en texte brut dans le fichier " @@ -2215,53 +2212,53 @@ "encodé dans l’URL.
          N’utilisez pas un mot de passe de valeur." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44 msgid "Sort presets menu" msgstr "Trier le menu Prédéfinis" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46 msgid "Enable built-in defaults" msgstr "Activer les propositions d’étiquettes par défaut" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:58 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69 msgid "Tagging preset source" msgstr "Source d'étiquette prédéfinie" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:156 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 msgid "Please select the row to edit." -msgstr "Sélectionnez l’étage à éditer." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81 +msgstr "Veuille sélectionnez la rangée à éditer." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 msgid "Please select the row to delete." -msgstr "Sélectionnez la ligne à supprimer." +msgstr "Veuillez sélectionnez la rangée à supprimer." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88 +msgid "" +"The sources (URL or filename) of tagging preset definition files. See " +"http://josm.openstreetmap.de/wiki/TaggingPresets for help." +msgstr "" +"Les sources (URL ou nom de fichier) des fichiers de définitions des " +"étiquettes prédéfinies. Voir " +"http://josm.openstreetmap.de/wiki/TaggingPresets pour plus d'informations" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89 -msgid "" -"The sources (URL or filename) of tagging preset definition files. See http://" -"josm.openstreetmap.de/wiki/TaggingPresets for help." -msgstr "" -"Les sources (URL ou nom de fichier) des fichiers de définitions des " -"étiquettes prédéfinies. Voir http://josm.openstreetmap.de/wiki/" -"TaggingPresets pour plus d'informations" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 msgid "Add a new tagging preset source to the list." msgstr "Ajouter une nouvelle étiquette à la liste de source prédéfinie" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 msgid "Delete the selected source from the list." msgstr "Supprimer la source sélectionnée de la liste." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:94 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93 msgid "Tagging Presets" msgstr "Etiquettes prédéfinies" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97 msgid "Tagging preset sources" msgstr "Sources des étiquettes prédéfinies" @@ -2269,14 +2266,14 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21 msgid "Keep backup files" -msgstr "Garder les fichiers de récupartion (backup)" +msgstr "Garder les fichiers de sauvegarde (backup)" #: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26 msgid "When saving, keep backup files ending with a ~" msgstr "" -"Lors de la sauvegarde, garder les fichiers de récupération (backup) se " +"Lors de la sauvegarde, garder les fichiers de sauvegarde (backup) se " "terminant par ~" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:141 @@ -2284,34 +2281,34 @@ msgstr "Greffons" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 msgid "Configure available plugins." msgstr "Configurer les greffons disponibles." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43 msgid "Download List" msgstr "Télécharger la liste" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:80 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51 msgid "Update" msgstr "Actualiser" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:60 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 msgid "Configure Sites..." msgstr "Configurer les sites..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add either site-josm.xml or Wiki Pages." -msgstr "Ajouter soit site-josm.xml soit Wiki Pages." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100 +msgstr "Ajouter soit site-josm.xml soit des pages Wiki." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99 msgid "Please select an entry." msgstr "Veuillez sélectionner une entrée." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 msgid "Configure Plugin Sites" msgstr "Configurer les sites de greffon." @@ -2328,5 +2325,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72 msgid "Show splash screen at startup" -msgstr "Montrer la page de garde au démarrage" +msgstr "Afficher l'écran de démarrage" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33 @@ -2353,9 +2350,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 msgid "Look and Feel" -msgstr "Apparence et comportement" +msgstr "Apparence et ressenti" #: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29 msgid "Enable proxy server" -msgstr "Activer le serveur proxy" +msgstr "Activer le serveur mandataire (proxy)" #: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32 @@ -2369,17 +2366,17 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67 msgid "Proxy server host" -msgstr "Hôte du serveur proxy" +msgstr "Hôte du serveur mandataire" #: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69 msgid "Proxy server port" -msgstr "Port du serveur proxy" +msgstr "Port du serveur mandataire" #: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72 msgid "Proxy server username" -msgstr "Nom d’utilisateur du serveur proxy" +msgstr "Nom d’utilisateur du serveur mandataire" #: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74 msgid "Proxy server password" -msgstr "Mot de passe du serveur proxy" +msgstr "Mot de passe du serveur mandataire" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29 @@ -2393,5 +2390,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:31 msgid "Display live audio trace." -msgstr "Afficher les traces audios en live" +msgstr "Afficher la trace audio \"en direct\"" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32 @@ -2401,5 +2398,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35 msgid "Explicit waypoints with valid timestamps." -msgstr "Points explicites avec des informations hoaires valides." +msgstr "Points explicites avec des horodatages valides." #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36 @@ -2421,5 +2418,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:55 msgid "Show or hide the audio menu entry on the main menu bar." -msgstr "Montrer ou cacher le menu audio dans la barre principale." +msgstr "" +"Montrer ou cacher l'entrée du menu audio dans la barre de menu principal." #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:66 @@ -2444,10 +2442,11 @@ "layer." msgstr "" -"Faire automatiquement une couche de marqueurs à partir de n’importe quel " -"point à l’ouverture d’une couche GPX." +"Faire automatiquement un calque de marqueur à partir de n’importe quel " +"points d'itinéraire à l’ouverture d’un calque GPX." #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:91 msgid "When importing audio, make markers from..." -msgstr "Lors de l’import de fichiers audio, faire des marqueurs à partir de :" +msgstr "" +"Lors de l’import de fichiers audio, faire des marqueurs à partir de :" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:101 @@ -2455,6 +2454,6 @@ msgid "When importing audio, apply it to any waypoints in the GPX layer." msgstr "" -"Lors de l’import de fichiers audio, appliquer cela à n’importe quel point de " -"la couche GPX." +"Lors de l’import de fichiers audio, l'appliquer à n’importe quel points du " +"calque GPX." #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:123 @@ -2481,5 +2480,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:143 msgid "The amount by which the speed is multiplied for fast forwarding" -msgstr "Quantité par laquelle la vitesse est multipliée pour l’avance rapide." +msgstr "" +"Quantité par laquelle la vitesse est multipliée pour l’avance rapide." #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:144 @@ -2509,9 +2509,9 @@ msgstr "Calibration de l’enregistrement de la voix" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "Display Settings" msgstr "Réglages de l’affichage" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "" "Various settings that influence the visual representation of the whole " @@ -2519,56 +2519,65 @@ msgstr "Divers réglages de l’apparence de tout le programme." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings" msgstr "Réglages de connexion" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings for the OSM server." msgstr "Paramètres de connexion du serveur OSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Map Settings" msgstr "Réglages de la carte" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Settings for the map projection and data interpretation." msgstr "" "Réglages pour la projection de la carte et l’interprétation des données." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Audio Settings" msgstr "Paramètres Audio" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Settings for the audio player and audio markers." msgstr "Réglages pour le lecteur et les marqueurs audios." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97 msgid "You have to restart JOSM for some settings to take effect." -msgstr "Vous devez redémarrer JOSM pour que certains réglages prennent effet." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:25 +msgstr "" +"Vous devez redémarrer JOSM pour que certains réglages prennent effet." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 msgid "Draw lines between raw gps points." msgstr "Dessiner des lignes entre les points GPS bruts." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:27 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 msgid "Force lines if no segments imported." msgstr "Forcer les lignes si aucun segment importé." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:28 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 msgid "Draw large GPS points." msgstr "Dessiner de gros points GPS." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 -msgid "Color tracks by velocity." -msgstr "Couleurs des traces selon la vitesse." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34 +msgid "Velocity (red = slow, green = fast)" +msgstr "Vitesse (rouge = lent, vert = rapide)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 +msgid "Dilution of Position (red = high, green = low, if available)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 +msgid "Single Color (can be customized for named layers)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:1346 msgid "Car" msgstr "Voiture" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:309 trans_presets.java:635 trans_presets.java:833 #: trans_presets.java:842 trans_presets.java:851 trans_presets.java:864 @@ -2580,5 +2589,5 @@ msgstr "Vélos" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:310 trans_presets.java:637 trans_presets.java:832 #: trans_presets.java:841 trans_presets.java:850 trans_presets.java:863 @@ -2589,15 +2598,15 @@ msgstr "Piétons" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 msgid "Draw Direction Arrows" msgstr "Dessiner les flèches de direction" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 msgid "Fast drawing (looks uglier)" msgstr "Dessin rapide (moins joli)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180 msgid "Only interesting direction hints (e.g. with oneway tag)." msgstr "" @@ -2605,30 +2614,30 @@ "exemple)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:186 msgid "Only on the head of a way." msgstr "Seulement à l'extrémité du chemin." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44 msgid "Draw segment order numbers" msgstr "Afficher l’ordre des segments" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45 msgid "Draw boundaries of downloaded data" msgstr "Dessiner les frontières des données téléchargées" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46 msgid "Draw virtual nodes in select mode" msgstr "Dessiner des nœuds virtuels dans le mode sélection" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47 msgid "Draw inactive layers in other color" -msgstr "Dessiner les couches inactives dans une autre couleur" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41 +msgstr "Dessiner les calques inactifs avec une autre couleur" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 msgid "Smooth map graphics (antialiasing)" msgstr "Lissage de la carte (antialiasing)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 msgid "" "If your gps device draws too few lines, select this to draw lines along your " @@ -2638,5 +2647,5 @@ "des lignes entre les points." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:71 msgid "" "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines." @@ -2645,9 +2654,9 @@ "dessiner toutes les lignes." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73 msgid "Maximum length (meters)" msgstr "Longueur maximale (en mètres)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:77 msgid "" "Force drawing of lines if the imported data contain no line information." @@ -2656,16 +2665,17 @@ "d’information sur les lignes." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:84 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89 msgid "Draw direction arrows for lines, connecting GPS points." msgstr "" "Dessiner les flêches de direction des lignes, connectant les points GPS." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90 -msgid "Draw the direction arrows using table lookups instead of complex math." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95 +msgid "" +"Draw the direction arrows using table lookups instead of complex math." msgstr "" "Dessiner les flèches de direction en utilisant un aperçu des données plutôt " "que des mathématiques complexes." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:96 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:101 msgid "" "Don't draw arrows if they are not at least this distance away from the last " @@ -2675,43 +2685,58 @@ "valeur l'une de l'autre." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104 msgid "Minimum distance (pixels)" msgstr "Distance minimum (pixels)" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:109 -msgid "Choose the hue for the track color by the velocity at that point." -msgstr "" -"Choisir la teinte pour la couleur de la trace à partir de la vitesse à ce " -"point." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116 +msgid "Draw larger dots for the GPS points." +msgstr "Dessine de plus gros points GPS." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136 +msgid "" +"All points and track segments will have the same color. Can be customized in " +"Layer Manager." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137 +msgid "Colors points and track segments by velocity." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:138 +msgid "" +"Colors points and track segments by dilution of position (HDOP). Your " +"capture device needs to logs that information." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143 msgid "Allows to tune the track coloring for different average speeds." msgstr "Permet de colorer la trace en fonction de la vitesse." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122 -msgid "Draw larger dots for the GPS points." -msgstr "Dessine de plus gros points GPS." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148 +msgid "Track and Point Coloring" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 msgid "GPS Points" msgstr "Points GPS" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175 msgid "Draw direction hints for way segments." msgstr "Dessiner des flêches de direction pour les sections de chemin." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:163 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192 msgid "Draw the order numbers of all segments within their way." msgstr "Afficher l’ordre de tous les segments de ce chemin." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:168 -msgid "Apply antialiasing to the map view resulting in a smoother appearance." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:197 +msgid "" +"Apply antialiasing to the map view resulting in a smoother appearance." msgstr "Appliquer un lissage des dessins de la carte." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202 msgid "Draw the boundaries of data loaded from the server." msgstr "Dessiner les limites des données chargées depuis le serveur." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:178 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:207 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" @@ -2719,9 +2744,9 @@ "facile des chemins." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212 msgid "Draw the inactive data layers in a different color." -msgstr "Dessiner les couches inactives dans une couleur différente." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190 +msgstr "Dessiner les calques de données inactifs avec une autre couleur." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219 msgid "OSM Data" msgstr "Données OSM" @@ -2833,6 +2858,6 @@ "a menu entry of button for the first time. So some of your changes may " "become active even without restart --- but also without collistion handling. " -"This is another reason to restart JOSM after making any changes here." -"

          " +"This is another reason to restart JOSM after making any changes " +"here.

          " msgstr "" "

          De plus, les raccourcis sont activés lorsque les actions sont assignées à " @@ -2851,8 +2876,9 @@ "key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also " "there will be 'keys' listed that correspond to a shortcut on your keyboard " -"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/" -"Semicolon on US keyboards, '.'/Period on German keyboards, ...) instead. Not " -"doing so may result in conflicts, as there is no way for JOSM to know that " -"Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...

          " +"(e.g. ':'/Colon). Please also do not use them, use the base key " +"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) " +"instead. Not doing so may result in conflicts, as there is no way for JOSM " +"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US " +"keyboard...

          " msgstr "" "

          Vous pouvez remarquer que la liste de sélection des clés sur la page " @@ -2891,6 +2917,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183 msgid "" -"

          The pseudo-modifier 'disabled' will disable the shortcut when encountered." -"

          " +"

          The pseudo-modifier 'disabled' will disable the shortcut when " +"encountered.

          " msgstr "

          Le pseudo-modifieur 'désactivé' désactivera le raccourci.

          " @@ -2960,10 +2986,10 @@ msgstr "Touches de raccourcis" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:231 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:236 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:250 msgid "layer not in list." -msgstr "la couche n’est pas dans la liste." - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +msgstr "le calque n’est pas dans la liste." + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -2972,57 +2998,57 @@ "{1}." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "usage" msgstr "usage" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 msgid "options" msgstr "Options" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 msgid "Show this help" msgstr "Montrer cette aide" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Standard unix geometry argument" msgstr "Argument de géométrie standard UNIX" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 msgid "Download the bounding box" msgstr "Télécharge la zone sélectionnée" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Télécharge l’emplacement donné par l’URL (avec lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Open file (as raw gps, if .gpx)" msgstr "Ouvrir fichier (données brutes gps, si .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 msgid "Download the bounding box as raw gps" msgstr "Télécharger la zone sélectionnée en données GPS brut." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Select with the given search" msgstr "Sélectionner avec la recherche actuelle" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 msgid "Don't launch in fullscreen mode" msgstr "Ne pas lancer en plein écran" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 msgid "Reset the preferences to default" msgstr "Rétablir les préférences par défaut" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 msgid "Set the language." msgstr "Définir la langue" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 msgid "examples" msgstr "exemples" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3033,21 +3059,21 @@ "sur d’avoir chargé des données avant --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 msgid "Instead of --download= you may specify osm://\n" msgstr "Au lieu de --download= vous devriez indiquer osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 msgid "Activating updated plugins" msgstr "Activation des greffons mis à jour" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 msgid "Loading early plugins" msgstr "Chargement des premiers greffons" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Setting defaults" msgstr "Régalage des valeurs par défaut" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171 msgid "Loading plugins" msgstr "Chargement des greffons" @@ -3081,6 +3107,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:108 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:164 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:162 #: trans_presets.java:308 trans_presets.java:309 trans_presets.java:310 #: trans_presets.java:311 trans_presets.java:312 trans_presets.java:313 @@ -3097,5 +3123,5 @@ msgstr "inconnu" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:66 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 #, java-format msgid "" @@ -3106,25 +3132,26 @@ "nécessaire." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 #, java-format msgid "Plugin requires JOSM update: {0}." msgstr "Ce greffon nécessite une mise à jour de JOSM : {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." -msgstr "Le greffon {0} est requis par le greffon {1} mais n’a pu être trouvé." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +msgstr "" +"Le greffon {0} est requis par le greffon {1} mais n’a pu être trouvé." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 #, java-format msgid "Plugin not found: {0}." msgstr "Greffon non trouvé : {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "La dernière mise à jour du greffon date de plus de {0} jours." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 msgid "" "(You can change the number of days after which this warning appears
          by " @@ -3132,20 +3159,20 @@ msgstr "" "(Vous pouvez changer le nombre de jours au bout duquel cet avertissement " -"s'affiche
          en modifiant l'option de configuration 'pluginmanager." -"warntime'.)" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 +"s'affiche
          en modifiant l'option de configuration " +"'pluginmanager.warntime'.)" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 msgid "Disable plugin" msgstr "Désactiver le greffon" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Impossible de charger le greffon {0}. Le supprimer des préférences ?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -3155,5 +3182,5 @@ "l’autorisation de remplacer les greffons existants." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 #, java-format msgid "" @@ -3162,10 +3189,10 @@ "Une exception inattendue pouvant provenir du greffon \"{0}\" s’est produite." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "D’après les informations du greffon, l’auteur est {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:262 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -3174,9 +3201,9 @@ "d'extension avant de rapporter un bug." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 msgid "Should the plugin be disabled?" msgstr "Ce module d'extension doit-il être désactivé ?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:278 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -3186,5 +3213,5 @@ "greffon ne soit plus chargé." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -3194,6 +3221,6 @@ "obtenu JOSM." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:322 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:181 msgid "no description available" msgstr "Aucune description disponible" @@ -3205,5 +3232,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 msgid "Update Plugins" msgstr "Mise à jour des greffons" @@ -3240,5 +3267,5 @@ "automatiquement." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 #, java-format msgid "Downloaded plugin information from {0} site" @@ -3247,13 +3274,13 @@ msgstr[1] "La liste des geffons a été obtenue à partir de {0} sites." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 msgid "No plugin information found." msgstr "Pas d'information sur les greffons trouvée." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:76 msgid "All installed plugins are up to date." msgstr "Tous les greffons installés sont à jour." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 #, java-format msgid "" @@ -3266,9 +3293,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:105 msgid "Download missing plugins" msgstr "Télécharger les greffons manquants" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:106 #, java-format msgid "" @@ -3281,22 +3308,22 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 msgid "Download Plugins" msgstr "Télécharger les greffons" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:170 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:168 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Version {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:176 msgid "Plugin bundled with JOSM" msgstr "Greffon intégré à JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208 msgid "Plugin already exists" msgstr "Le greffon est déjà installé" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:211 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:209 #, java-format msgid "" @@ -3311,15 +3338,15 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 msgid "Delete and Download" msgstr "Supprimer et télécharger" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:222 #, java-format msgid "Error deleting plugin file: {0}" msgstr "Impossible de supprimer le fichier du greffon : {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:281 #, java-format msgid "Error reading plugin information file: {0}" @@ -3386,10 +3413,10 @@ msgstr "Supprimer {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:165 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 msgid "Conflicting relation" msgstr "Relation conflictuelle" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 #, java-format msgid "" @@ -3400,5 +3427,5 @@ "Supprimer de la relation ?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:166 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 #, java-format msgid "" @@ -3415,7 +3442,7 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:349 msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
          This can cause problems because other objects (that you don't see) might " -"use them.
          Do you really want to delete?" +"You are about to delete nodes outside of the area you have " +"downloaded.
          This can cause problems because other objects (that you don't " +"see) might use them.
          Do you really want to delete?" msgstr "" "Vous êtes sur le point de supprimer des nœuds en dehors de la zone " @@ -3513,8 +3540,8 @@ msgstr "" "IMPORTANT : données positionnées trop loin\n" -"de la zone de Lambert courante.\n" -"Ne pas charger de données après ce message.\n" +"de la zone de Lambert actuelle.\n" +"Ne plus charger de données après ce message.\n" "Annulez votre dernière action, sauvegardez votre travail\n" -"et démarrez une nouvelle couche sur cette zone." +"et démarrez un nouveau calque sur cette nouvelle zone." #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158 @@ -3548,103 +3575,114 @@ msgstr "Impossible de charger les préférences depuis le serveur." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:232 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "La zone n'est pas fermée." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:426 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:428 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "Le multipolygone \"{0}\" n'est pas fermé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:527 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:765 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:776 msgid "Empty member in relation." msgstr "Membre vide dans la relation." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:767 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:531 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Membre \"{0}\" supprimé de la relation." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:547 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Chemin \"{0}\" comporte moins de deux points." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:552 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:549 msgid "More than one \"from\" way found." msgstr "Plus d'un chemin d'origine trouvé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:558 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555 msgid "More than one \"to\" way found." msgstr "Plus d'un chemin \"destination\" trouvé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:561 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 +msgid "More than one \"via\" found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 #, java-format msgid "Unknown role ''{0}''." msgstr "Rôle inconnu \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Type de membre inconnu pour \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 msgid "No \"from\" way found." msgstr "Pas de chemin d'origine trouvé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 msgid "No \"to\" way found." msgstr "Pas de chemin \"destination\" trouvé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -msgid "No \"via\" node found." -msgstr "Pas de nœud \"de passage\" trouvé." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +msgid "No \"via\" node or way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" "Le chemin d'origine ne commence ou fini pas par un nœud \"de passage\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:636 -#, java-format -msgid "The \"{0}\" way must contain at least 2 nodes." -msgstr "Le chemin \"{0}\" doit contenir au moins 2 nœuds." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:731 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +msgid "The \"to\" way doesn't start or end at a \"via\" node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:620 +msgid "The \"from\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:624 +msgid "The \"to\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:742 #, java-format msgid "Style for restriction {0} not found." msgstr "Le style de la restriction {0} n'a pas été trouvé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Pas de rôle utile \"{0}\" pour le chemin \"{1}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Non-chemin \"{0}\" dans le multipolygone." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:847 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:858 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Pas de chemin extérieur pour le multipolygone \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Intersection entre les chemins \"{0}\" et \"{1}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:949 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Le chemin intérieur \"{0}\" est à l'extérieur." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:987 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:998 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." @@ -3652,22 +3690,22 @@ "Le style du chemin intérieur \"{0}\" est équivalent à un multipolygone." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1012 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1023 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Le style du chemin extérieur \"{0}\" ne concorde pas." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1195 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1206 msgid "untagged" msgstr "non étiqueté" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1196 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207 msgid "text" msgstr "texte" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" msgstr "inactif" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:94 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:181 @@ -3675,13 +3713,13 @@ msgstr "sélectionné" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" msgstr "chemin non étiqueté" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 msgid "incomplete way" msgstr "chemin incomplet" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 msgid "highlight" msgstr "surligner" @@ -3703,5 +3741,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:113 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:89 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:77 msgid "incomplete" @@ -3731,14 +3769,14 @@ msgstr[1] "{0} membres" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 msgid "Duplicate" msgstr "Dupliquer" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 msgid "Duplicate selection by copy and immediate paste." msgstr "Dupliquer la sélection par un copier-coller immédiat." -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 @@ -3747,5 +3785,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -3797,5 +3835,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 msgid "Rename layer" -msgstr "Renommer la couche" +msgstr "Renommer le calque" #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 @@ -3818,7 +3856,9 @@ "Afficher des informations sur l’historique des chemins et des nœuds d’OSM." -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:57 -msgid "Please select at least one node, way or relation." -msgstr "Veuillez sélectionner au moins un nœud, un chemin ou une relation" +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:60 +msgid "" +"Please select at least one node, way or relation. Only already uploaded " +"elements have a history." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 @@ -3840,7 +3880,7 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/TerracerAction.java:47 @@ -3871,5 +3911,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 msgid "Distribute the selected nodes to equal distances along a line." -msgstr "Distribue les nœuds sélectionnés à égale distance le long d'une ligne." +msgstr "" +"Distribue les nœuds sélectionnés à égale distance le long d'une ligne." #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68 @@ -3979,5 +4020,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:123 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:314 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:315 msgid "Enter values for all conflicts." msgstr "Entrer des valeurs pour tous les conflits." @@ -3985,5 +4026,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 msgid "Solve Conflicts" msgstr "Résoudre les conflits" @@ -4119,5 +4160,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #, java-format @@ -4136,5 +4177,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 msgid "The current selection cannot be used for splitting." -msgstr "La sélection actuelle ne peut pas être utilisée pour couper un chemin." +msgstr "" +"La sélection actuelle ne peut pas être utilisée pour couper un chemin." #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116 @@ -4144,17 +4186,19 @@ msgstr[1] "Les nœuds sélectionnés ne sont pas au milieu d'un chemin." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125 -msgid "" -"There is more than one way using the node(s) you selected. Please select the " +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 +msgid "" +"There is more than one way using the node you selected. Please select the " "way also." -msgstr "" -"Il y a plus d’un chemin utilisant le(s) nœud(s) sélectionné(s). Il faut " -"également sélectionner le chemin." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133 +msgid_plural "" +"There is more than one way using the nodes you selected. Please select the " +"way also." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137 msgid "The selected nodes do not share the same way." msgstr "Les nœuds sélectionnés ne font pas partie du même chemin." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -4162,11 +4206,11 @@ msgstr[1] "Le chemin sélectionné ne contient pas tous les nœuds sélectionnés" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229 msgid "You must select two or more nodes to split a circular way." msgstr "" "Vous devez sélectionner au moins deux nœuds pour séparer une voie circulaire." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -4176,14 +4220,14 @@ "sélectionner les nœuds au milieu du chemin.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 msgid "" "A role based relation membership was copied to all new ways.\n" "You should verify this and correct it when necessary." msgstr "" -"Tous les nouveaux chemins ont été ajoutés à une relation basée sur \"role" -"\".\n" +"Tous les nouveaux chemins ont été ajoutés à une relation basée sur " +"\"role\".\n" "Vous devriez vérifier cela et corriger si nécessaire." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:296 #, java-format msgid "Split way {0} into {1} parts" @@ -4196,5 +4240,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 msgid "layer" -msgstr "la couche" +msgstr "le calque" #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 @@ -4579,5 +4623,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 msgid "Align Nodes in Circle" msgstr "Placer les nœuds en cercle" @@ -4591,5 +4635,5 @@ msgstr "Certains points sont (presque) sur la ligne" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 msgid "Please select at least four nodes." msgstr "Sélectionner au moins quatre nœuds." @@ -4600,6 +4644,6 @@ "a bug." msgstr "" -"Erreur interne : impossible de vérifier les conditions pour aucune couche. " -"Merci de reporter ce bug." +"Erreur interne : impossible de vérifier les conditions pour aucun calque. " +"Merci de signaler ceci comme une erreur." #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:77 @@ -4658,4 +4702,32 @@ msgstr "Une erreur est survenue lors de la restauration de la sauvegarde." +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "" +"Show status report with useful information that can be attached to bugs" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92 +msgid "Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +msgid "Copy to clipboard and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 +msgid "Close" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 @@ -4667,13 +4739,13 @@ msgstr "Refaire la dernière action annulée" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:44 msgid "Delete Mode" msgstr "Mode Suppression" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:46 msgid "Delete nodes or ways." msgstr "Supprimer les nœuds ou les chemins." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:84 @@ -4684,5 +4756,5 @@ msgstr "Mode: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:130 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -4695,6 +4767,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:87 msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." +"Drag play head and release near track to play audio from there; " +"SHIFT+release to synchronize audio at that point." msgstr "" "Déplacer le curseur de lecture et le relacher à côté de la trace pour lire " @@ -4711,15 +4783,15 @@ msgstr "Créer des surfaces" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 msgid "Extrude Way" msgstr "Extruder un chemin" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:252 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:416 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:430 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" "Relacher le bouton de souris pour sélectionner les objets dans le rectangle." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 msgid "Draw a rectangle of the desired size, then release the mouse button." msgstr "" @@ -4727,10 +4799,10 @@ "souris." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:420 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:434 msgid "Release the mouse button to stop rotating." msgstr "Relacher le bouton de souris pour arrêter la rotation." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 msgid "Drag a way segment to make a rectangle." msgstr "Déplacer un segment du chemin pour faire un rectangle." @@ -4798,14 +4870,14 @@ msgstr "Sélectionner, déplacer et tourner des objets" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:191 msgid "Add and move a virtual new node to way" msgstr "Ajouter et déplacer un nouveau nœud virtuel vers le chemin" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:220 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:223 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 msgid "Cannot move objects outside of the world." msgstr "Impossible de déplacer des objets en dehors de la Terre." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:418 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:432 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -4814,5 +4886,5 @@ "fusionner avec le nœud le plus proche." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:422 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:436 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to remove); Shift-" @@ -4866,5 +4938,6 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:148 msgid "Merge nodes with different memberships?" -msgstr "Fusionner des nœuds qui ne sont pas les mêmes membres d’une relation ?" +msgstr "" +"Fusionner des nœuds qui ne sont pas les mêmes membres d’une relation ?" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:149 @@ -4891,22 +4964,22 @@ msgstr "Fusionner {0} nœuds" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Orthogonalize Shape" msgstr "Rendre une forme orthogonale" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Déplacer les nœuds pour que tous les angles soient à 90 ou 270°" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 msgid "Only two nodes allowed" msgstr "Seulement deux nœuds autorisés" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 msgid "Selection must consist only of ways." msgstr "La selection ne doit contenir uniquement que des chemins" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 msgid "Please select one or more closed ways of at least four nodes." msgstr "" @@ -4914,5 +4987,5 @@ "nœuds." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 msgid "Please select ways with almost right angles to orthogonalize." msgstr "" @@ -4920,5 +4993,5 @@ "orthogonaliser." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 msgid "" "You are using the EPSG:4326 projection which might lead
          to " @@ -4930,9 +5003,9 @@ "de projection pour supprimer cet avertissement.
          Voulez-vous continuer ?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "Only one node selected" msgstr "Seulement un nœud sélectionné" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 msgid "Orthogonalize" msgstr "Orthogonaliser" @@ -4983,5 +5056,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101 -msgid "Please select exactly three nodes or one way with exactly three nodes." +msgid "" +"Please select exactly three nodes or one way with exactly three nodes." msgstr "" "Veuillez sélectionner exactement trois nœuds ou un chemin contenant " @@ -4992,52 +5066,69 @@ msgstr "Ces nœuds ne sont pas en cercle." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../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:71 +msgid "Update Data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:72 +#, java-format +msgid "" +"This action will require {0} individual download requests. Do you wish to " +"continue?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 msgid "Open Location..." msgstr "Ouvrir un emplacement..." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 msgid "Open an URL." msgstr "Ouvrir une URL." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 msgid "Separate Layer" -msgstr "Couche séparé" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:58 +msgstr "Calque séparé" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 msgid "Enter URL to download:" msgstr "Saisir l'URL à télécharger :" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 msgid "Download Location" msgstr "Emplacement de téléchargement" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 msgid "Download URL" msgstr "Télécharger l'URL" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 msgid "Add Node..." msgstr "Ajouter un nœud..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 msgid "Add a node by entering latitude and longitude." msgstr "Ajouter un nœud en indiquant une latitude et une longitude" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 msgid "Enter the coordinates for the new node." msgstr "Entrer les coordonnées pour le nouveau nœud" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 msgid "Use decimal degrees." msgstr "Utiliser des degrés décimaux." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 msgid "Negative values denote Western/Southern hemisphere." msgstr "Les valeurs négatives indiquent la partie Ouest/Sud de l'hémisphère." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 #: ../plugins/livegps/livegps/LiveGpsDialog.java:54 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93 @@ -5046,5 +5137,5 @@ msgstr "Latitude" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 #: ../plugins/livegps/livegps/LiveGpsDialog.java:56 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96 @@ -5087,14 +5178,14 @@ msgstr "Déplacer les objets {0}" +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "Overwrite" msgstr "Écrire dessus" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "File exists. Overwrite?" msgstr "Le fichier existe déjà. Écrire dessus ?" @@ -5113,42 +5204,47 @@ msgstr "Veuillez sélectionner quelque chose à copier." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Séparer les chemins" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "Dupliquer les nœuds utilisés par plusieurs chemins." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 msgid "This node is not glued to anything else." msgstr "Ce nœud n’est pas collé à quelque chose d’autre." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 msgid "None of these nodes are glued to anything else." msgstr "Aucun de ces nœuds ne sont collés à autre chose." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of this way's nodes are glued to anything else." msgstr "Aucun des nœuds de ce chemin ne sont collés à autre chose." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 msgid "The current selection cannot be used for unglueing." msgstr "Rien ne peut être séparé dans la sélection actuelle." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "Select either:" msgstr "Sélectionner au choix :" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +msgid "* One tagged node, or" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "* One node that is used by more than one way, or" msgstr "* Un nœud utilisé par plus d’un chemin, ou" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 -msgid "* One node that is used by more than one way and one of those ways, or" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +msgid "" +"* One node that is used by more than one way and one of those ways, or" msgstr "* Un nœud utilisé par plus d’un chemin et un de ces chemins, ou" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -5156,10 +5252,11 @@ "* Un chemin qui a un ou plusieurs nœuds utilisés par plus d’un chemin, ou" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "" "* One way and one or more of its nodes that are used by more than one way." -msgstr "* Un chemin et un ou plus de ses nœuds utilisés par plus d’un chemin." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +msgstr "" +"* Un chemin et un ou plus de ses nœuds utilisés par plus d’un chemin." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -5173,10 +5270,14 @@ "sélectionnés." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:160 +msgid "Unglued Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:373 #, java-format msgid "Dupe into {0} nodes" msgstr "Dupliquer en {0} nœuds" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:320 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:397 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -5267,5 +5368,5 @@ "objects too." msgstr "" -"Sélectionner tous les objets non supprimés dans la couche de données. Cela " +"Sélectionnez tous les objets non supprimés dans le calque de données. Cela " "sélectionne aussi les objets incomplets." @@ -5279,5 +5380,5 @@ msgstr "Annuler la dernière action." -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 msgid "No Shortcut" msgstr "Pas de raccourci" @@ -5293,5 +5394,5 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:58 msgid "Data Layer" -msgstr "Couche de données" +msgstr "Calque de données" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:70 @@ -5299,13 +5400,13 @@ msgstr "Données OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:29 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:28 msgid "Downloading GPS data" msgstr "Téléchargement des données GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:41 msgid "Downloaded GPX Data" msgstr "Données GPX téléchargées" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:71 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:69 msgid "Raw GPS data" msgstr "Données GPS brutes" @@ -5477,10 +5578,10 @@ #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:68 msgid "Layer to make measurements" -msgstr "Couche où faire les mesures" +msgstr "Calque où faire des mesures" #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:270 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:315 msgid "Import path from GPX layer" -msgstr "Importer un chemin depuis la couche GPX" +msgstr "Importer un chemin depuis le calque GPX" #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:305 @@ -5490,5 +5591,5 @@ #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:341 msgid "No GPX data layer found." -msgstr "Pas de couche de données GPX trouvée" +msgstr "Pas de calque de données GPX trouvé." #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:53 @@ -5535,5 +5636,6 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169 -msgid "Header contains several values and cannot be mapped to a single string" +msgid "" +"Header contains several values and cannot be mapped to a single string" msgstr "" "L'en-tête contient plusieurs valeurs et ne peut être mappés en un seul Mot" @@ -5617,7 +5719,7 @@ "upload this data. Maybe you have selected the wrong layer?" msgstr "" -"Les données sélectionnées contiennent des données de OpenStreetBugs." -"
          Vous ne pouvez charger ces données. Peut-être avez-vous sélectionné la " -"mauvaise couche ?" +"Les données sélectionnées contiennent des données de " +"OpenStreetBugs.
          Vous ne pouvez pas téléverser ces données. Peut-être avez-" +"vous sélectionné le mauvais calque ?" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 @@ -5627,5 +5729,6 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:112 msgid "Remote Control has been asked to load data from the API." -msgstr "Il a été demandé à Remote Control de charger les données depuis l'API." +msgstr "" +"Il a été demandé à Remote Control de charger les données depuis l'API." #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:113 @@ -5879,5 +5982,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60 msgid "WMS Layer" -msgstr "Couche WMS" +msgstr "Calque WMS" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62 @@ -5894,5 +5997,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69 -msgid "Maximum number of segments allowed in each generated way. Default 250." +msgid "" +"Maximum number of segments allowed in each generated way. Default 250." msgstr "" "Nombre maximum de segments autorisés dans chaque chemin généré (250 par " @@ -5918,6 +6022,7 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72 msgid "" -"Accuracy of Douglas-Peucker line simplification, measured in degrees." -"
          Lower values give more nodes, and more accurate lines. Default 0.0003." +"Accuracy of Douglas-Peucker line simplification, measured in " +"degrees.
          Lower values give more nodes, and more accurate lines. Default " +"0.0003." msgstr "" "Précision de la simplification des lignes par la méthode Douglas-Peucker, en " @@ -5955,5 +6060,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79 msgid "Which WMS layer to use for tracing against. Default is IR1." -msgstr "Couche WMS à utiliser pour tracer (IR-1 par défaut)." +msgstr "" +"Quel calque WMS faut il utiliser pour tracer contre. par défaut c'est IR-1." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80 @@ -6009,5 +6115,5 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50 msgid "Load set of images as a new layer." -msgstr "Charger les images dans une nouvelle couche." +msgstr "Charger l'ensemble des images comme un nouveau calque." #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 @@ -6181,9 +6287,10 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72 msgid "Use error layer." -msgstr "Utiliser la couche d’erreurs." +msgstr "Utiliser le calque d’erreur." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73 msgid "Use the error layer to display problematic elements." -msgstr "Utiliser la couche d’erreurs pour montrer les éléments problématiques." +msgstr "" +"Utiliser le calque d’erreur pour montrer les éléments problématiques." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78 @@ -6575,6 +6682,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:509 msgid "" -"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." -"org/index.php/User:JLS/speller) or tag checking data files." +"The sources (URL or filename) of spell check (see " +"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking " +"data files." msgstr "" "Les sources (URL ou nom de fichier) du vérificateur orthographique (voir " @@ -6674,5 +6782,5 @@ #: ../plugins/livegps/livegps/LiveGpsLayer.java:25 msgid "LiveGPS layer" -msgstr "Couche LiveGPS" +msgstr "Calque instrument LiveGPS" #: ../plugins/livegps/livegps/LiveGpsPlugin.java:41 @@ -6685,6 +6793,6 @@ msgid "Connect to gpsd server and show current position in LiveGPS layer." msgstr "" -"Connecter au serveur gpsd et afficher la position actuelle sur la couche " -"LiveGPS" +"Connecter au serveur gpsd et afficher la position actuelle dans le calque " +"LiveGPS." #: ../plugins/livegps/livegps/LiveGpsPlugin.java:53 @@ -6695,5 +6803,5 @@ #: ../plugins/livegps/livegps/LiveGpsPlugin.java:53 msgid "Center the LiveGPS layer to current position." -msgstr "Centrer la couche LiveGPS sur la position actuelle" +msgstr "Centrer le calque LiveGPS sur la position actuelle." #: ../plugins/livegps/livegps/LiveGpsPlugin.java:67 @@ -6703,5 +6811,5 @@ #: ../plugins/livegps/livegps/LiveGpsPlugin.java:67 msgid "Continuously center the LiveGPS layer to current position." -msgstr "Centrer continuellement la couche LiveGPS sur la position actuelle" +msgstr "Centrer continuellement le calque LiveGPS sur la position actuelle." #: ../plugins/livegps/livegps/LiveGpsPlugin.java:82 @@ -6931,5 +7039,6 @@ #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:177 msgid "Disable data logging if distance falls below" -msgstr "Désactiver l'enregistrement des données si la distance est de moins de" +msgstr "" +"Désactiver l'enregistrement des données si la distance est de moins de" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:307 @@ -6997,6 +7106,6 @@ msgstr "" "Imoossible de lire la bibliothèque rxtxSerial. Si vous avez besoin d’aide " -"pour l’installer, essayez la page d’accueil deGlobalsat sur http://www." -"raphael-mack.de/josm-globalsat-gpx-import-plugin/" +"pour l’installer, essayez la page d’accueil deGlobalsat sur " +"http://www.raphael-mack.de/josm-globalsat-gpx-import-plugin/" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 @@ -7007,5 +7116,7 @@ #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." -msgstr "Import de données depuis le GPS Globalsat DG100 en couche GPX." +msgstr "" +"Importer les données depuis le traceur GPS Globalsat DG100 dans le calque " +"GPX." #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 @@ -7023,9 +7134,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:38 msgid "Open a layer first (GPX, OSM, cache)" -msgstr "Ouvrir tout d'abord une couche (GPX, OSM, cache)" +msgstr "Ouvrir d'abord un calque (GPX, OSM, cache)" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 msgid "Add a new layer" -msgstr "Ajouter une nouvelle couche" +msgstr "Ajouter un nouveau calque" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52 @@ -7043,8 +7154,8 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:70 msgid "Add new layer" -msgstr "Ajouter une nouvelle couche" - -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:40 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:45 +msgstr "Ajouter un nouveau calque" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:43 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 #, java-format @@ -7052,19 +7163,30 @@ msgstr "Téléchargement {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:51 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:55 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 msgid "Contacting WMS Server..." msgstr "Contact du serveur WMS..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157 msgid "Create buildings" msgstr "Créer les bêtiments" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 msgid "CadastreGrabber: Illegal url." msgstr "CadastreGrabber : url illégale." + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +msgid "" +"To avoid cadastre WMS overload,\n" +"building import size is limited to 1 km2 max." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +msgid "Please, enable auto-sourcing and check cadastre millesime." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78 @@ -7086,5 +7208,22 @@ msgstr "Cadastre : {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:128 +msgid "Cadastre" +msgstr "Cadastre" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:139 +msgid "Auto sourcing" +msgstr "Enregistrement automatique de la source" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164 +msgid "Invalid projection" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 +#, java-format +msgid "Change the projection to {0} first." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:169 msgid "" "To enable the cadastre WMS plugin, change\n" @@ -7093,12 +7232,4 @@ "Pour activer le greffon cadastre WMS, modifiez\n" "la projection JOSM en Lambert et redémarrez" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132 -msgid "Cadastre" -msgstr "Cadastre" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 -msgid "Auto sourcing" -msgstr "Enregistrement automatique de la source" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20 @@ -7109,5 +7240,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 msgid "Only on vectorized layers" -msgstr "Seulement sur les couches vectorisées" +msgstr "Seulement sur les calques vectorisés" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:20 @@ -7174,9 +7305,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:43 msgid "" -"More than one WMS layer present.\n" -"Select one of them first, then retry." -msgstr "" -"Plus d'une couche WMS présente.\n" -"Sélectionnez la couche voulue et réessayez." +"More than one WMS layer present\n" +"Select one of them first, then retry" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:19 @@ -7185,5 +7314,5 @@ "Télécharger la zone depuis le tampon (seulement si le tampon est activé)" -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136 #, java-format @@ -7193,13 +7322,13 @@ msgstr[1] "Simplifier le chemin (supprimer {0} nœuds)" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61 msgid "Extract SVG ViewBox..." msgstr "Extraire le ViewBox du SVG" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65 msgid "Extract best fitting boundary..." msgstr "Extraction des meilleures limites..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:120 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126 msgid "Create boundary" msgstr "Créer la frontière" @@ -7209,10 +7338,10 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 msgid "Blank Layer" -msgstr "Couche vide" +msgstr "Calque vide" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" -msgstr "Couche WMS ({0}), {1} tuile(s) chargée(s)" +msgstr "Calque WMS ({0}), {1} tuile(s) chargée(s)" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 @@ -7223,5 +7352,5 @@ #, java-format msgid "Raster center: {0}" -msgstr "Centre de la couche Raster : {0}" +msgstr "Centre de la trame : {0}" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 @@ -7235,15 +7364,15 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 msgid "Save WMS layer to file" -msgstr "Sauvegarder une couche WMS dans un fichier" +msgstr "Sauvegarder un calque WMS dans un fichier" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "Load WMS layer from file" -msgstr "Charger une couche WMS depuis un fichier" +msgstr "Charger un calque WMS depuis un fichier" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -7253,5 +7382,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 msgid "File Format Error" msgstr "Erreur de format de fichier" @@ -7259,5 +7388,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 msgid "Error loading file" msgstr "Erreur lors du chargement du fichier" @@ -7286,48 +7415,51 @@ msgstr "Erreur de tampon de zone Lambert" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 msgid "Replace original background by JOSM background color." msgstr "Remplacer le fond original par la couleur de fond de JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30 msgid "Reverse grey colors (for black backgrounds)." msgstr "Inverser les couleurs grises (pour les fonds noir)." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 msgid "Set background transparent." msgstr "Rendre le fond transparent." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34 msgid "Draw boundaries of downloaded data." msgstr "Tracer les limites des données téléchargées." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Enable automatic caching." msgstr "Activer le tampon automatique." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 msgid "Max. cache size (in MB)" msgstr "Taille max. du tampon (en MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:53 -msgid "" -"A special handler of the french cadastre wms at www.cadastre.gouv." -"fr

          Please read the Terms and Conditions of Use here (in french): " -"
          http://www.cadastre.gouv.fr/scpc/html/" -"CU_01_ConditionsGenerales_fr.html
          before any upload of data created " -"by this plugin." -msgstr "" -"Une prise en charge du WMS du cadastre français à l'adresse www.cadastre." -"gouv.fr

          Merci de lire les conditions d'utilisation ici :
          " +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:55 +msgid "" +"A special handler of the french cadastre wms at " +"www.cadastre.gouv.fr

          Please read the Terms and Conditions of Use here " +"(in french):
          " +"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " +"
          before any upload of data created by this plugin." +msgstr "" +"Une prise en charge du WMS du cadastre français à l'adresse " +"www.cadastre.gouv.fr

          Merci de lire les conditions d'utilisation ici : " +"
          " "http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " "
          avant tout chargement de données créé à partir de ce greffon." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:58 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 msgid "French cadastre WMS" msgstr "WMS du cadastre français" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -7335,10 +7467,10 @@ "celle-ci est activé" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65 msgid "Source" msgstr "Source" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -7348,31 +7480,43 @@ "préférences de JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 -msgid "" -"Invert the original texts from black to white (and all intermediate greys)." -msgstr "" -"Inverser les textes originaux du noir vers le blanc (et tous les gris " -"intermédiaires)." +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +msgid "" +"Invert the original black and white colors (and all intermediate greys). " +"Useful for texts on dark backgrounds." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 +msgid "Allows multiple layers stacking" +msgstr "Permet l'empilement de plusieurs calques" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 -msgid "Allows multiple layers stacking" -msgstr "Permet l'empilement de plusieurs couches" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:99 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -"Défini la transparence des couches WMS. Opaque à droite, transparent à " +"Défini la transparence des calques WMS. Opaque à droite, transparent à " "gauche." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" "Dessine un rectangle autour des données téléchargées depuis le serveur WMS." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:113 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 msgid "Image grab multiplier:" msgstr "Division du téléchargement de zone :" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:162 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:125 +msgid "Grab smaller images (higher quality but use more memory)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +msgid "Fixed size square (default is 100m)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +msgid "Fixed size (from 25 to 1000 meters)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -7387,5 +7531,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35 msgid "Adjust the position of the WMS layer" -msgstr "Ajuster la position de la couche WMS" +msgstr "Ajuster la position du calque WMS" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17 @@ -7491,5 +7635,5 @@ msgstr "Pas d'intersection trouvée. Rien n'a été modifié." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:254 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:255 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -7599,5 +7743,5 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78 msgid "Remove photo from layer" -msgstr "Supprimer la photo de la couche" +msgstr "Supprimer la photo du calque" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94 @@ -7638,7 +7782,7 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:203 msgid "" -"Take a photo of your GPS receiver while it displays the time." -"
          Display that photo here.
          And then, simply capture the time you read " -"on the photo and select a timezone
          " +"Take a photo of your GPS receiver while it displays the " +"time.
          Display that photo here.
          And then, simply capture the time you " +"read on the photo and select a timezone
          " msgstr "" "Prenez une photo de votre GPS quand il affiche l’heure.
          Affichez " @@ -7708,8 +7852,9 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:484 -msgid "I can take a picture of my GPS receiver.
          Can this help?" -msgstr "" -"Je peux prendre un autre phot de mon GPS.
          Cela peut-il aider ?" +msgid "" +"I can take a picture of my GPS receiver.
          Can this help?" +msgstr "" +"Je peux prendre un autre phot de mon GPS.
          Cela peut-il aider " +"?" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:501 @@ -7754,5 +7899,5 @@ msgstr "Fuseau horaire invalide" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #, java-format msgid "" @@ -7763,14 +7908,14 @@ "Format attendu : {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:579 msgid "Invalid offset" msgstr "Décallage invalide" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:641 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:643 #, java-format msgid "Found {0} matchs of {1} in GPX track {2}" msgstr "{0} occurences de {1} trouvées dans la trace GPX {2}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:642 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:644 msgid "GPX Track loaded" msgstr "Trace GPX chargée" @@ -7778,5 +7923,5 @@ #: ../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/UploadDataGui.java:79 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 msgid "Upload Traces" msgstr "Charger les traces" @@ -7786,58 +7931,72 @@ msgstr "CHarger les traces vers openstreetmap.org" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 -msgid "Upload GPX track" -msgstr "Charger la trace GPX" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71 +msgid "Upload Trace" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Public" msgstr "Public" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 msgid "Selected makes your trace public in openstreetmap.org" msgstr "Cette sélection rend votre trace publique dans openstreetmap.org" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Description" msgstr "Description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:123 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 msgid "Tags" msgstr "Étiquettes" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:182 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:153 +#, java-format +msgid "Selected track: {0}" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:176 msgid "Connecting..." msgstr "Connexion..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 -msgid "Uploading GPX track..." -msgstr "Envoi de la trace GPX..." - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:214 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:199 +msgid "Upload cancelled" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:209 +msgid "Error while uploading" +msgstr "Erreur lors du chargement" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "Succès de l'envoi de la trace GPX" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:227 -msgid "Error while uploading" -msgstr "Erreur lors du chargement" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:235 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +msgid "Upload failed. Server returned the following message: " +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 +#, java-format +msgid "Uploading GPX track: {0}% ({1} of {2})" +msgstr "Envoyer la trace GPX : {0}% ({1} ou {2})" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "Pas de description fournie. Merci de fournir une description." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:252 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." -msgstr "Pas de couche GPX sélectionnée. Impossible de charger une trace." - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:241 +msgstr "Pas de calque GPX sélectionné. Impossible de téléverser une trace." + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "Pas de nom d'utilisateur fourni." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:244 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "Pas de mot de passe fourni." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "Envoyer la trace GPX" @@ -7906,5 +8065,6 @@ #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:149 msgid "Please choose a user using the author panel" -msgstr "Veuillez sélectionner un utilisateur en utilisant la liste des auteurs" +msgstr "" +"Veuillez sélectionner un utilisateur en utilisant la liste des auteurs" #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:162 @@ -7942,5 +8102,6 @@ #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:127 msgid "Please select the site(s) to check for updates." -msgstr "Veuillez sélectionner le(s) site(s) à vérifier pour les mises à jour." +msgstr "" +"Veuillez sélectionner le(s) site(s) à vérifier pour les mises à jour." #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:151 @@ -8017,5 +8178,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:149 msgid "Open a blank WMS layer to load data from a file" -msgstr "Ouvrir une couche WMS vide pour charger des données depuis un fichier" +msgstr "Ouvrir un calque WMS vide pour charger des données depuis un fichier" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 @@ -8062,15 +8223,15 @@ msgstr "Téléchargement automatique" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" -msgstr "Couche WMS ({0}), téléchargement automatique au zoom {1}" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:112 +msgstr "Calque WMS ({0}), téléchargement automatique au zoom {1}" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" -msgstr "Couche WMS ({0}), téléchargement au zoom {1}" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164 +msgstr "Calque WMS ({0}), téléchargement au zoom {1}" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -8079,17 +8240,17 @@ "résolution." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:232 msgid "Download visible tiles" msgstr "Télécharger les tuiles visibles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241 msgid "Change resolution" msgstr "Changer la résolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:253 msgid "Reload erroneous tiles" msgstr "Recharger les tuiles erronées" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:264 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:271 msgid "Alpha channel" msgstr "Canal alpha" @@ -8101,5 +8262,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28 msgid "Adjust the position of the selected WMS layer" -msgstr "Ajuster la position de la couche WMS sélectionnée" +msgstr "Ajuster la position du calque WMS sélectionné" #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20 @@ -8184,5 +8345,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:222 msgid "Grid layer:" -msgstr "Couche de la grille:" +msgstr "Calque de la grille:" #: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28 @@ -8750,5 +8911,5 @@ #: trans_validator.java:61 msgid "layer tag with + sign" -msgstr "Etiquette de la couche avec un signe +" +msgstr "Etiquette du calque avec un signe +" #: trans_validator.java:63 @@ -8904,5 +9065,5 @@ #: trans_presets.java:1284 msgid "Layer" -msgstr "Couche" +msgstr "Calque" #: trans_presets.java:58 trans_presets.java:75 trans_presets.java:94 @@ -9101,5 +9262,5 @@ #: trans_presets.java:257 msgid "driveway" -msgstr "driveway" +msgstr "acceso para vehículos (entrada a garage, etc.)" #: trans_presets.java:257 @@ -12986,22 +13147,31 @@ msgstr "chemin destination" +#, java-format #~ msgid "Java OpenStreetMap Editor Version {0}" #~ msgstr "Java OpenStreetMap Editor Version {0}" +#, java-format #~ msgid "Error while exporting {0}" #~ msgstr "Erreur à l’export {0}" +#~ msgid "Please select something from the conflict list." +#~ msgstr "Veuillez sélectionner un élément de la liste des conflits." + #~ msgid "NullPointerException. Possible some missing tags." #~ msgstr "NullPointerException.·Certains tags peuvent manquer." +#, java-format #~ msgid "Data error: lat value \"{0}\" is out of bound." #~ msgstr "Erreur de données : La valeur de latitude \"{0}\" est hors limite." +#, java-format #~ msgid "Data error: lon value \"{0}\" is out of bound." #~ msgstr "Erreur de données : La valeur de longitude \"{0}\" est hors limite." +#, java-format #~ msgid "Remove \"{0}\" for" #~ msgstr "Supprime \"{0}\" pour" +#, java-format #~ msgid "Set {0}={1} for" #~ msgstr "Affecte {0}={1} pour" @@ -13034,4 +13204,5 @@ #~ msgstr "Chargement vers OSM" +#, java-format #~ msgid " ({0} node)" #~ msgid_plural " ({0} nodes)" @@ -13039,4 +13210,5 @@ #~ msgstr[1] " ({0} nœuds)" +#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -13069,18 +13241,17 @@ #~ msgid "" -#~ "This is the basic relation editor which allows you to change the " -#~ "relation's tags as well as the members. In addition to this we should " -#~ "have a smart editor that detects the type of relationship and limits your " -#~ "choices in a sensible way." +#~ "This is the basic relation editor which allows you to change the relation's " +#~ "tags as well as the members. In addition to this we should have a smart " +#~ "editor that detects the type of relationship and limits your choices in a " +#~ "sensible way." #~ msgstr "" #~ "Ceci est l'éditeur basique de relation qui vous permet des changer les " -#~ "étiquette de la relation ainsi que les membres. En supplément, nous " -#~ "devrions avoir un éditeur intelligent qui détecte le type de relation et " -#~ "limite les choix de façon sensible." +#~ "étiquette de la relation ainsi que les membres. En supplément, nous devrions " +#~ "avoir un éditeur intelligent qui détecte le type de relation et limite les " +#~ "choix de façon sensible." #~ msgid "Highlight the member from the current table row as JOSM's selection" #~ msgstr "" -#~ "Mettre en évidence le membre de la ligne actuelle comme une sélection de " -#~ "JOSM" +#~ "Mettre en évidence le membre de la ligne actuelle comme une sélection de JOSM" #~ msgid "Selection: %d way(s) and %d node(s)" @@ -13090,13 +13261,50 @@ #~ msgstr "JOSM, l'éditeur OpenStreetMap Java" +#~ msgid "Upload this trace..." +#~ msgstr "Envoyer cette trace..." + +#~ msgid "" +#~ "This functionality has been added only recently. Please
          use with " +#~ "care and check if it works as expected." +#~ msgstr "" +#~ "Cette fonctionnalité n’a été ajoutée que récemment. À " +#~ "utiliser
          prudemment et vérifier si cela marche comme attendu." + +#~ msgid "Upload track filtered by JOSM" +#~ msgstr "Envoi des traces filtrées par JOSM" + +#~ msgid "Upload raw file: " +#~ msgstr "Envoyer le fichier brut : " + +#~ msgid "Description:" +#~ msgstr "Description :" + +#~ msgid "Tags (keywords in GPX):" +#~ msgstr "Étiquettes (mots clés dans le GPX) :" + +#~ msgid "GPX-Upload" +#~ msgstr "Envoi du GPX" + +#, java-format +#~ msgid "Upload raw file: {0}" +#~ msgstr "Envoi du fichier brut : {0}" + +#~ msgid "Tags:" +#~ msgstr "Balises:" + #~ msgid "Java OpenStreetMap - Editor" #~ msgstr "Java OpenStreetMap - Éditeur" #~ msgid "" -#~ "If your gps device draw too few lines, select this to draw lines along " -#~ "your way." +#~ "If your gps device draw too few lines, select this to draw lines along your " +#~ "way." #~ msgstr "" -#~ "Si votre périphérique GPS dessine des lignes trop fines, sélectionner " -#~ "cette option pour dessiner des lignes le long de votre chemin" +#~ "Si votre périphérique GPS dessine des lignes trop fines, sélectionner cette " +#~ "option pour dessiner des lignes le long de votre chemin" + +#~ msgid "Choose the hue for the track color by the velocity at that point." +#~ msgstr "" +#~ "Choisir la teinte pour la couleur de la trace à partir de la vitesse à ce " +#~ "point." #~ msgid "Configure Sites ..." @@ -13112,7 +13320,9 @@ #~ msgstr "NullPointerException, Il est possible que des tags soient manquants" +#, java-format #~ msgid "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..." #~ msgstr "Envoi {0} {1} (id: {2}) {3}% {4}/{5} ({6} restant)..." +#, java-format #~ msgid "" #~ "The plugin {0} seem to be broken or could not be downloaded automatically." @@ -13121,4 +13331,5 @@ #~ "automatiquement." +#, java-format #~ msgid "" #~ "Please report a ticket at {0}
          Include your steps to get to the " @@ -13126,7 +13337,7 @@ #~ "information:" #~ msgstr "" -#~ "Veuillez ouvrir un ticket ici : {0}
          Incluez les étapes pour " -#~ "obtenir l’erreur (aussi détaillées que possible)
          Assrez-vous d’inclure " -#~ "les informations suivantes :" +#~ "Veuillez ouvrir un ticket ici : {0}
          Incluez les étapes pour obtenir " +#~ "l’erreur (aussi détaillées que possible)
          Assrez-vous d’inclure les " +#~ "informations suivantes :" #~ msgid "Highway Exit" @@ -13157,4 +13368,5 @@ #~ msgstr "Open Visible ..." +#, java-format #~ msgid "Version: {0}
          Last change at {1}" #~ msgstr "Version: {0}
          Dernier changement le {1}" @@ -13176,10 +13388,11 @@ #~ msgid "" -#~ "A OSM data validator that checks for common errors made by users and " -#~ "editor programs." +#~ "A OSM data validator that checks for common errors made by users and editor " +#~ "programs." #~ msgstr "" -#~ "Un validateur des données OSM qui vérifie les erreurs communes commises " -#~ "par les utilisateurs et les programmes d’édition." - +#~ "Un validateur des données OSM qui vérifie les erreurs communes commises par " +#~ "les utilisateurs et les programmes d’édition." + +#, java-format #~ msgid "Version {0} - Last change at {1}" #~ msgstr "Version {0} - Dernier changement le {1}" @@ -13194,7 +13407,4 @@ #~ msgstr "Chemins avec un nom similaire" -#~ msgid "Untagged nodes." -#~ msgstr "Nœud non étiqueté" - #~ msgid "Untagged, empty, and one node ways." #~ msgstr "Chemins vides, sans étiquette ou avec un seul nœud." @@ -13209,8 +13419,10 @@ #~ msgstr "Image réctifiée..." +#, java-format #~ msgid "Data error: lat value \"{0}\" is out of bounds." #~ msgstr "" #~ "Erreur de données : La valeur de latitude \\\"{0}\\\" est hors limite." +#, java-format #~ msgid "Data error: lon value \"{0}\" is out of bounds." #~ msgstr "" @@ -13220,47 +13432,47 @@ #~ msgstr "Version de développement. Révision inconnue." +#, java-format #~ msgid "" -#~ "Plugin archive already available. Do you want to download current version " -#~ "by deleting existing archive?\n" +#~ "Plugin archive already available. Do you want to download current version by " +#~ "deleting existing archive?\n" #~ "\n" #~ "{0}" #~ msgstr "" -#~ "L'archive du greffon a déjà été téléchargée. Souhiatez-vous télécharger " -#~ "la version actuelle en supprimant l'archive existante?\n" +#~ "L'archive du greffon a déjà été téléchargée. Souhiatez-vous télécharger la " +#~ "version actuelle en supprimant l'archive existante?\n" #~ "\n" #~ "{0}" #~ msgid "" -#~ "Fulltext search:
          • Baker Street - 'Baker' and 'Street' " -#~ "in any key or name.
          • \"Baker Street\" - 'Baker Street' in " -#~ "any key or name.
          • name:Bak - 'Bak' anywhere in the name.
          • -name:Bak - not 'Bak' in the name.
          • foot: - " -#~ "key=foot set to any value.
          • Special targets:
          • type: " -#~ "- type of the object (node, way, relation)
          • user:... - all objects changed by user
          • id:... - object with given ID
          • nodes:... - object with given " -#~ "number of nodes
          • modified - all changed objects
          • selected - all selected objects
          • incomplete - " -#~ "all incomplete objects
          • Use | or OR to combine with " -#~ "logical or
          • Use \" to quote operators (e.g. if key " -#~ "contains :)
          • Use ( and ) to group expressions
            • " +#~ "Fulltext search:
            • Baker Street - 'Baker' and 'Street' in " +#~ "any key or name.
            • \"Baker Street\" - 'Baker Street' in any key " +#~ "or name.
            • name:Bak - 'Bak' anywhere in the name.
            • -" +#~ "name:Bak - not 'Bak' in the name.
            • foot: - key=foot set to " +#~ "any value.
            • Special targets:
            • type: - type of the " +#~ "object (node, way, relation)
            • user:... - " +#~ "all objects changed by user
            • id:... - object with given " +#~ "ID
            • nodes:... - object with given number of " +#~ "nodes
            • modified - all changed objects
            • selected -" +#~ " all selected objects
            • incomplete - all incomplete " +#~ "objects
            • Use | or OR to combine with logical " +#~ "or
            • Use \" to quote operators (e.g. if key contains " +#~ ":)
            • Use ( and ) to group expressions
            " #~ msgstr "" #~ "Recherche plein texte :
            • Baker Street - 'Baker' et " -#~ "'Street' dans n'importe quelle clé ou nom.
            • \"Baker Street\" - 'Baker Street' dans n'importe quelle clé ou nom.
            • name:" -#~ "Bak - 'Bak' n'importe où dans le nom.
            • -name:Bak - sans " -#~ "'Bak' dans le nom.
            • foot: - key=foot défini sur une " -#~ "n'importe quelle valeur.
            • Special targets:
            • type: - " -#~ "type de l'objet (node, way, relation)
            • user:... - tous les objets modifiés par l'utilisateur
            • id:... - objets avec l'ID défini
            • nodes:... - " -#~ "objet avec le numéro de nœud spécifié
            • modified - tous les " -#~ "objetsmodifiés
            • selected - tous les objets sélectionnés
            • incomplete - tous les objets incomplets
            • Utilisez " -#~ "| ou OR pour combiner de façon logique ou
            • Utilisez " -#~ "\" pour citer les opérateurs (par ex. si la clé contient :)
            • Utilisez ( and ) pour grouper les expressions
              • " +#~ "'Street' dans n'importe quelle clé ou nom.
            • \"Baker Street\" - " +#~ "'Baker Street' dans n'importe quelle clé ou nom.
            • name:Bak - " +#~ "'Bak' n'importe où dans le nom.
            • -name:Bak - sans 'Bak' dans " +#~ "le nom.
            • foot: - key=foot défini sur une n'importe quelle " +#~ "valeur.
            • Special targets:
            • type: - type de l'objet " +#~ "(node, way, relation)
            • user:... - tous " +#~ "les objets modifiés par l'utilisateur
            • id:... - objets avec " +#~ "l'ID défini
            • nodes:... - objet avec le numéro de nœud " +#~ "spécifié
            • modified - tous les " +#~ "objetsmodifiés
            • selected - tous les objets " +#~ "sélectionnés
            • incomplete - tous les objets " +#~ "incomplets
            • Utilisez | ou OR pour combiner de façon " +#~ "logique ou
            • Utilisez \" pour citer les opérateurs (par ex. si " +#~ "la clé contient :)
            • Utilisez ( and ) pour grouper les " +#~ "expressions
            " #~ msgid "Add Node" @@ -13282,7 +13494,7 @@ #~ "upload these data. Maybe you have selected the wrong layer?" #~ msgstr "" -#~ "Les données sélectionnées contiennent des données de OpenStreetBugs." -#~ "
            Vous ne pouvez charger ces données. Peut-être avez-vous sélectionné " -#~ "la mauvaise couche ?" +#~ "Les données sélectionnées contiennent des données de " +#~ "OpenStreetBugs.
            Vous ne pouvez charger ces données. Peut-être avez-vous " +#~ "sélectionné la mauvaise couche ?" #~ msgid "Ref" @@ -13301,4 +13513,11 @@ #~ msgstr "bus" +#, java-format +#~ msgid "The \"{0}\" way must contain at least 2 nodes." +#~ msgstr "Le chemin \"{0}\" doit contenir au moins 2 nœuds." + +#~ msgid "Upload GPX track" +#~ msgstr "Charger la trace GPX" + #~ msgid "Direct Upload to OpenStreetMap" #~ msgstr "Envoi direct vers OpenStreetMap" Index: /applications/editors/josm/i18n/po/he.po =================================================================== --- /applications/editors/josm/i18n/po/he.po (revision 13832) +++ /applications/editors/josm/i18n/po/he.po (revision 13833) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-15 22:03+0100\n" -"PO-Revision-Date: 2009-02-15 16:42+0000\n" +"POT-Creation-Date: 2009-02-21 16:35+0100\n" +"PO-Revision-Date: 2009-02-22 16:59+0000\n" "Last-Translator: Moshe Sayag \n" "Language-Team: Hebrew \n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-02-15 20:40+0000\n" +"X-Launchpad-Export-Date: 2009-02-22 20:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 #, java-format msgid "" @@ -30,5 +30,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 msgid "" "This action will have no shortcut.\n" @@ -38,5 +38,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -47,5 +47,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(טיפ: ניתן לערוך את הקיצורים ב\"מאפיינים\")" @@ -56,17 +56,17 @@ #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 msgid "Information" msgstr "מידע" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Do nothing" msgstr "אל תעשה כלום" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Report Bug" msgstr "דווח על תקלה" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 msgid "" "An unexpected exception occurred.\n" @@ -80,18 +80,18 @@ "האחרונה של JOSM, היה נחמד ודווח על התקלה." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Unexpected Exception" msgstr "שגיאה בלתי צפויה" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 #, java-format msgid "Please report a ticket at {0}" msgstr "אנא דווח על {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "כלול את הצעדים לקבלת השגיאה (בפירוט רב ככל האפשר)!" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:78 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -99,9 +99,9 @@ msgstr "נסה לעדכן לגירסא האחרונה של JOSM וכל התוספים לפני דיווח על תקלה." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Be sure to include the following information:" msgstr "וודא שכללת את המידע הבא:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75 msgid "(The text has already been copied to your clipboard.)" msgstr "(הטקסט כבר הועתק ל-clipboard שלך)." @@ -115,5 +115,5 @@ msgstr "שגיאה בניגון הצליל" -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:94 @@ -121,5 +121,5 @@ msgstr "מתחבר לשרת OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:48 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:32 @@ -127,10 +127,10 @@ msgstr "מוריד מידע של OSM..." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 msgid "NullPointerException, possibly some missing tags." msgstr "NullPointerException, כנראה שחסרים תגים." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83 msgid "Preparing data..." msgstr "מכין נתונים..." @@ -149,5 +149,6 @@ "Server returned internal error. Try a reduced area or retry after waiting " "some time." -msgstr "השרת דיווח על שגיאה פנימית. נסה להקטין את השטח או נסה מחדש מאוחר יותר." +msgstr "" +"השרת דיווח על שגיאה פנימית. נסה להקטין את השטח או נסה מחדש מאוחר יותר." #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 @@ -156,48 +157,48 @@ msgstr "מוריד נקודות {0} עד {1}..." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:164 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:168 msgid "Unknown version" msgstr "גרסה לא ידוע" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 msgid "Found element in non-way." msgstr "נמצא שלא בתוך דרך." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 msgid " has zero ref" msgstr "ל אין התייחסות (ref)" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 msgid "Found element in non-relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:252 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250 msgid "Incomplete specification with ref=0" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294 msgid "Illegal object with id=0" msgstr "עצם לא חוקי עם id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 #, java-format msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +msgstr "מדלג על דרך כי היא מכילה נקודה שאינה קיימת: {0}\n" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:502 msgid "Prepare OSM data..." msgstr "מכין נתוני OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:518 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:516 msgid "Ill-formed node id" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:280 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:287 msgid "Parse error: invalid document structure for gpx document" msgstr "שגיאת ניתוח. למסמך gpx מבנה לא תקין." @@ -207,18 +208,18 @@ msgstr "מתחבר לשרת..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 msgid "Provide a brief comment for the changes you are uploading:" msgstr "ספק הערה קצרה לשינויים שאתה מעלה:" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 msgid "Commit comment" msgstr "הערת ביצוע" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64 @@ -228,34 +229,32 @@ msgstr "אירעה שגיאה: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:192 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190 msgid "Opening changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:226 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224 msgid "Server does not support changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:246 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:428 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:609 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:184 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607 msgid "Unknown host" msgstr "מארח לא ידוע" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282 msgid "Preparing..." msgstr "מכין..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:294 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292 msgid "Uploading..." msgstr "מעלה..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375 msgid "Closing changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:652 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650 msgid "Transfer aborted due to error (will wait for 5 seconds):" msgstr "ההעברה הופסקה בגלל שגיאה (יחכה 5 שניות):" @@ -289,21 +288,24 @@ #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95 msgid "Login" -msgstr "" +msgstr "התחברות" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95 #: ../core/src/org/openstreetmap/josm/Main.java:348 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:29 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 @@ -316,11 +318,11 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:110 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -335,11 +337,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:186 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 msgid "Creating main GUI" msgstr "" #: ../core/src/org/openstreetmap/josm/Main.java:195 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:271 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:278 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:56 msgid "Help" @@ -365,9 +367,9 @@ #: ../core/src/org/openstreetmap/josm/Main.java:348 msgid "Save and Exit" -msgstr "" +msgstr "שמור וצא" #: ../core/src/org/openstreetmap/josm/Main.java:348 msgid "Discard and Exit" -msgstr "" +msgstr "התעלם משינויים וצא" #: ../core/src/org/openstreetmap/josm/Main.java:374 @@ -381,27 +383,28 @@ msgstr "מתעלם מ-URL לא תקין לקובץ: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109 msgid "min lat" msgstr "רוחב מזערי" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111 msgid "min lon" msgstr "אורך מזערי" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:117 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "max lat" msgstr "רוחב מירבי" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 msgid "max lon" msgstr "אורך מירבי" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:122 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " "area)" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:134 +"כתובת מ www.openstreetmap.org (אתה יכול להדביק כאן כתובת להורדת האיזור)" + +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130 msgid "Bounding Box" msgstr "" @@ -437,6 +440,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:96 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:894 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:956 msgid "name" msgstr "שם" @@ -469,5 +472,5 @@ msgstr "מיקוד" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:107 msgid "" "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -475,5 +478,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:109 msgid "Slippy map" msgstr "" @@ -484,7 +487,7 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:605 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:602 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:89 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -504,5 +507,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380 msgid "Remove" msgstr "הסר" @@ -643,22 +646,22 @@ msgstr "במידה וצויין, אפס את התצורה במקום לקרוא אותה." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:109 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:186 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:198 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:108 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:191 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:203 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 msgid "Java OpenStreetMap Editor" -msgstr "עורך OpenStreetMap בג'אווה" - -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:111 +msgstr "Java ב OpenStreetMap עורך" + +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:110 msgid "Message of the day not available" msgstr "מסר יומי זמין" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:200 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:205 msgid "Downloading \"Message of the day\"" -msgstr "" +msgstr "מוריד את \"המסר היומי\"" #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84 @@ -696,33 +699,33 @@ msgstr "ריחוק צפיה" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:234 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:474 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:512 msgid "" msgstr "<שונה>" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:383 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:380 msgid "More information about this feature" msgstr "עוד מידע על הכלי הזה" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:393 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:390 msgid "Optional Attributes:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:437 +msgstr "מאפייני רשות:" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:438 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:435 #, java-format msgid "Use preset ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 msgid "way" @@ -731,11 +734,11 @@ msgstr[1] "דרכים" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:214 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 msgid "node" msgid_plural "nodes" @@ -743,39 +746,39 @@ msgstr[1] "צמתים" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:81 msgid "relation" msgid_plural "relations" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 +msgstr[0] "יחס" +msgstr[1] "יחסים" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:475 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 #, java-format msgid "Unknown type: {0}" +msgstr "סוג לא ידוע: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:549 +#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 +#, java-format +msgid "Could not read tagging preset source: {0}" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 -#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 -#, java-format -msgid "Could not read tagging preset source: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:555 #, java-format msgid "Error parsing {0}: " msgstr "שגיאה בניתוח {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:572 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:569 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595 #, java-format msgid "Change {0} object" @@ -784,9 +787,17 @@ msgstr[1] "שנה {0} עצמים" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 msgid "Nothing selected!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 +msgstr "כלום לא נבחר!" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 +msgid "Selection unsuitable!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +msgid "Apply Preset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 msgid "Change Properties" msgstr "שנה תכונות" @@ -797,14 +808,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:107 msgid "File" msgstr "קובץ" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:135 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:107 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:86 @@ -816,22 +827,22 @@ msgstr "ערוך" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 msgid "View" msgstr "תצוגה" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:26 msgid "Tools" msgstr "כלים" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:141 msgid "Audio" msgstr "שמע" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:142 msgid "Presets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:40 @@ -843,18 +854,18 @@ msgstr "תפריט: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:210 msgid "Wireframe View" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212 msgid "Toggle Wireframe view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:28 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 msgid "Contacting the OSM server..." msgstr "יוצר קשר עם שרת ה-OSM..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 #, java-format msgid "This will change up to {0} object." @@ -863,11 +874,11 @@ msgstr[1] "זה ישנה עד {0} עצמים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 msgid "An empty value deletes the key." msgstr "ערך ריק מוחק את המפתח." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66 @@ -877,7 +888,7 @@ msgstr "מפתח" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 @@ -886,10 +897,10 @@ msgstr "ערך" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333 msgid "Change values?" msgstr "לשנות ערכים?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:257 #, java-format msgid "Change properties of up to {0} object" @@ -898,33 +909,33 @@ msgstr[1] "שנה תכונות של עד {0} עצמים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 msgid "Please select a key" msgstr "נא בחר מפתח" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321 msgid "Please select a value" msgstr "נא בחר ערך" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:445 msgid "Please select the objects you want to change properties for." msgstr "בחר את העצמים שאתה רוצה לשנות את תכונותיהם." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 msgid "Properties/Memberships" msgstr "תכונות\\חברויות" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 msgid "Properties for selected objects." msgstr "תכונות לעצמים שנבחרו." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97 @@ -936,58 +947,58 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 msgid "Member Of" msgstr "חבר ב" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Role" msgstr "תפקיד" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:559 msgid "Change relation" msgstr "שנה יחס" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560 #, java-format msgid "Really delete selection from relation {0}?" msgstr "באמת מחק את הבחירה מהיחס {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 msgid "Delete from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 +msgstr "מחק מיחס" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:600 msgid "Add Properties" msgstr "הוסף תכונות" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 msgid "Add a new key/value pair to all objects" msgstr "הוסף מצד מפתח/ערך לכל הפריטים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 msgid "Edit Properties" msgstr "ערוך מאפיינים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609 msgid "Edit the value of the selected key for all objects" msgstr "ערוך את הערך של המפתח הנבחר עבור כל הפריטים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 msgid "Delete Properties" msgstr "מחק מאפיינים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:77 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:293 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 @@ -996,98 +1007,115 @@ msgstr "מחק" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 msgid "Delete the selected key in all objects" msgstr "מחק את המפתח הנבחר בכל הפריטים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:763 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "תכונות: {0} \\ חברויות: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:769 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 msgid "Properties / Memberships" msgstr "תכונות \\ חברויות" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178 +msgid "Apply Changes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 msgid "Create new relation" msgstr "צור יחס חדש" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208 msgid "Edit new relation" msgstr "ערוך יחס חדש" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209 #, java-format msgid "Edit relation #{0}" msgstr "ערוך יחס מספר {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230 +msgid "Basic" +msgstr "בסיסי" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Occupied By" msgstr "תפוס ע\"י" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311 msgid "Tags (empty value deletes tag)" msgstr "תוויות (ערך ריק מוחק את התווית)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313 msgid "Members" msgstr "חברים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 +msgid "Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 msgid "Move the currently selected members up" msgstr "הזז את החברים הנבחרים מעלה" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358 +msgid "Add Selected" +msgstr "הוסף את הנבחרים" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359 +msgid "Add all currently selected objects as members" +msgstr "הוסף את כל העצמים הנבחרים כחברים" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365 +msgid "Remove Selected" +msgstr "הסרת הנבחרים" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366 +msgid "Remove all currently selected objects from relation" +msgstr "הסר את כל העצמים הנבחרים מהיחס" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 +msgid "Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 msgid "Move the currently selected members down" msgstr "הזז מטה את החברים שנבחרו" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356 -msgid "Add Selected" -msgstr "הוסף את הנבחרים" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:357 -msgid "Add all currently selected objects as members" -msgstr "הוסף את כל העצמים הנבחרים כחברים" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:363 -msgid "Remove Selected" -msgstr "הסרת הנבחרים" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:364 -msgid "Remove all currently selected objects from relation" -msgstr "הסר את כל העצמים הנבחרים מהיחס" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381 msgid "Remove the member in the current table row from this relation" msgstr "הסר את החבר בשורת הטבלה הבחורה מהיחס" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394 msgid "Download Members" msgstr "הורד חברים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:406 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395 msgid "Download all incomplete ways and nodes in relation" msgstr "הורד את כל הדרכים והנקודות הבלתי שלמות ביחס" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:415 -msgid "Basic" -msgstr "בסיסי" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:453 #, java-format msgid "Members: {0}" msgstr "חברים: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:587 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:461 +#, java-format +msgid "Relation Editor: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:585 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 msgid "There were conflicts during import." msgstr "ארעו התנגשויות במהלך הייבוא." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593 msgid "Error parsing server response." msgstr "שגיאה בניתוח תשובת השרת." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:600 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:594 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:598 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -1101,9 +1129,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:345 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 msgid "Error" msgstr "שגיאה" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:599 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597 msgid "Cannot connect to server." msgstr "לא יכול להתחבר לשרת" @@ -1187,5 +1215,6 @@ msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "סגור את הפאנל. ניתן לפתוח אותו מחדש בעזרת הכפתורים בסרגל הכלים השמאלי." +msgstr "" +"סגור את הפאנל. ניתן לפתוח אותו מחדש בעזרת הכפתורים בסרגל הכלים השמאלי." #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220 @@ -1203,5 +1232,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 msgid "Delete Layer" -msgstr "" +msgstr "מחק שכבה" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 @@ -1262,5 +1291,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:94 @@ -1270,5 +1299,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 msgid "" @@ -1287,5 +1316,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 msgid "Search" -msgstr "חיפוש" +msgstr "חפש" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 @@ -1301,5 +1330,5 @@ #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "" +msgstr "בחר: יחסים:{0} \\ דרכים: {1} \\ נקודות: {2}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 @@ -1334,16 +1363,24 @@ msgstr "בחירה: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +msgid "Open an editor for the selected relation" +msgstr "פתח עורך עבור היחס הנבחר" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +msgid "Delete the selected relation" +msgstr "מחק את היחס הנבחר" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 #: trans_presets.java:2904 msgid "Relations" msgstr "יחסים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 msgid "Open a list of all relations." msgstr "פתח רשימה של כל היחסים." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 @@ -1351,17 +1388,9 @@ msgstr "חדש" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 msgid "Create a new relation" msgstr "צור יחס חדש" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open an editor for the selected relation" -msgstr "פתח עורך עבור היחס הנבחר" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -msgid "Delete the selected relation" -msgstr "מחק את היחס הנבחר" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:130 #, java-format msgid "Relations: {0}" @@ -1389,47 +1418,47 @@ msgstr "מצבור פקודות: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +msgid "Resolve" +msgstr "פתור" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +msgid "Open a merge dialog of all selected items in the list above." +msgstr "פתח את תיבת דו-שיח עבור כל הפריטים הנבחרים ברשימה שלהלן." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Conflict" msgstr "התנגשות" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 msgid "Merging conflicts." msgstr "התנגשויות מתמזגות" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67 -msgid "Resolve" -msgstr "פתור" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:68 -msgid "Open a merge dialog of all selected items in the list above." -msgstr "פתח את תיבת דו-שיח עבור כל הפריטים הנבחרים ברשימה שלהלן." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:105 -msgid "Please select something from the conflict list." -msgstr "נא בחר משהו מרשימת ההתנגשות." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Resolve Conflicts" msgstr "פתור התנגשויות" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +msgid "Solve Conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 #, java-format msgid "Conflicts: {0}" msgstr "התנגשויות: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Conflicts" msgstr "התנגשויות" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 msgid "conflict" msgstr "התנגשות" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 msgid "background" msgstr "רקע" @@ -1453,5 +1482,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 msgid "Customize Color" @@ -1459,5 +1488,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1467,5 +1496,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1474,5 +1503,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:326 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:152 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -1490,5 +1519,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:265 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 #, java-format msgid "Audio synchronized at point {0}." @@ -1496,5 +1525,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232 msgid "Unable to synchronize in layer being played." msgstr "" @@ -1515,5 +1544,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:958 msgid "desc" msgstr "תיאור" @@ -1535,5 +1564,5 @@ msgstr "שגיאה בהצגת URL" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -1541,5 +1570,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -1547,18 +1576,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224 msgid "Unable to create new audio marker." msgstr "לא יכול ליצור סמן שמע חדש." #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 msgid "Convert to data layer" msgstr "המר לשכבת נתונים" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:725 -msgid "" -"Upload of unprocessed GPS data as map data is considered harmful." -"
            If you want to upload traces, look here:" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:645 +msgid "" +"Upload of unprocessed GPS data as map data is considered " +"harmful.
            If you want to upload traces, look here:" msgstr "" "העלאת קובץ נתוני GPS לא מעובדים נחשבת מזיקה.
            אם אתה רוצה להעלות " @@ -1566,64 +1595,22 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:646 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:747 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:448 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:667 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "Converted from: {0}" msgstr "המר מ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612 -msgid "Upload this trace..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:616 -msgid "" -"This functionality has been added only recently. Please
            use with " -"care and check if it works as expected." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:102 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:107 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:626 -msgid "Upload track filtered by JOSM" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:103 -#, java-format -msgid "Upload raw file: {0}" -msgstr "העלה קובץ גולמי: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:108 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:627 -msgid "Upload raw file: " -msgstr "העלה קובץ גולמי: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640 -msgid "Description:" -msgstr "תיאור:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:123 -msgid "Tags:" -msgstr "תגיות:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:129 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:648 -msgid "GPX-Upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:229 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:217 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113 msgid "gps point" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:258 +msgstr "נקודת gps" + +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 #: trans_presets.java:1795 trans_presets.java:1801 trans_presets.java:1807 #: trans_presets.java:1813 trans_presets.java:1819 trans_presets.java:1825 @@ -1643,5 +1630,5 @@ msgstr[1] "מסלולים" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 msgid "point" msgid_plural "points" @@ -1649,5 +1636,5 @@ msgstr[1] "נקודות" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 #, java-format msgid "a track with {0} point" @@ -1656,5 +1643,5 @@ msgstr[1] "מסלול בעל {0} נקודות" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} consists of {1} track" @@ -1663,5 +1650,5 @@ msgstr[1] "{0} מורכב מ-{1} מסלולים" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} point" @@ -1670,25 +1657,25 @@ msgstr[1] "{0} נקודות" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117 msgid "Customize line drawing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:296 +msgstr "התאם ציור קו" + +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 msgid "Use global settings." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 msgid "Draw lines between points for this layer." msgstr "צייר קווים בין נקודות בשכבה זו." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:298 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123 msgid "Do not draw lines between points for this layer." msgstr "אל תצייר קווים בין נקודות בשכבה זו." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:135 msgid "Select line drawing options" @@ -1722,5 +1709,5 @@ msgstr "תמונות JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290 #, java-format msgid "{0} track, " @@ -1729,5 +1716,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 #, java-format msgid "{0} route, " @@ -1736,5 +1723,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 #, java-format msgid "{0} waypoint" @@ -1743,55 +1730,51 @@ msgstr[1] "{0} נקודות דרך" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #, java-format msgid "Name: {0}" msgstr "שם: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "Description: {0}" msgstr "תיאור: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 msgid "Timespan: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Length: " msgstr "אורך: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:642 -msgid "Tags (keywords in GPX):" -msgstr "תגים (מילות מפתח ב GPX)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:655 msgid "time" msgstr "זמן" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:780 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:679 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:700 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 msgid "Download from OSM along this track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:686 msgid "Download everything within:" msgstr "הורד הכל עם:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 #, java-format msgid "{0} meters" msgstr "{0} מטרים" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:692 msgid "Maximum area per request:" msgstr "שטח מירבי לבקשה" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 #, java-format msgid "{0} sq km" msgstr "{0} קמ\"ר" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787 #, java-format msgid "" @@ -1799,17 +1782,17 @@ "wish
            to continue?" msgstr "" -"הפעולה הזו דורשת {0} בקשות
            הורדה נפרדות. האם אתה רוצה
            להמשיך?" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 +"הפעולה הזו דורשת {0} בקשות
            הורדה נפרדות. האם אתה " +"רוצה
            להמשיך?" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:844 #, java-format msgid "Audio markers from {0}" msgstr "סמן שמע מ {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "" "Some waypoints with timestamps from before the start of the track were " @@ -1817,9 +1800,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " "time were omitted." msgstr "" +"כמה נקודות דרך שהיו רחוקות מידי מהמסלול מכדי שיהיה אפשר להעריך את הזמן שלהם " +"באופן הגיוני הושמטו." #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98 @@ -1923,19 +1908,19 @@ msgstr "לא ניתן לנתח את הזמן שהוזן." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:140 msgid "outside downloaded area" msgstr "מחוץ לשטח שהורד" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 #, java-format msgid "{0} consists of:" msgstr "{0} מורכב מ-:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:353 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:347 #, java-format msgid " ({0} deleted.)" msgstr " ({0} נמחק/ו.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:445 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 msgid "Convert to GPX layer" msgstr "המר לשכבת GPX" @@ -1963,37 +1948,37 @@ msgstr "לא ניתן לכתוב סימניות." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 msgid "The geographic longitude at the mouse pointer." msgstr "קו האורך הגיאוגרפי בסמן העכבר." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The name of the object at the mouse pointer." msgstr "שם העצם בסמן העכבר." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 msgid "The geographic latitude at the mouse pointer." msgstr "קו הרוחב הגיאוגרפי בסמן העכבר." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The angle between the previous and the current way segment." msgstr "הזווית בין קטע הדרך הקודם לנוכחי" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The (compass) heading of the line segment being drawn." msgstr "כיוון (המצפן) של קטע הדרך מצויר." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The length of the new way segment being drawn." msgstr "אורך קטע הדרך החדש מצויר." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:160 msgid "(no object)" msgstr "(אין עצם)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:62 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:56 msgid "Color" msgstr "צבע" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:57 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107 #: trans_presets.java:56 trans_presets.java:92 trans_presets.java:130 @@ -2094,27 +2079,36 @@ msgstr "שם" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:118 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:112 #, java-format msgid "Paint style {0}: {1}" msgstr "סגנון ציור {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 msgid "Choose" msgstr "בחר" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 msgid "Please select a color." msgstr "בחר צבע." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 #, java-format msgid "Choose a color for {0}" msgstr "בחר צבע עבור {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +msgid "Set to default" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:172 +msgid "Set all to default" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:184 msgid "Colors used by different objects in JOSM." msgstr "צבעים בשימוש עצמים אחרים ב JOSM" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:171 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:198 msgid "Colors" msgstr "צבעים" @@ -2135,5 +2129,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39 msgid "Base Server URL" -msgstr "" +msgstr "כתובת שרת הבסיס" #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41 @@ -2147,23 +2141,26 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45 msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
            The password is transfered in plain text to the server, encoded in the " -"URL.
            Do not use a valuable Password." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:45 +"WARNING: The password is stored in plain text in the preferences " +"file.
            The password is transfered in plain text to the server, encoded in " +"the URL.
            Do not use a valuable Password." +msgstr "" +"הזערה: הסיסמא נשמרת בצורה לא מוצפנת בקובץ המאפיינים.
            הסיסמא נשלחת " +"בצורה לא מוצפנת לשרת, מקודדת בכתובת.
            אל תשתמש בסיסמא בעלת " +"ערך." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44 msgid "Sort presets menu" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46 msgid "Enable built-in defaults" msgstr "אפשר ברירות מחדל מובנות" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:58 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69 msgid "Tagging preset source" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:156 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 @@ -2171,5 +2168,5 @@ msgstr "נא בחר את השורה לעריכה." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500 @@ -2178,24 +2175,24 @@ msgstr "נא בחר את השורה למחיקה." +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88 +msgid "" +"The sources (URL or filename) of tagging preset definition files. See " +"http://josm.openstreetmap.de/wiki/TaggingPresets for help." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89 -msgid "" -"The sources (URL or filename) of tagging preset definition files. See http://" -"josm.openstreetmap.de/wiki/TaggingPresets for help." +msgid "Add a new tagging preset source to the list." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 -msgid "Add a new tagging preset source to the list." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 msgid "Delete the selected source from the list." msgstr "מחק את המקור הנבחר מהרשימה" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:94 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93 msgid "Tagging Presets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97 msgid "Tagging preset sources" msgstr "" @@ -2209,6 +2206,6 @@ msgstr "בזמן שמירה, שמור קובצי גיבוי המסתיימים ב ~" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:141 @@ -2216,34 +2213,34 @@ msgstr "תוספים" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 msgid "Configure available plugins." msgstr "התאם תוספים זמינים." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43 msgid "Download List" msgstr "הורד רשימה" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:80 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51 msgid "Update" msgstr "עדכן" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:60 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 msgid "Configure Sites..." msgstr "התאם אתרים..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add either site-josm.xml or Wiki Pages." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99 msgid "Please select an entry." msgstr "בחר כניסה." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 msgid "Configure Plugin Sites" msgstr "התאם אתרי תוספים" @@ -2419,9 +2416,9 @@ msgstr "כיול רשם קול" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "Display Settings" msgstr "הגדרות תצוגה" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "" "Various settings that influence the visual representation of the whole " @@ -2429,55 +2426,63 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings" msgstr "הגדרות חיבור" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings for the OSM server." msgstr "הגדרות חיבור לשרת OSM" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Map Settings" msgstr "הגדרות מפה" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Settings for the map projection and data interpretation." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Audio Settings" msgstr "הגדרות שמע" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Settings for the audio player and audio markers." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97 msgid "You have to restart JOSM for some settings to take effect." msgstr "יהיה עליך להפעיל את JOSM מחדש כדי שכמה מההגדרות יכנסו לתוקף." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:25 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 msgid "Draw lines between raw gps points." msgstr "צייר קווים בין נקודות ה-gps הגולמיות." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:27 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 msgid "Force lines if no segments imported." msgstr "הכרח קווים במידה ולא יובאו מקטעים." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:28 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 msgid "Draw large GPS points." msgstr "צייר נקודות GPS גדולות." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 -msgid "Color tracks by velocity." -msgstr "צבע מסלולים לפי מהירות." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34 +msgid "Velocity (red = slow, green = fast)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 +msgid "Dilution of Position (red = high, green = low, if available)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 +msgid "Single Color (can be customized for named layers)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:1346 msgid "Car" msgstr "מכונית" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:309 trans_presets.java:635 trans_presets.java:833 #: trans_presets.java:842 trans_presets.java:851 trans_presets.java:864 @@ -2489,5 +2494,5 @@ msgstr "אופניים" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:310 trans_presets.java:637 trans_presets.java:832 #: trans_presets.java:841 trans_presets.java:850 trans_presets.java:863 @@ -2498,44 +2503,44 @@ msgstr "רגל" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 msgid "Draw Direction Arrows" msgstr "צייר חיצי כיוון" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 msgid "Fast drawing (looks uglier)" msgstr "ציור מהיר (נראה מכוער יותר)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180 msgid "Only interesting direction hints (e.g. with oneway tag)." msgstr "רק רמזי כיוון מעניינים (למשל עם תג חד-סטרי)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:186 msgid "Only on the head of a way." msgstr "רק בראשית הדרך" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44 msgid "Draw segment order numbers" msgstr "צייר מספרים סידוריים של קטע" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45 msgid "Draw boundaries of downloaded data" msgstr "צייר גבולות של נתונים שהורדו" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46 msgid "Draw virtual nodes in select mode" msgstr "צייר נקודות וירטואליות במצב הנבחר" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47 msgid "Draw inactive layers in other color" msgstr "צייר שכבות לא פעילות בצבע שונה" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 msgid "Smooth map graphics (antialiasing)" msgstr "החלק גרפיקה של מפה (antialiasing)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 msgid "" "If your gps device draws too few lines, select this to draw lines along your " @@ -2545,27 +2550,28 @@ "דרכך." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:71 msgid "" "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines." msgstr "אורך מירבי (במטרים) לציור קוים. קבע כ'1-' לציור כל הקווים" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73 msgid "Maximum length (meters)" msgstr "אורך מירבי (מטרים)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:77 msgid "" "Force drawing of lines if the imported data contain no line information." msgstr "הכרח ציור קווים במידה והנתונים המיובאים אינם מכילים נתוני קווים." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:84 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89 msgid "Draw direction arrows for lines, connecting GPS points." msgstr "צייר חצי כיוון לקווים המחברים נקודות GPS." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90 -msgid "Draw the direction arrows using table lookups instead of complex math." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95 +msgid "" +"Draw the direction arrows using table lookups instead of complex math." msgstr "צייר את חצי הכיוון תוך שימוש בטבלת חיפוש במקום חישובים מסובכים." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:96 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:101 msgid "" "Don't draw arrows if they are not at least this distance away from the last " @@ -2573,49 +2579,66 @@ msgstr "אל תצייר חצים אם הם לא לפחות במרחק זה מהקודם." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104 msgid "Minimum distance (pixels)" msgstr "מרחק מינימלי (פיקסלים)" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:109 -msgid "Choose the hue for the track color by the velocity at that point." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116 -msgid "Allows to tune the track coloring for different average speeds." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122 msgid "Draw larger dots for the GPS points." msgstr "צייר נקודות גדולות יותר עבור נקודות ה-GPS" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136 +msgid "" +"All points and track segments will have the same color. Can be customized in " +"Layer Manager." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137 +msgid "Colors points and track segments by velocity." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:138 +msgid "" +"Colors points and track segments by dilution of position (HDOP). Your " +"capture device needs to logs that information." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143 +msgid "Allows to tune the track coloring for different average speeds." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148 +msgid "Track and Point Coloring" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 msgid "GPS Points" msgstr "נקודות GPS" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175 msgid "Draw direction hints for way segments." msgstr "צייר רמזי כיוון עבור קטעי דרך." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:163 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192 msgid "Draw the order numbers of all segments within their way." msgstr "צייר את המספרים הסידוריים של כל הקטעים בתוך הדרכים שלהם." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:168 -msgid "Apply antialiasing to the map view resulting in a smoother appearance." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:197 +msgid "" +"Apply antialiasing to the map view resulting in a smoother appearance." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202 msgid "Draw the boundaries of data loaded from the server." msgstr "צייר את גבולות המידע שמורד מהשרת." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:178 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:207 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "צייר נקודיות וירטואליות במצב הנבחר להקלת שינוי דרך" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212 msgid "Draw the inactive data layers in a different color." msgstr "צייר את שכבת הנתונים הלא פעילה בצבע אחר." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219 msgid "OSM Data" msgstr "נתוני OSM" @@ -2723,6 +2746,6 @@ "a menu entry of button for the first time. So some of your changes may " "become active even without restart --- but also without collistion handling. " -"This is another reason to restart JOSM after making any changes here." -"

            " +"This is another reason to restart JOSM after making any changes " +"here.

            " msgstr "" @@ -2735,8 +2758,9 @@ "key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also " "there will be 'keys' listed that correspond to a shortcut on your keyboard " -"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/" -"Semicolon on US keyboards, '.'/Period on German keyboards, ...) instead. Not " -"doing so may result in conflicts, as there is no way for JOSM to know that " -"Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...

            " +"(e.g. ':'/Colon). Please also do not use them, use the base key " +"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) " +"instead. Not doing so may result in conflicts, as there is no way for JOSM " +"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US " +"keyboard...

            " msgstr "" @@ -2760,6 +2784,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183 msgid "" -"

            The pseudo-modifier 'disabled' will disable the shortcut when encountered." -"

            " +"

            The pseudo-modifier 'disabled' will disable the shortcut when " +"encountered.

            " msgstr "" @@ -2829,67 +2853,67 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:231 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:236 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:250 msgid "layer not in list." msgstr "השכבה אינה ברשימה." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "usage" msgstr "שימוש" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 msgid "options" msgstr "אפשרויות" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 msgid "Show this help" msgstr "הצג עזרה זו" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +msgid "Standard unix geometry argument" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +msgid "Download the bounding box" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 -msgid "Standard unix geometry argument" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 -msgid "Download the bounding box" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 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:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Open file (as raw gps, if .gpx)" msgstr "פתח קובץ (כ-gps גולמי, אם gpx.)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 msgid "Download the bounding box as raw gps" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Select with the given search" msgstr "בחר עם החיפוש הנתון" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 msgid "Don't launch in fullscreen mode" msgstr "אל תריץ במסך מלא" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 msgid "Reset the preferences to default" msgstr "אפס את המאפיינים לברירת מחדל" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 msgid "Set the language." msgstr "קבע את השפה." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 msgid "examples" msgstr "דוגמאות" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -2897,21 +2921,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 msgid "Instead of --download= you may specify osm://\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 msgid "Activating updated plugins" msgstr "מפעיל תוספים מעודכנים" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 msgid "Loading early plugins" msgstr "טען תוספים מוקדמים" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Setting defaults" msgstr "קביעת ברירות מחדל" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171 msgid "Loading plugins" msgstr "טעינת תוספים" @@ -2945,6 +2969,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:108 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:164 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:162 #: trans_presets.java:308 trans_presets.java:309 trans_presets.java:310 #: trans_presets.java:311 trans_presets.java:312 trans_presets.java:313 @@ -2961,5 +2985,5 @@ msgstr "לא ידוע" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:66 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 #, java-format msgid "" @@ -2968,25 +2992,25 @@ msgstr "אזהרה - התבקשה טעינת התוסף {0}. התוסף כבר לא נדרש." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 #, java-format msgid "Plugin requires JOSM update: {0}." msgstr "תוסף דורש את עדכון JOSM: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "התוסף {0} דרוש ע\"י התוסף {1} אך אינו נמצא." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 #, java-format msgid "Plugin not found: {0}." msgstr "תוסף לא נמצא: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "התוסף עודכן לאחרונה לפני {0} ימים." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 msgid "" "(You can change the number of days after which this warning appears
            by " @@ -2996,17 +3020,17 @@ "'pluginmanager.warntime')." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 msgid "Disable plugin" msgstr "נטרל תוסף" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "לא יכול לטעון את התוסף {0}. למחוק מהמאפיינים?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -3016,5 +3040,5 @@ "הקיימים." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 #, java-format msgid "" @@ -3022,19 +3046,19 @@ msgstr "שגיאה בלתי צפויה אירעה שנובעת כנראה מהתוסף \"{0}\"." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "לפי המידע בתוסף, המחבר הוא {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:262 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 msgid "" "Try updating to the newest version of this plugin before reporting a bug." msgstr "נסה לעדכן לגירסא האחרונה של התוסף לפני דיווח על תקלה." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 msgid "Should the plugin be disabled?" msgstr "האם התוסף צריך ליהיות מנוטרל?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:278 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -3042,5 +3066,5 @@ msgstr "התוסף הוסר מהתצורה. אתחל מחדש את JOSM להסרת התוסף." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -3048,6 +3072,6 @@ msgstr "לא ניתן להסיר את התוסף. אנא ספר למי שסיפק לך את JOSM על הבעיה." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:322 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:181 msgid "no description available" msgstr "אין תיאור זמין" @@ -3059,5 +3083,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 msgid "Update Plugins" msgstr "עדכן תוספים" @@ -3092,5 +3116,5 @@ msgstr "כנראה שהתוסף {0} אינו תקין או שאי אפשר להוריד אותו בצורה אוטומטית." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 #, java-format msgid "Downloaded plugin information from {0} site" @@ -3099,13 +3123,13 @@ msgstr[1] "הורד מידע על התוסף מ{0} אתרים" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 msgid "No plugin information found." msgstr "מידע על התוסף לא נמצא." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:76 msgid "All installed plugins are up to date." msgstr "כל התוספים המותקנים מעודכנים." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 #, java-format msgid "" @@ -3118,9 +3142,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:105 msgid "Download missing plugins" msgstr "הורד תוספים חסרים" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:106 #, java-format msgid "" @@ -3133,22 +3157,22 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 msgid "Download Plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:170 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:168 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: גירסא {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:176 msgid "Plugin bundled with JOSM" msgstr "תוסף ארוז עם JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208 msgid "Plugin already exists" msgstr "התוסף כבר קיים" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:211 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:209 #, java-format msgid "" @@ -3162,15 +3186,15 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 msgid "Delete and Download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:222 #, java-format msgid "Error deleting plugin file: {0}" msgstr "שגיאה במחיקת קובץ התוסף: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:281 #, java-format msgid "Error reading plugin information file: {0}" @@ -3237,10 +3261,10 @@ msgstr "מחק {0}{1}" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:165 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 msgid "Conflicting relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 #, java-format msgid "" @@ -3249,5 +3273,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:166 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 #, java-format msgid "" @@ -3262,7 +3286,7 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:349 msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
            This can cause problems because other objects (that you don't see) might " -"use them.
            Do you really want to delete?" +"You are about to delete nodes outside of the area you have " +"downloaded.
            This can cause problems because other objects (that you don't " +"see) might use them.
            Do you really want to delete?" msgstr "" "אתה עומד למחוק נקודות מחוץ לשטח שהורדת.
            זה עלול לגרום לבעיות כיוון שעצמים " @@ -3382,124 +3406,135 @@ msgstr "לא יכול לטעון מאפיינים משרת." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:232 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:426 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:428 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:527 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:765 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:776 msgid "Empty member in relation." msgstr "איבר ריק ביחס." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:767 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:531 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "מחק איבר \"{0}\" ביחס." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:547 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "הדרך \"{0}\" בת פחות משתי נקודות." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:552 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:549 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:558 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:561 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 +msgid "More than one \"via\" found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 #, java-format msgid "Unknown role ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 #, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 msgid "No \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 msgid "No \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -msgid "No \"via\" node found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +msgid "No \"via\" node or way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:636 -#, java-format -msgid "The \"{0}\" way must contain at least 2 nodes." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:731 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +msgid "The \"to\" way doesn't start or end at a \"via\" node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:620 +msgid "The \"from\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:624 +msgid "The \"to\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:742 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:847 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:858 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:949 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:987 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:998 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1012 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1023 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1195 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1206 msgid "untagged" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1196 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207 msgid "text" msgstr "טקסט" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" msgstr "לא פעיל" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:94 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:181 @@ -3507,13 +3542,13 @@ msgstr "נבחר" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" msgstr "דרך לא מתויגת" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 msgid "incomplete way" msgstr "דרך לא גמורה" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 msgid "highlight" msgstr "" @@ -3535,5 +3570,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:113 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:89 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:77 msgid "incomplete" @@ -3563,14 +3598,14 @@ msgstr[1] "{0} חברים" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 msgid "Duplicate" msgstr "שכפל" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 msgid "Duplicate selection by copy and immediate paste." msgstr "שכפל את הבחירה על ידי העתקה והדבקה מיידית." -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 @@ -3579,5 +3614,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -3648,6 +3683,8 @@ msgstr "הצגת נתונים היסטוריים אודות הדרכים או הצמתים ב־OSM." -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:57 -msgid "Please select at least one node, way or relation." +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:60 +msgid "" +"Please select at least one node, way or relation. Only already uploaded " +"elements have a history." msgstr "" @@ -3670,7 +3707,7 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/TerracerAction.java:47 @@ -3785,5 +3822,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 msgid "Combine Anyway" -msgstr "" +msgstr "אחד בכל זאת" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141 @@ -3799,10 +3836,10 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 msgid "Reverse and Combine" -msgstr "" +msgstr "הפוך כיוון ואחד" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:123 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:314 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:315 msgid "Enter values for all conflicts." msgstr "הזן ערכים לכל ההתנגשויות." @@ -3810,7 +3847,7 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 msgid "Solve Conflicts" -msgstr "" +msgstr "פתור התנגשויות" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231 @@ -3844,13 +3881,13 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 msgid "OSM Server Files" -msgstr "" +msgstr "קבצי שרת OSM" #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 msgid "GPX Files" -msgstr "" +msgstr "קבצי GPX" #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28 msgid "NMEA-0183 Files" -msgstr "" +msgstr "קבצי NMEA-0183" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 @@ -3911,5 +3948,5 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 msgid "Export and Save" -msgstr "" +msgstr "ייצא ושמור" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143 @@ -3940,5 +3977,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #, java-format @@ -3965,15 +4002,19 @@ msgstr[1] "הנקודות הנבחרות לא נמצאות בתוך אף דרך." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125 -msgid "" -"There is more than one way using the node(s) you selected. Please select the " +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 +msgid "" +"There is more than one way using the node you selected. Please select the " "way also." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133 +msgid_plural "" +"There is more than one way using the nodes you selected. Please select the " +"way also." +msgstr[0] "יותר מדרך אחת משתמשת בנקודה שבחרת. בחר גם את הדרך." +msgstr[1] "יותר מדרך אחת משתמשת בנקודות שבחרת. בחר גם את הדרך." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137 msgid "The selected nodes do not share the same way." msgstr "הנקודות הבחורות אינן שייכות לאותה דרך." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -3981,10 +4022,10 @@ msgstr[1] "הדרך הבחורה אינה מכילה את הנקודות הבחורות." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229 msgid "You must select two or more nodes to split a circular way." msgstr "אתה חייב לבחור שתי נקודות או יותר כדי לפצל דרך מעגלית." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -3992,5 +4033,5 @@ msgstr "הדרך לא יכולה להתפצל בנקודות שנבחרו. (טיפ: בחר נקודות בתוך הדרך.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 msgid "" "A role based relation membership was copied to all new ways.\n" @@ -3998,5 +4039,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:296 #, java-format msgid "Split way {0} into {1} parts" @@ -4090,5 +4131,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Upload Changes" -msgstr "" +msgstr "העלה שינויים" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 @@ -4386,5 +4427,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 msgid "Align Nodes in Circle" msgstr "סדר את הצמתים בעיגול" @@ -4398,5 +4439,5 @@ msgstr "כמה מהנקונות הן (כמעט) באותו קו" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 msgid "Please select at least four nodes." msgstr "נא בחר לפחות ארבעה צמתים." @@ -4464,4 +4505,32 @@ msgstr "אירעה שגיאה במהלך שחזור קובץ גיבוי." +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "" +"Show status report with useful information that can be attached to bugs" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92 +msgid "Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +msgid "Copy to clipboard and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 +msgid "Close" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 @@ -4473,13 +4542,13 @@ msgstr "בצע שוב את הפעולה האחרונה שבוטלה." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:44 msgid "Delete Mode" msgstr "מצב מחיקה" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:46 msgid "Delete nodes or ways." msgstr "מחק צמתים או דרכים." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:84 @@ -4490,5 +4559,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:130 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -4500,6 +4569,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:87 msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." +"Drag play head and release near track to play audio from there; " +"SHIFT+release to synchronize audio at that point." msgstr "" "גרור את ראש הנגינה ושחרר ליד הרצועה המבוקשת לניגון שמע ממנה; SHIFT+שחרור " @@ -4515,23 +4584,23 @@ msgstr "צור אזורים" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 msgid "Extrude Way" msgstr "הבלטת דרך" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:252 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:416 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:430 msgid "Release the mouse button to select the objects in the rectangle." msgstr "שחרר את לחצן העכבר לבחירת פריטים במרובע." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 msgid "Draw a rectangle of the desired size, then release the mouse button." msgstr "צייר מרובע בגודל הרצוי, ואז שחרר את לחצן העכבר." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:420 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:434 msgid "Release the mouse button to stop rotating." msgstr "שחרר את סמן העכבר להפסקת ההטייה" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 msgid "Drag a way segment to make a rectangle." msgstr "גרור מקטע דרך ליצירת מרובע" @@ -4599,14 +4668,14 @@ msgstr "בחר, הזז והטה פריטים" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:191 msgid "Add and move a virtual new node to way" msgstr "הוסף והזז צומת חדש וירטואלי לדרך חדשה" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:220 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:223 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 msgid "Cannot move objects outside of the world." msgstr "לא ניתן להזיז פריטים אל מחוץ לעולם." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:418 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:432 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -4614,5 +4683,5 @@ "שחרר את לחצן העכבר הימני להפסקת ההזזה. Ctrl למיזוג עם הצומת הקרוב ביותר." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:422 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:436 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to remove); Shift-" @@ -4684,30 +4753,30 @@ msgstr "מזג {0} צמתים" +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Orthogonalize Shape" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -msgid "Orthogonalize Shape" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "הזז נקודות כך שכל הזוויות יהיו בנות 90 או 270 מעלות" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 msgid "Only two nodes allowed" msgstr "מותרות רק שתי נקודות" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 msgid "Selection must consist only of ways." msgstr "בחירה חייבת לכלול רק דרכים." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 msgid "Please select one or more closed ways of at least four nodes." msgstr "בחר דרך סגורה אחת או יותר בנות ארבע נקודות לפחות" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 msgid "Please select ways with almost right angles to orthogonalize." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 msgid "" "You are using the EPSG:4326 projection which might lead
            to " @@ -4716,9 +4785,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "Only one node selected" msgstr "נבחרה רק נקודה אחת" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 msgid "Orthogonalize" msgstr "יישר" @@ -4769,5 +4838,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101 -msgid "Please select exactly three nodes or one way with exactly three nodes." +msgid "" +"Please select exactly three nodes or one way with exactly three nodes." msgstr "אנא בחר בדיוק שלושה צמתים או דרך אחת עם שלושה צמתים בדיוק." @@ -4776,52 +4846,69 @@ msgstr "צמתים אלה אינם בעיגול." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../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:71 +msgid "Update Data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:72 +#, java-format +msgid "" +"This action will require {0} individual download requests. Do you wish to " +"continue?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 msgid "Open Location..." msgstr "פתח מיקום..." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 msgid "Open an URL." msgstr "פתח URL" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 msgid "Separate Layer" msgstr "שכבה נפרדת" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 msgid "Enter URL to download:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 msgid "Download Location" msgstr "מיקום ההורדה" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 msgid "Download URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 msgid "Add Node..." msgstr "הוסף נקודה..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 msgid "Add a node by entering latitude and longitude." msgstr "הוסף נקודה ע\"י הכנסת קווי אורך ורוחב" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 msgid "Enter the coordinates for the new node." msgstr "הכנס את הקורדינטות של הנקודה החדשה." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 msgid "Use decimal degrees." msgstr "השתמש במעלות עשרוניות." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 msgid "Negative values denote Western/Southern hemisphere." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 #: ../plugins/livegps/livegps/LiveGpsDialog.java:54 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93 @@ -4830,5 +4917,5 @@ msgstr "קו רוחב" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 #: ../plugins/livegps/livegps/LiveGpsDialog.java:56 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96 @@ -4871,14 +4958,14 @@ msgstr "הזז את הפריטים {0}" +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "Overwrite" msgstr "שכתוב" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "File exists. Overwrite?" msgstr "הקובץ כבר קיים. לשכתב?" @@ -4897,52 +4984,57 @@ msgstr "אנא בחר דבר מה להעתקה." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "הפרד דרכים" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "שכפל נקודות המשותפות למספר דרכים." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 msgid "This node is not glued to anything else." msgstr "הנקודה לא מוצמדת לשום דבר אחר." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 msgid "None of these nodes are glued to anything else." msgstr "אף אחת מהנקודות הללו אינה מוצמדת לשום דבר אחר." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of this way's nodes are glued to anything else." msgstr "אף אחת מהנקודות של הדרך הזו אינה מוצמדת לשום דבר אחר." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 msgid "The current selection cannot be used for unglueing." msgstr "הבחירה הנוכחית אינה יכולה לשמש להפרדה." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "Select either:" msgstr "בחר:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +msgid "* One tagged node, or" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "* One node that is used by more than one way, or" msgstr "* נקודה אחת המשותפת ליותר מדרך אחת, או" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 -msgid "* One node that is used by more than one way and one of those ways, or" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +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:104 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 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:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 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:107 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -4952,10 +5044,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:160 +msgid "Unglued Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:373 #, java-format msgid "Dupe into {0} nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:320 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:397 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -5057,5 +5153,5 @@ msgstr "בטל את הפעולה האחרונה." -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 msgid "No Shortcut" msgstr "ללא קיצור" @@ -5077,13 +5173,13 @@ msgstr "נתוני OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:29 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:28 msgid "Downloading GPS data" msgstr "מוריד נתוני GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:41 msgid "Downloaded GPX Data" msgstr "הורדו נתוני GPX" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:71 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:69 msgid "Raw GPS data" msgstr "נתוני GPS גולמיים" @@ -5304,5 +5400,6 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169 -msgid "Header contains several values and cannot be mapped to a single string" +msgid "" +"Header contains several values and cannot be mapped to a single string" msgstr "" @@ -5652,5 +5749,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69 -msgid "Maximum number of segments allowed in each generated way. Default 250." +msgid "" +"Maximum number of segments allowed in each generated way. Default 250." msgstr "" @@ -5670,6 +5768,7 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72 msgid "" -"Accuracy of Douglas-Peucker line simplification, measured in degrees." -"
            Lower values give more nodes, and more accurate lines. Default 0.0003." +"Accuracy of Douglas-Peucker line simplification, measured in " +"degrees.
            Lower values give more nodes, and more accurate lines. Default " +"0.0003." msgstr "" "הדיוק של פישוט קו דאגלס-פאוקר, נמדד במעלות.
            ערכים נמוכים נותנים יותר " @@ -6301,6 +6400,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:509 msgid "" -"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." -"org/index.php/User:JLS/speller) or tag checking data files." +"The sources (URL or filename) of spell check (see " +"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking " +"data files." msgstr "" @@ -6756,6 +6856,6 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:40 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:43 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 #, java-format @@ -6763,18 +6863,29 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:51 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:55 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 msgid "Contacting WMS Server..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157 msgid "Create buildings" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 msgid "CadastreGrabber: Illegal url." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +msgid "" +"To avoid cadastre WMS overload,\n" +"building import size is limited to 1 km2 max." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" @@ -6797,16 +6908,25 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:128 +msgid "Cadastre" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:139 +msgid "Auto sourcing" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164 +msgid "Invalid projection" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 +#, java-format +msgid "Change the projection to {0} first." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:169 msgid "" "To enable the cadastre WMS plugin, change\n" "the JOSM projection to Lambert and restart" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132 -msgid "Cadastre" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 -msgid "Auto sourcing" msgstr "" @@ -6879,6 +6999,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:43 msgid "" -"More than one WMS layer present.\n" -"Select one of them first, then retry." +"More than one WMS layer present\n" +"Select one of them first, then retry" msgstr "" @@ -6887,5 +7007,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136 #, java-format @@ -6895,13 +7015,13 @@ msgstr[1] "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61 msgid "Extract SVG ViewBox..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65 msgid "Extract best fitting boundary..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:120 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126 msgid "Create boundary" msgstr "" @@ -6937,15 +7057,15 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 msgid "Save WMS layer to file" msgstr "שמור שכבת WMS לקובץ" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "Load WMS layer from file" msgstr "טען שכבת WMS מקובץ" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -6953,5 +7073,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 msgid "File Format Error" msgstr "שגיאה בפורמט קובץ" @@ -6959,5 +7079,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 msgid "Error loading file" msgstr "שגיאה בטעינת קובץ" @@ -6983,52 +7103,53 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 msgid "Replace original background by JOSM background color." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30 msgid "Reverse grey colors (for black backgrounds)." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 msgid "Set background transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34 msgid "Draw boundaries of downloaded data." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Enable automatic caching." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:53 -msgid "" -"A special handler of the french cadastre wms at www.cadastre.gouv." -"fr

            Please read the Terms and Conditions of Use here (in french): " -"
            http://www.cadastre.gouv.fr/scpc/html/" -"CU_01_ConditionsGenerales_fr.html
            before any upload of data created " -"by this plugin." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:58 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:55 +msgid "" +"A special handler of the french cadastre wms at " +"www.cadastre.gouv.fr

            Please read the Terms and Conditions of Use here " +"(in french):
            " +"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " +"
            before any upload of data created by this plugin." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -7036,26 +7157,40 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 -msgid "" -"Invert the original texts from black to white (and all intermediate greys)." +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +msgid "" +"Invert the original black and white colors (and all intermediate greys). " +"Useful for texts on dark backgrounds." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 +msgid "Allows multiple layers stacking" msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 -msgid "Allows multiple layers stacking" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:99 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:113 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 msgid "Image grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:162 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:125 +msgid "Grab smaller images (higher quality but use more memory)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +msgid "Fixed size square (default is 100m)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +msgid "Fixed size (from 25 to 1000 meters)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -7164,5 +7299,5 @@ msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:254 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:255 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -7307,7 +7442,7 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:203 msgid "" -"Take a photo of your GPS receiver while it displays the time." -"
            Display that photo here.
            And then, simply capture the time you read " -"on the photo and select a timezone
            " +"Take a photo of your GPS receiver while it displays the " +"time.
            Display that photo here.
            And then, simply capture the time you " +"read on the photo and select a timezone
            " msgstr "" @@ -7372,5 +7507,6 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:484 -msgid "I can take a picture of my GPS receiver.
            Can this help?" +msgid "" +"I can take a picture of my GPS receiver.
            Can this help?" msgstr "" @@ -7416,5 +7552,5 @@ msgstr "אזור זמן שגוי" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #, java-format msgid "" @@ -7425,14 +7561,14 @@ "פורמט מצופה: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:579 msgid "Invalid offset" msgstr "היסט שגוי" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:641 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:643 #, java-format msgid "Found {0} matchs of {1} in GPX track {2}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:642 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:644 msgid "GPX Track loaded" msgstr "" @@ -7440,5 +7576,5 @@ #: ../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/UploadDataGui.java:79 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 msgid "Upload Traces" msgstr "" @@ -7448,58 +7584,72 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 -msgid "Upload GPX track" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71 +msgid "Upload Trace" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Public" msgstr "ציבורי" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 msgid "Selected makes your trace public in openstreetmap.org" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Description" msgstr "תיאור" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:123 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 msgid "Tags" msgstr "תוויות" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:182 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:153 +#, java-format +msgid "Selected track: {0}" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:176 msgid "Connecting..." msgstr "מתחבר..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 -msgid "Uploading GPX track..." -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:214 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:199 +msgid "Upload cancelled" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:209 +msgid "Error while uploading" +msgstr "שגיאה בזמן ההעלאה" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "GPX הועלה בהצלחה" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:227 -msgid "Error while uploading" -msgstr "שגיאה בזמן ההעלאה" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:235 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +msgid "Upload failed. Server returned the following message: " +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 +#, java-format +msgid "Uploading GPX track: {0}% ({1} of {2})" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "לא סופק שום תיאור. נא לספק תיאור." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:252 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:241 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "לא סופק שם משתמש." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:244 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "לא סופקה סיסמא." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "" @@ -7719,32 +7869,32 @@ msgstr "הורדה אוטומטית" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:232 msgid "Download visible tiles" msgstr "הורד משטחים גלויים" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241 msgid "Change resolution" msgstr "שנה רזולוציה" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:253 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:264 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:271 msgid "Alpha channel" msgstr "" @@ -8487,6 +8637,6 @@ "area, or use planet.osm" msgstr "" -"ביקשת יותר מידי נקודות (מוגבל ל 50,000). בקש שטח קטן יותר או השתמש ב planet." -"osm" +"ביקשת יותר מידי נקודות (מוגבל ל 50,000). בקש שטח קטן יותר או השתמש ב " +"planet.osm" #: specialmessages.java:7 @@ -12613,4 +12763,20 @@ msgstr "" +#~ msgid "Please select something from the conflict list." +#~ msgstr "נא בחר משהו מרשימת ההתנגשות." + +#~ msgid "Description:" +#~ msgstr "תיאור:" + +#~ msgid "Tags (keywords in GPX):" +#~ msgstr "תגים (מילות מפתח ב GPX)" + +#, java-format +#~ msgid "Upload raw file: {0}" +#~ msgstr "העלה קובץ גולמי: {0}" + +#~ msgid "Tags:" +#~ msgstr "תגיות:" + #~ msgid "Unknown type" #~ msgstr "סוג לא ידוע" @@ -12619,4 +12785,5 @@ #~ msgstr "NullPointerException, כנראה בגלל תגיות חסרות." +#, java-format #~ msgid "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..." #~ msgstr "מעלה {0} {1} (id: {2}) {3}% {4}/{5} ({6} נשארו)..." @@ -12640,7 +12807,9 @@ #~ msgstr "טבעי" +#, java-format #~ msgid "Version: {0}
            Last change at {1}" #~ msgstr "גירסא: {0}
            שונה לאחרונה ב {1}" +#, java-format #~ msgid "Version {0} - Last change at {1}" #~ msgstr "גירסא {0} - שונה לאחרונה ב {1}" @@ -12652,7 +12821,9 @@ #~ msgstr "פתח קובץ נקודות דרך." +#, java-format #~ msgid "Data error: lat value \"{0}\" is out of bounds." #~ msgstr "שגיאת נתונים: קו-רוחב \"{0}\" הינו מחוץ לתחום." +#, java-format #~ msgid "Data error: lon value \"{0}\" is out of bounds." #~ msgstr "שגיאת נתונים: קו-אורך \"{0}\" הינו מחוץ לתחום." Index: /applications/editors/josm/i18n/po/it.po =================================================================== --- /applications/editors/josm/i18n/po/it.po (revision 13832) +++ /applications/editors/josm/i18n/po/it.po (revision 13833) @@ -5,7 +5,7 @@ "Project-Id-Version: josm 20081003\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-15 22:03+0100\n" -"PO-Revision-Date: 2009-02-11 15:16+0000\n" -"Last-Translator: Davide Prade \n" +"POT-Creation-Date: 2009-02-21 16:35+0100\n" +"PO-Revision-Date: 2009-02-16 20:16+0000\n" +"Last-Translator: simone \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@ -13,8 +13,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-02-15 20:40+0000\n" +"X-Launchpad-Export-Date: 2009-02-22 20:29+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 #, java-format msgid "" @@ -23,10 +23,10 @@ "\n" msgstr "" -"L''impostazione della scorciatoia da tastiera ''{0}'' per l''azione " -"''{1}'' ({2}) è fallita\n" +"L''impostazione della scorciatoia da tastiera ''{0}'' per l''azione ''{1}'' " +"({2}) è fallita\n" "perché la scorciatoia è già impegnata dall''azione ''{3}'' ({4}).\n" "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 msgid "" "This action will have no shortcut.\n" @@ -36,5 +36,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -45,7 +45,8 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 msgid "(Hint: You can edit the shortcuts in the preferences.)" -msgstr "(Suggerimento: Si possono modificare le scorciatoie nelle preferenze.)" +msgstr "" +"(Suggerimento: Si possono modificare le scorciatoie nelle preferenze.)" #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 @@ -54,17 +55,17 @@ #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 msgid "Information" msgstr "Informazioni" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Do nothing" msgstr "Non fare niente" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Report Bug" msgstr "Segnala bug" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 msgid "" "An unexpected exception occurred.\n" @@ -79,14 +80,14 @@ "inoltrare un bug report." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Unexpected Exception" msgstr "Eccezione inattesa" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 #, java-format msgid "Please report a ticket at {0}" msgstr "Si prega di segnalare il problema a {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" @@ -94,5 +95,5 @@ "possibile)!" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:78 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -102,9 +103,9 @@ "di segnalare un problema." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Be sure to include the following information:" msgstr "Assicurarsi di includere le seguenti informazioni:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75 msgid "(The text has already been copied to your clipboard.)" msgstr "(Il testo è stato già copiato nei tuoi appunti)" @@ -118,5 +119,5 @@ msgstr "Impossibile riprodurre il suono" -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:94 @@ -124,5 +125,5 @@ msgstr "Collegamento al server OSM in corso..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:48 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:32 @@ -130,10 +131,10 @@ msgstr "Scaricamento dei dati OSM in corso..." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 msgid "NullPointerException, possibly some missing tags." msgstr "NullPointerException, è possibile che manchino delle etichette." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83 msgid "Preparing data..." msgstr "Preparazione dei dati in corso..." @@ -163,35 +164,35 @@ msgstr "Scaricamento dei punti da {0} a {1} in corso..." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:164 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:168 msgid "Unknown version" msgstr "Versione sconosciuta" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 msgid "Found element in non-way." msgstr "Trovato elemento in non-percorso." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 msgid " has zero ref" msgstr " ha zero ref" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 msgid "Found element in non-relation." msgstr "Trovato etichetta su una non relazione." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:252 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250 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:294 msgid "Illegal object with id=0" msgstr "Oggetto illegale con id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Attributo richiesto mancante \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 #, java-format msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" @@ -199,13 +200,13 @@ "E'' stato ignorato un percorso perché include un nodo che non esiste: {0}\n" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:502 msgid "Prepare OSM data..." msgstr "Preparazione dati OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:518 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:516 msgid "Ill-formed node id" msgstr "Id del nodo malformato" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:280 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:287 msgid "Parse error: invalid document structure for gpx document" msgstr "" @@ -216,18 +217,18 @@ msgstr "Connessione al server in corso..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 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/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 msgid "Commit comment" msgstr "Inserisci commento" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" msgstr "{0}% ({1}/{2}), {3} rimanenti. Caricamento di {4}: {5} (id: {6})" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64 @@ -237,34 +238,32 @@ msgstr "Un errore è stato generato: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:192 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190 msgid "Opening changeset..." msgstr "Apertura del changeset..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:226 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224 msgid "Server does not support changesets" msgstr "Il server non supporta i changeset (API < 0.6)" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:246 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:428 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:609 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:184 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607 msgid "Unknown host" msgstr "Host sconosciuto" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282 msgid "Preparing..." msgstr "Preparazione in corso..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:294 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292 msgid "Uploading..." msgstr "Invio in corso..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375 msgid "Closing changeset..." msgstr "Chiusura del changeset..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:652 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650 msgid "Transfer aborted due to error (will wait for 5 seconds):" msgstr "Trasferimento annullato a causa dell'errore (attesa di 5 secondi):" @@ -298,21 +297,24 @@ #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95 msgid "Login" -msgstr "" +msgstr "Login" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95 #: ../core/src/org/openstreetmap/josm/Main.java:348 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:29 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 @@ -325,11 +327,11 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:110 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -344,11 +346,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:186 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 msgid "Creating main GUI" msgstr "Creazione dell'interfaccia principale" #: ../core/src/org/openstreetmap/josm/Main.java:195 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:271 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:278 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:56 msgid "Help" @@ -394,21 +396,21 @@ msgstr "Ignorato un indirizzo URL di file malformato: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109 msgid "min lat" msgstr "Lat min" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111 msgid "min lon" msgstr "Lon min" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:117 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "max lat" msgstr "Lat max" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 msgid "max lon" msgstr "Lon max" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:122 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -418,5 +420,5 @@ "indirizzo URL qui per scaricare l'area)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:134 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130 msgid "Bounding Box" msgstr "Riquadro di selezione" @@ -452,6 +454,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:96 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:894 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:956 msgid "name" msgstr "nome" @@ -484,5 +486,5 @@ msgstr "livello di ingrandimento" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:107 msgid "" "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -492,5 +494,5 @@ "mouse tenendo premuto il tasto destro. Selezionare: click." -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:109 msgid "Slippy map" msgstr "Slippy map" @@ -501,7 +503,7 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:605 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:602 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:89 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -521,5 +523,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380 msgid "Remove" msgstr "Elimina" @@ -625,5 +627,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" -msgstr "Ridimensiona l'applet alla geometria data (formato: LARGHEZZAxALTEZZA)" +msgstr "" +"Ridimensiona l'applet alla geometria data (formato: LARGHEZZAxALTEZZA)" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 @@ -665,20 +668,20 @@ msgstr "Se specificato, reimposta la configurazione invece di leggerla." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:109 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:186 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:198 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:108 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:191 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:203 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 msgid "Java OpenStreetMap Editor" msgstr "Java OpenStreetMap Editor" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:111 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:110 msgid "Message of the day not available" msgstr "Il messaggio del giorno non è disponibile" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:200 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:205 msgid "Downloading \"Message of the day\"" msgstr "Scaricamento del \"messaggio del giorno\"" @@ -718,33 +721,33 @@ msgstr "Riduci" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:234 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:474 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:512 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:383 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:380 msgid "More information about this feature" msgstr "Ulteriori informazioni su questa caratteristica" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:393 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:390 msgid "Optional Attributes:" msgstr "Attributi opzionali:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:437 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Usa la preimpostazione \"{0}\" del gruppo \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:438 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:435 #, java-format msgid "Use preset ''{0}''" msgstr "Usa la preimpostazione ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 msgid "way" @@ -753,11 +756,11 @@ msgstr[1] "percorsi" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:214 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 msgid "node" msgid_plural "nodes" @@ -765,6 +768,6 @@ msgstr[1] "nodi" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:81 @@ -774,14 +777,14 @@ msgstr[1] "relazioni" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 msgid "closedway" msgstr "percorso chiuso" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:475 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 #, java-format msgid "Unknown type: {0}" msgstr "Tipo sconosciuto: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:549 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 #, java-format @@ -789,15 +792,15 @@ msgstr "Impossibile leggere la lista delle etichette preimpostate: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:555 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 #, java-format msgid "Error parsing {0}: " msgstr "Impossibile leggere {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:572 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:569 #, 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:607 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595 #, java-format msgid "Change {0} object" @@ -806,9 +809,17 @@ msgstr[1] "Modifica {0} oggetti" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 msgid "Nothing selected!" msgstr "Non è stato selezionato niente!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 +msgid "Selection unsuitable!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +msgid "Apply Preset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 msgid "Change Properties" msgstr "Modifica Proprietà" @@ -819,14 +830,14 @@ msgstr "Gruppo di preimpostazioni \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:107 msgid "File" msgstr "File" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:135 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:107 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:86 @@ -838,22 +849,22 @@ msgstr "Modifica" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 msgid "View" msgstr "Visualizza" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:26 msgid "Tools" msgstr "Strumenti" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:141 msgid "Audio" msgstr "Audio" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:142 msgid "Presets" msgstr "Preimpostati" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:40 @@ -865,18 +876,18 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:210 msgid "Wireframe View" msgstr "Visualizzazione a fil di ferro" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212 msgid "Toggle Wireframe view" msgstr "Abilita/disabilita la visualizzazione a fil di ferro" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:28 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 msgid "Contacting the OSM server..." msgstr "Connessione al server OSM..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 #, java-format msgid "This will change up to {0} object." @@ -885,11 +896,11 @@ msgstr[1] "Questo cambierà {0} oggetti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 msgid "An empty value deletes the key." msgstr "Un valore vuoto cancella la chiave." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66 @@ -899,7 +910,7 @@ msgstr "Chiave" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 @@ -908,10 +919,10 @@ msgstr "Valore" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333 msgid "Change values?" msgstr "Cambiare i valori?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:257 #, java-format msgid "Change properties of up to {0} object" @@ -920,33 +931,33 @@ msgstr[1] "Cambia le proprietà di al massimo {0} oggetti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 msgid "Please select a key" msgstr "Seleziona una chiave" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321 msgid "Please select a value" msgstr "Seleziona un valore" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:445 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:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 msgid "Properties/Memberships" msgstr "Proprietà/Appartenenze" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 msgid "Properties for selected objects." msgstr "Proprietà per gli oggetti selezionati." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97 @@ -958,58 +969,58 @@ msgstr "Abilita/disabilita: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 msgid "Member Of" msgstr "Membro di" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Role" msgstr "Ruolo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:559 msgid "Change relation" msgstr "Cambia relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560 #, 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:564 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 msgid "Delete from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 +msgstr "Elimina dalla relazione" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:600 msgid "Add Properties" msgstr "Aggiungi proprietà" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 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:609 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 msgid "Edit Properties" msgstr "Modifica proprietà" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609 msgid "Edit the value of the selected key for all objects" msgstr "Modifica il valore della chiave selezionata per tutti gli oggetti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 msgid "Delete Properties" msgstr "Elimina proprietà" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:77 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:293 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 @@ -1018,99 +1029,116 @@ msgstr "Cancella" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 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:766 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:763 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Proprietà: {0} / Appartenenze: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:769 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 msgid "Properties / Memberships" msgstr "Proprietà / Appartenenze" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178 +msgid "Apply Changes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 msgid "Create new relation" msgstr "Crea nuova relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208 msgid "Edit new relation" msgstr "Modifica nuova relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209 #, java-format msgid "Edit relation #{0}" msgstr "Modifica la relazione #{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230 +msgid "Basic" +msgstr "Di base" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Occupied By" msgstr "Occupato da" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311 msgid "Tags (empty value deletes tag)" msgstr "Etichette (un valore vuoto cancella l'etichetta)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313 msgid "Members" msgstr "Membri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 +msgid "Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 msgid "Move the currently selected members up" msgstr "Sposta in alto i membri attualmente selezionati" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358 +msgid "Add Selected" +msgstr "Aggiungi la selezione" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359 +msgid "Add all currently selected objects as members" +msgstr "Aggiungi tutti gli oggetti selezionati come membri" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365 +msgid "Remove Selected" +msgstr "Elimina gli elementi selezionati" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366 +msgid "Remove all currently selected objects from relation" +msgstr "Rimuovi dalla relazione gli elementi selezionati" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 +msgid "Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 msgid "Move the currently selected members down" msgstr "Sposta in basso i membri attualmente selezionati" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356 -msgid "Add Selected" -msgstr "Aggiungi la selezione" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:357 -msgid "Add all currently selected objects as members" -msgstr "Aggiungi tutti gli oggetti selezionati come membri" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:363 -msgid "Remove Selected" -msgstr "Elimina gli elementi selezionati" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:364 -msgid "Remove all currently selected objects from relation" -msgstr "Rimuovi dalla relazione gli elementi selezionati" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381 msgid "Remove the member in the current table row from this relation" msgstr "" "Cancella il membro dalla riga della tabella utilizzata da questa relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394 msgid "Download Members" msgstr "Scarica i membri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:406 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395 msgid "Download all incomplete ways and nodes in relation" msgstr "Scarica tutti i percorsi ed i nodi incompleti di questa relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:415 -msgid "Basic" -msgstr "Di base" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:453 #, java-format msgid "Members: {0}" msgstr "Membri: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:587 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:461 +#, java-format +msgid "Relation Editor: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:585 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 msgid "There were conflicts during import." msgstr "Si sono verificati dei conflitti durante l'importazione." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593 msgid "Error parsing server response." msgstr "Errore di scansione nella risposta del server." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:600 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:594 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:598 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -1124,9 +1152,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:345 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 msgid "Error" msgstr "Errore" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:599 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597 msgid "Cannot connect to server." msgstr "Impossibile connettersi al server." @@ -1232,5 +1260,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 msgid "Delete Layer" -msgstr "" +msgstr "Elimina livello" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 @@ -1291,5 +1319,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:94 @@ -1299,9 +1327,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 msgid "" "Set the selected elements on the map to the selected items in the list above." -msgstr "Seleziona sulla mappa gli elementi selezionati nella lista qui sopra." +msgstr "" +"Seleziona sulla mappa gli elementi selezionati nella lista qui sopra." #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 @@ -1363,16 +1392,24 @@ msgstr "Selezione: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +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:67 +msgid "Delete the selected relation" +msgstr "Cancella le relazioni selezionate" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 #: trans_presets.java:2904 msgid "Relations" msgstr "Relazioni" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 msgid "Open a list of all relations." msgstr "Apri tutte le relazioni in una lista" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 @@ -1380,17 +1417,9 @@ msgstr "Nuovo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 msgid "Create a new relation" msgstr "Crea una nuova relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -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:90 -msgid "Delete the selected relation" -msgstr "Cancella le relazioni selezionate" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:130 #, java-format msgid "Relations: {0}" @@ -1419,49 +1448,49 @@ msgstr "Pila dei comandi: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +msgid "Resolve" +msgstr "Risolvi" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +msgid "Open a merge dialog of all selected items in the list above." +msgstr "" +"Apre una finestra per unire tutti gli elementi selezionati nella lista qui " +"sopra." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Conflict" msgstr "Conflitto" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 msgid "Merging conflicts." msgstr "Unisci i conflitti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67 -msgid "Resolve" -msgstr "Risolvi" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:68 -msgid "Open a merge dialog of all selected items in the list above." -msgstr "" -"Apre una finestra per unire tutti gli elementi selezionati nella lista qui " -"sopra." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:105 -msgid "Please select something from the conflict list." -msgstr "Selezionare qualcosa dalla lista dei conflitti." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Resolve Conflicts" msgstr "Resolvi conflitti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +msgid "Solve Conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 #, java-format msgid "Conflicts: {0}" msgstr "Conflitti: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Conflicts" msgstr "Conflitti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 msgid "conflict" msgstr "conflitto" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 msgid "background" msgstr "sfondo" @@ -1485,5 +1514,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 msgid "Customize Color" @@ -1491,5 +1520,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1499,5 +1528,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1506,5 +1535,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:326 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:152 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -1522,5 +1551,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:265 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 #, java-format msgid "Audio synchronized at point {0}." @@ -1528,5 +1557,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232 msgid "Unable to synchronize in layer being played." msgstr "Impossibile sincronizzare nel layer in esecuzione." @@ -1547,5 +1576,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:958 msgid "desc" msgstr "descr." @@ -1567,5 +1596,5 @@ msgstr "Impossibile visualizzare l'URL" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -1575,5 +1604,5 @@ "si sta eseguendo." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -1583,18 +1612,18 @@ "tracciato da sincronizzare." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224 msgid "Unable to create new audio marker." msgstr "Impossibile creare un nuovo segnaposto Audio" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 msgid "Convert to data layer" msgstr "Converti in livello dati" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:725 -msgid "" -"Upload of unprocessed GPS data as map data is considered harmful." -"
            If you want to upload traces, look here:" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:645 +msgid "" +"Upload of unprocessed GPS data as map data is considered " +"harmful.
            If you want to upload traces, look here:" msgstr "" "Il caricamento di dati GPS non elaborati come dati di mappa è " @@ -1602,66 +1631,22 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:646 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:747 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:448 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:667 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "Converted from: {0}" msgstr "Convertito da: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612 -msgid "Upload this trace..." -msgstr "Carica questa traccia..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:616 -msgid "" -"This functionality has been added only recently. Please
            use with " -"care and check if it works as expected." -msgstr "" -"Questa funzionalità è stata aggiunta di recente.
            Usare con prudenza " -"e controllare il suo corretto funzionamento." - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:102 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:107 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:626 -msgid "Upload track filtered by JOSM" -msgstr "Carica il percorso filtrato da JOSM" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:103 -#, java-format -msgid "Upload raw file: {0}" -msgstr "Carica il file: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:108 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:627 -msgid "Upload raw file: " -msgstr "Carica il file grezzo: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640 -msgid "Description:" -msgstr "Descrizione:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:123 -msgid "Tags:" -msgstr "Etichette:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:129 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:648 -msgid "GPX-Upload" -msgstr "Carica-GPX" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:229 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:217 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113 msgid "gps point" msgstr "punto GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 #: trans_presets.java:1795 trans_presets.java:1801 trans_presets.java:1807 #: trans_presets.java:1813 trans_presets.java:1819 trans_presets.java:1825 @@ -1681,5 +1666,5 @@ msgstr[1] "tracce" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 msgid "point" msgid_plural "points" @@ -1687,5 +1672,5 @@ msgstr[1] "punti" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 #, java-format msgid "a track with {0} point" @@ -1694,5 +1679,5 @@ msgstr[1] "una traccia con {0} punti" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} consists of {1} track" @@ -1701,5 +1686,5 @@ msgstr[1] "{0} è composto da {1} tracce" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} point" @@ -1708,25 +1693,25 @@ msgstr[1] "{0} punti" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117 msgid "Customize line drawing" msgstr "Personalizza disegno linee" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:296 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 msgid "Use global settings." msgstr "Usa le impostazioni globali." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 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/RawGpsLayer.java:298 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123 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/RawGpsLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:135 msgid "Select line drawing options" @@ -1760,5 +1745,5 @@ msgstr "Immagini JPEG (*.jpeg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290 #, java-format msgid "{0} track, " @@ -1767,5 +1752,5 @@ msgstr[1] "{0} percorsi, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 #, java-format msgid "{0} route, " @@ -1774,5 +1759,5 @@ msgstr[1] "{0} percorsi, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 #, java-format msgid "{0} waypoint" @@ -1781,55 +1766,51 @@ msgstr[1] "{0} punti del percorso" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #, java-format msgid "Name: {0}" msgstr "Nome: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "Description: {0}" msgstr "Descrizione: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 msgid "Timespan: " msgstr "Timespan/Arco di tempo: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Length: " msgstr "Lunghezza: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:642 -msgid "Tags (keywords in GPX):" -msgstr "Etichette (keywords in GPX):" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:655 msgid "time" msgstr "orario" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:780 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:679 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:700 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 msgid "Download from OSM along this track" msgstr "Scarica da OSM lungo questo tracciato" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:686 msgid "Download everything within:" msgstr "Scarica tutto entro:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 #, java-format msgid "{0} meters" msgstr "{0} metri" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:692 msgid "Maximum area per request:" msgstr "Area massima per richiesta:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 #, java-format msgid "{0} sq km" msgstr "{0} km quadrati" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787 #, java-format msgid "" @@ -1840,14 +1821,14 @@ "vuole procedere?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:844 #, java-format msgid "Audio markers from {0}" msgstr "Marcatori audio da {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 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:1049 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "" "Some waypoints with timestamps from before the start of the track were " @@ -1857,5 +1838,5 @@ "partenza del tracciato." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -1965,19 +1946,19 @@ msgstr "Impossibile decodificare l'orario inserito." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:140 msgid "outside downloaded area" msgstr "al di fuori dell'area scaricata" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 #, java-format msgid "{0} consists of:" msgstr "{0} è composto da:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:353 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:347 #, java-format msgid " ({0} deleted.)" msgstr " ({0} eliminati)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:445 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 msgid "Convert to GPX layer" msgstr "Converti in un layer GPX" @@ -2005,37 +1986,37 @@ msgstr "Impossibile scrivere i segnalibri." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 msgid "The geographic longitude at the mouse pointer." msgstr "La longitudine geografica del puntatore del mouse." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The name of the object at the mouse pointer." msgstr "Il nome dell'oggetto sul puntatore del mouse." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 msgid "The geographic latitude at the mouse pointer." msgstr "La latitudine geografica del puntatore del mouse." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The angle between the previous and the current way segment." msgstr "L'angolo tra il segmento di percorso corrente e quello precedente." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The (compass) heading of the line segment being drawn." msgstr "Direzione della bussola del segmento che si sta disegnando." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The length of the new way segment being drawn." msgstr "Lunghezza del segmento di percorso che si sta disegnando." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:160 msgid "(no object)" msgstr "(nessun oggetto)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:62 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:56 msgid "Color" msgstr "Colore" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:57 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107 #: trans_presets.java:56 trans_presets.java:92 trans_presets.java:130 @@ -2136,27 +2117,36 @@ msgstr "Nome" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:118 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:112 #, java-format msgid "Paint style {0}: {1}" msgstr "Stile di disegno {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 msgid "Choose" msgstr "Scegliere" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 msgid "Please select a color." msgstr "Scegliere un colore." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 #, java-format msgid "Choose a color for {0}" msgstr "Scegliere un colore per {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +msgid "Set to default" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:172 +msgid "Set all to default" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:184 msgid "Colors used by different objects in JOSM." msgstr "Colori usati da diversi oggetti in JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:171 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:198 msgid "Colors" msgstr "Colori" @@ -2191,7 +2181,7 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45 msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
            The password is transfered in plain text to the server, encoded in the " -"URL.
            Do not use a valuable Password." +"WARNING: The password is stored in plain text in the preferences " +"file.
            The password is transfered in plain text to the server, encoded in " +"the URL.
            Do not use a valuable Password." msgstr "" "ATTENZIONE: la password è memorizzata in chiaro nel file delle " @@ -2199,18 +2189,18 @@ "nell'URL
            Non usare una password importante." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44 msgid "Sort presets menu" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47 +msgstr "Ordina il menu dei Predefiniti" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46 msgid "Enable built-in defaults" msgstr "Abilitato 'built-in' predefinito" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:58 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69 msgid "Tagging preset source" msgstr "Sorgente preimpostazioni etichette" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:156 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 @@ -2218,5 +2208,5 @@ msgstr "Scegli la riga da modificare." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500 @@ -2225,27 +2215,27 @@ msgstr "Scegli la riga da cancellare." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89 -msgid "" -"The sources (URL or filename) of tagging preset definition files. See http://" -"josm.openstreetmap.de/wiki/TaggingPresets for help." +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88 +msgid "" +"The sources (URL or filename) of tagging preset definition files. See " +"http://josm.openstreetmap.de/wiki/TaggingPresets for help." msgstr "" "Il sorgente (URL o filename) dei files delle etichette predefinite. Vedi " "http://josm.openstreetmap.de/wiki/TaggingPresets per un aiuto." +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89 +msgid "Add a new tagging preset source to the list." +msgstr "" +"Aggiunge una nuova sorgente di preimpostazioni di etichette alla lista." + #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 -msgid "Add a new tagging preset source to the list." -msgstr "" -"Aggiunge una nuova sorgente di preimpostazioni di etichette alla lista." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 msgid "Delete the selected source from the list." msgstr "Elimina la sorgente selezionata nella lista." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:94 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93 msgid "Tagging Presets" msgstr "Etichette preimpostate" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97 msgid "Tagging preset sources" msgstr "Sorgenti preimpostazioni etichette" @@ -2259,6 +2249,6 @@ msgstr "Una volta salvato, mantieni i file di backup che finiscono con ~" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:141 @@ -2266,34 +2256,34 @@ msgstr "Estensioni" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 msgid "Configure available plugins." msgstr "Configura le estensioni disponibili." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43 msgid "Download List" msgstr "Scarica la lista" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:80 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51 msgid "Update" msgstr "Aggiorna" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:60 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 msgid "Configure Sites..." msgstr "Configura i siti..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add either site-josm.xml or Wiki Pages." msgstr "Aggiungi sia site-josm.xml che le pagine Wiki." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99 msgid "Please select an entry." msgstr "Seleziona una voce." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 msgid "Configure Plugin Sites" msgstr "Configura i siti delle estensioni" @@ -2324,9 +2314,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35 msgid "Modeless working (Potlatch style)" -msgstr "" +msgstr "Lavoro senza modalità di editing (Stile Potlatch)" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85 msgid "Do not require to switch modes (potlatch style workflow)" -msgstr "" +msgstr "Non richiedere di cambiare modo di lavoro (stile di lavoro Potlatch)" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91 @@ -2490,9 +2480,9 @@ msgstr "Calibrazione del registratore vocale" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "Display Settings" msgstr "Impostazioni di visualizzazione" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "" "Various settings that influence the visual representation of the whole " @@ -2502,57 +2492,65 @@ "programma." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings" msgstr "Impostazioni di connessione" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings for the OSM server." msgstr "Impostazioni di connessione al server OSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Map Settings" msgstr "Impostazioni della mappa" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Settings for the map projection and data interpretation." msgstr "" "Impostazioni per la proiezione della mappa e l'interpretazione dei dati." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Audio Settings" msgstr "Impostazione dell'audio" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Settings for the audio player and audio markers." msgstr "Impostazioni del riproduttore audio e del marcatore audio." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97 msgid "You have to restart JOSM for some settings to take effect." msgstr "" "È necessario riavviare JOSM perché alcune impostazioni abbiano effetto." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:25 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 msgid "Draw lines between raw gps points." msgstr "Disegna le linee tra i punti GPS grezzi." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:27 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 msgid "Force lines if no segments imported." msgstr "Forza le linee se nessun segmento è stato importato." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:28 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 msgid "Draw large GPS points." msgstr "Disegna dei punti GPS grandi." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 -msgid "Color tracks by velocity." -msgstr "Colora i tracciati per velocità." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34 +msgid "Velocity (red = slow, green = fast)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 +msgid "Dilution of Position (red = high, green = low, if available)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 +msgid "Single Color (can be customized for named layers)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:1346 msgid "Car" msgstr "Automobile" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:309 trans_presets.java:635 trans_presets.java:833 #: trans_presets.java:842 trans_presets.java:851 trans_presets.java:864 @@ -2564,5 +2562,5 @@ msgstr "Bicicletta" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:310 trans_presets.java:637 trans_presets.java:832 #: trans_presets.java:841 trans_presets.java:850 trans_presets.java:863 @@ -2573,45 +2571,45 @@ msgstr "Pedone" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 msgid "Draw Direction Arrows" msgstr "Disegna le linee di direzione" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 msgid "Fast drawing (looks uglier)" msgstr "Disegno veloce (appare più brutto)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180 msgid "Only interesting direction hints (e.g. with oneway tag)." msgstr "" "Solo suggerimenti di direzioni interessanti (es. con etichetta oneway)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:186 msgid "Only on the head of a way." msgstr "Solo sull''estremità di un percorso." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44 msgid "Draw segment order numbers" msgstr "Disegna i numeri d'ordine dei segmenti" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45 msgid "Draw boundaries of downloaded data" msgstr "Disegna i confini dei dati scaricati" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46 msgid "Draw virtual nodes in select mode" msgstr "Disegna dei nodi virtuali nella modalità selezione" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47 msgid "Draw inactive layers in other color" msgstr "Disegna con altri colori i layer non attivi" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 msgid "Smooth map graphics (antialiasing)" msgstr "Grafica della mappa migliorata (antialiasing)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 msgid "" "If your gps device draws too few lines, select this to draw lines along your " @@ -2621,5 +2619,5 @@ "le linee lungo il percorso." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:71 msgid "" "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines." @@ -2628,9 +2626,9 @@ "permettere qualsiasi lunghezza." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73 msgid "Maximum length (meters)" msgstr "Lunghezza massima (metri)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:77 msgid "" "Force drawing of lines if the imported data contain no line information." @@ -2639,16 +2637,17 @@ "sulle linee." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:84 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89 msgid "Draw direction arrows for lines, connecting GPS points." msgstr "" "Disegna le frecce di direzione per le linee che congiungono i punti del GPS." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90 -msgid "Draw the direction arrows using table lookups instead of complex math." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95 +msgid "" +"Draw the direction arrows using table lookups instead of complex math." msgstr "" "Disegna le frecce di direzione usando riferimenti tabellari piuttosto che " "usare operazioni matematiche complesse." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:96 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:101 msgid "" "Don't draw arrows if they are not at least this distance away from the last " @@ -2656,15 +2655,29 @@ msgstr "Non disegnare le frecce se non sono distanti dalla precedente almeno" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104 msgid "Minimum distance (pixels)" msgstr "Distanza minima (in pixel)" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:109 -msgid "Choose the hue for the track color by the velocity at that point." -msgstr "" -"Scegli la tinta per il tracciato colorato in base alla velocità in quel " -"punto." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116 +msgid "Draw larger dots for the GPS points." +msgstr "Disegna dei cerchi più grandi per i punti GPS." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136 +msgid "" +"All points and track segments will have the same color. Can be customized in " +"Layer Manager." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137 +msgid "Colors points and track segments by velocity." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:138 +msgid "" +"Colors points and track segments by dilution of position (HDOP). Your " +"capture device needs to logs that information." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143 msgid "Allows to tune the track coloring for different average speeds." msgstr "" @@ -2672,31 +2685,32 @@ "velocità medie." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122 -msgid "Draw larger dots for the GPS points." -msgstr "Disegna dei cerchi più grandi per i punti GPS." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148 +msgid "Track and Point Coloring" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 msgid "GPS Points" msgstr "Punti GPS" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175 msgid "Draw direction hints for way segments." msgstr "Disegna il verso sui segmenti dei percorsi." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:163 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192 msgid "Draw the order numbers of all segments within their way." msgstr "" "Disegna i numeri d'ordine per tutti i segmenti all'interno del loro percorso." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:168 -msgid "Apply antialiasing to the map view resulting in a smoother appearance." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:197 +msgid "" +"Apply antialiasing to the map view resulting in a smoother appearance." msgstr "" "Applicando l'antialiasing alla mappa, la visualizzazione risulterà migliore." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202 msgid "Draw the boundaries of data loaded from the server." msgstr "Disegna i confini dei dati scaricati dal server." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:178 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:207 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" @@ -2704,9 +2718,9 @@ "percorso." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212 msgid "Draw the inactive data layers in a different color." msgstr "Disegna con un colore diverso i layer non attivi." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219 msgid "OSM Data" msgstr "Dati OSM" @@ -2817,6 +2831,6 @@ "a menu entry of button for the first time. So some of your changes may " "become active even without restart --- but also without collistion handling. " -"This is another reason to restart JOSM after making any changes here." -"

            " +"This is another reason to restart JOSM after making any changes " +"here.

            " msgstr "" "

            Inoltre le scorciatoie sono abilitate quando sono assegnate a una voce di " @@ -2834,8 +2848,9 @@ "key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also " "there will be 'keys' listed that correspond to a shortcut on your keyboard " -"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/" -"Semicolon on US keyboards, '.'/Period on German keyboards, ...) instead. Not " -"doing so may result in conflicts, as there is no way for JOSM to know that " -"Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...

            " +"(e.g. ':'/Colon). Please also do not use them, use the base key " +"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) " +"instead. Not doing so may result in conflicts, as there is no way for JOSM " +"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US " +"keyboard...

            " msgstr "" "

            Si può notare che nella lista di selezione dei tasti nella prossima " @@ -2878,6 +2893,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183 msgid "" -"

            The pseudo-modifier 'disabled' will disable the shortcut when encountered." -"

            " +"

            The pseudo-modifier 'disabled' will disable the shortcut when " +"encountered.

            " msgstr "" "

            Lo pseudo-modificatore 'disabled' disabiliterà il collegamento quando " @@ -2949,10 +2964,10 @@ msgstr "Gruppi dei modificatori" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:231 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:236 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:250 msgid "layer not in list." msgstr "livello non in lista." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -2961,58 +2976,58 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "usage" msgstr "uso" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 msgid "options" msgstr "opzioni" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 msgid "Show this help" msgstr "Mostra questo aiuto" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Standard unix geometry argument" msgstr "Dimensioni e posizione della finestra (secondo lo standard UNIX)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 msgid "Download the bounding box" msgstr "Scarica la zona delimitata dal riquadro di selezione" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 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:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 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:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 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:144 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Select with the given search" msgstr "Seleziona i risultati della ricerca della stringa" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 msgid "Don't launch in fullscreen mode" msgstr "Non avviare a pieno schermo" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 msgid "Reset the preferences to default" msgstr "Reimposta le preferenze predefinite" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 msgid "Set the language." msgstr "Imposta la lingua." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 msgid "examples" msgstr "Esempi" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3022,21 +3037,21 @@ "quindi assicurati di caricare dei dati prima di indicare una selezione." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 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:161 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 msgid "Activating updated plugins" msgstr "Attivazione estensioni aggiornate" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 msgid "Loading early plugins" msgstr "Caricamento vecchie estensioni" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Setting defaults" msgstr "Impostazioni predefinite" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171 msgid "Loading plugins" msgstr "Caricamento estensioni" @@ -3070,6 +3085,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:108 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:164 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:162 #: trans_presets.java:308 trans_presets.java:309 trans_presets.java:310 #: trans_presets.java:311 trans_presets.java:312 trans_presets.java:313 @@ -3086,5 +3101,5 @@ msgstr "sconosciuto" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:66 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 #, java-format msgid "" @@ -3095,26 +3110,27 @@ "è più necessario." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 #, java-format msgid "Plugin requires JOSM update: {0}." msgstr "L'estensione richiede l'aggiornamento di JOSM: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "Il plugin {0} è richiesto dal plugin {1} ma non è stato trovato" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 #, java-format msgid "Plugin not found: {0}." msgstr "Estensione non trovata: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "" -"L'ultimo aggiornamento dell'estensione è avvenuto più di {0} giorni fa." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127 +"L''ultimo aggiornamento della lista delle estensioni è avvenuto più di {0} " +"giorni fa." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 msgid "" "(You can change the number of days after which this warning appears
            by " @@ -3122,20 +3138,21 @@ msgstr "" "(Si può modificare il numero di giorni dopo il quale appare questo " -"avvertimento
            specificando l'opzione di configurazione 'pluginmanager." -"warntime'.)" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 +"avvertimento
            specificando l'opzione di configurazione " +"'pluginmanager.warntime'.)" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 msgid "Disable plugin" msgstr "Disabilita estensione" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" -msgstr "Non è possibile caricare il plugin {0}. Cancellarlo dalle preferenze?" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +msgstr "" +"Non è possibile caricare il plugin {0}. Cancellarlo dalle preferenze?" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -3145,5 +3162,5 @@ "i permessi per sovrascrivere quelle esistenti." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 #, java-format msgid "" @@ -3153,10 +3170,10 @@ "dall'estensione ''{0}''." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Secondo le informazioni all'interno del plugin l'autore è {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:262 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -3165,9 +3182,9 @@ "comunicare un bug." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 msgid "Should the plugin be disabled?" msgstr "Disabilitare l'estensione?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:278 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -3177,5 +3194,5 @@ "eliminare l'estensione." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -3185,6 +3202,6 @@ "cui si è ottenuto JOSM." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:322 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:181 msgid "no description available" msgstr "nessuna descrizione disponibile" @@ -3196,5 +3213,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 msgid "Update Plugins" msgstr "Aggiorna estensioni" @@ -3231,5 +3248,5 @@ "automaticamente." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 #, java-format msgid "Downloaded plugin information from {0} site" @@ -3238,13 +3255,13 @@ msgstr[1] "Informazioni sulle estensioni scaricate da {0} siti" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 msgid "No plugin information found." msgstr "Non è stata trovata alcuna informazione sulle estensioni." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:76 msgid "All installed plugins are up to date." msgstr "Tutte le estensioni sono state aggiornate." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 #, java-format msgid "" @@ -3257,9 +3274,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:105 msgid "Download missing plugins" msgstr "Scarica le estensioni mancanti" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:106 #, java-format msgid "" @@ -3272,22 +3289,22 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 msgid "Download Plugins" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:170 +msgstr "Scarica Estensioni" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:168 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Versione {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:176 msgid "Plugin bundled with JOSM" msgstr "Estensioni fornite con JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208 msgid "Plugin already exists" msgstr "Estensione già esistente" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:211 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:209 #, java-format msgid "" @@ -3297,23 +3314,24 @@ "{0}" msgstr "" -"Estensione già disponibile. Desideri scaricare la versione aggiornata e " -"cancellare il vecchio archivio?\n" +"Il file dell''estensione è già disponibile in locale. Desideri scaricare la " +"versione aggiornata e cancellare il vecchio archivio?\n" "\n" "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 msgid "Delete and Download" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224 +msgstr "Elimina e Scarica" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:222 #, java-format msgid "Error deleting plugin file: {0}" msgstr "Errore nell'eliminazione del file dell'estensione: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:281 #, java-format msgid "Error reading plugin information file: {0}" -msgstr "Impossibile leggere il file con le informazioni sulle estensioni: {0}" +msgstr "" +"Impossibile leggere il file con le informazioni sulle estensioni: {0}" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 @@ -3377,10 +3395,10 @@ msgstr "Cancella {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:165 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 msgid "Conflicting relation" msgstr "Conflitto tra relazioni" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 #, java-format msgid "" @@ -3391,5 +3409,5 @@ "Cancellare dalla relazione?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:166 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 #, java-format msgid "" @@ -3406,7 +3424,7 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:349 msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
            This can cause problems because other objects (that you don't see) might " -"use them.
            Do you really want to delete?" +"You are about to delete nodes outside of the area you have " +"downloaded.
            This can cause problems because other objects (that you don't " +"see) might use them.
            Do you really want to delete?" msgstr "" "Stai per cancellare dei nodi fuori dall'area scaricata.
            Questo potrebbe " @@ -3539,124 +3557,135 @@ msgstr "Impossibile scaricare le preferenze dal server." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:232 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 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:426 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:428 #, 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:527 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:765 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:776 msgid "Empty member in relation." msgstr "Membro vuoto nella relazione." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:767 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:531 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 #, 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:547 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 #, 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:552 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:549 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:558 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555 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:564 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:561 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 +msgid "More than one \"via\" found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 #, java-format msgid "Unknown role ''{0}''." msgstr "Ruolo ''{0}'' sconosciuto." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 #, 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:584 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 msgid "No \"from\" way found." msgstr "Non è stato trovato un percorso \"from\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 msgid "No \"to\" way found." msgstr "Non è stato trovato un percorso \"to\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -msgid "No \"via\" node found." -msgstr "Non è stato trovato un nodo \"via\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +msgid "No \"via\" node or way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 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:619 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:636 -#, java-format -msgid "The \"{0}\" way must contain at least 2 nodes." -msgstr "Il percorso \"{0}\" deve contenere almeno 2 nodi." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:731 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +msgid "The \"to\" way doesn't start or end at a \"via\" node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:620 +msgid "The \"from\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:624 +msgid "The \"to\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:742 #, 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:787 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 #, 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:798 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 #, 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:847 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:858 #, 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:927 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 #, 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:938 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:949 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Il percorso interno ''{0}'' è esterno." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:987 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:998 #, 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:1012 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1023 #, 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:1195 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1206 msgid "untagged" msgstr "senza etichetta" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1196 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207 msgid "text" msgstr "testo" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" msgstr "inattivo" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:94 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:181 @@ -3664,15 +3693,15 @@ msgstr "selezionato" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" msgstr "percorso senza etichetta" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 msgid "incomplete way" msgstr "percorso incompleto" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 msgid "highlight" -msgstr "" +msgstr "evidenzia" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -3692,5 +3721,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:113 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:89 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:77 msgid "incomplete" @@ -3720,14 +3749,14 @@ msgstr[1] "{0} membri" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 msgid "Duplicate" msgstr "Duplica" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 msgid "Duplicate selection by copy and immediate paste." msgstr "Duplica la selezione copiando ed incollalo subito." -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 @@ -3736,5 +3765,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -3806,7 +3835,9 @@ msgstr "Mostra la cronologia di percorsi e nodi in OSM" -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:57 -msgid "Please select at least one node, way or relation." -msgstr "Selezionare almeno un nodo, percorso o relazione." +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:60 +msgid "" +"Please select at least one node, way or relation. Only already uploaded " +"elements have a history." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 @@ -3828,7 +3859,7 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/TerracerAction.java:47 @@ -3945,5 +3976,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 msgid "Combine Anyway" -msgstr "" +msgstr "Unisci comunque" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141 @@ -3961,10 +3992,10 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 msgid "Reverse and Combine" -msgstr "" +msgstr "Inverti direzione e unisci" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:123 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:314 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:315 msgid "Enter values for all conflicts." msgstr "Inserire dei valori per tutti i conflitti." @@ -3972,7 +4003,7 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 msgid "Solve Conflicts" -msgstr "" +msgstr "Risolvi conflitti" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231 @@ -4077,5 +4108,5 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 msgid "Export and Save" -msgstr "" +msgstr "Esporta e Salva" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143 @@ -4106,5 +4137,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #, java-format @@ -4131,17 +4162,19 @@ msgstr[1] "I nodi selezionati non sono parte di alcun percorso." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125 -msgid "" -"There is more than one way using the node(s) you selected. Please select the " +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 +msgid "" +"There is more than one way using the node you selected. Please select the " "way also." -msgstr "" -"Più di un percorso usa il nodo o i nodi selezionati. Selezionare anche il " -"percorso." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133 +msgid_plural "" +"There is more than one way using the nodes you selected. Please select the " +"way also." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137 msgid "The selected nodes do not share the same way." msgstr "I nodi selezionati non condividono il medesimo percorso." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -4149,10 +4182,10 @@ msgstr[1] "Il percorso selezionato non contiene tutti i nodi selezionati." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229 msgid "You must select two or more nodes to split a circular way." msgstr "Seleziona due o più nodi per dividere un percorso circolare." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -4162,5 +4195,5 @@ "seleziona i nodi in mezzo al percorso)." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 msgid "" "A role based relation membership was copied to all new ways.\n" @@ -4171,5 +4204,5 @@ "Controllare ed eventualmente correggere." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:296 #, java-format msgid "Split way {0} into {1} parts" @@ -4263,5 +4296,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Upload Changes" -msgstr "" +msgstr "Carica le modifiche" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 @@ -4494,5 +4527,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 msgid "Start Search" -msgstr "" +msgstr "Inizia Ricerca" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:170 @@ -4567,5 +4600,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 msgid "Align Nodes in Circle" msgstr "Disponi i nodi in cerchio" @@ -4579,5 +4612,5 @@ msgstr "Alcuni nodi sono (quasi) in linea" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 msgid "Please select at least four nodes." msgstr "Selezionare almeno quattro nodi." @@ -4601,9 +4634,9 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "The document contains no data." -msgstr "" +msgstr "Il documento non contiene dati" #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 msgid "Save anyway" -msgstr "" +msgstr "Salva comunque" #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90 @@ -4617,5 +4650,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "Reject Conflicts and Save" -msgstr "" +msgstr "Rifiuta i conflitti e Salva" #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 @@ -4646,4 +4679,32 @@ msgstr "Errore durante il ripristino di un file di backup." +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "" +"Show status report with useful information that can be attached to bugs" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92 +msgid "Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +msgid "Copy to clipboard and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 +msgid "Close" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 @@ -4655,13 +4716,13 @@ msgstr "Rifa l'ultima azione annullata." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:44 msgid "Delete Mode" msgstr "Modalità Cancella" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:46 msgid "Delete nodes or ways." msgstr "Cancella nodi o percorsi." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:84 @@ -4672,5 +4733,5 @@ msgstr "Modalità: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:130 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -4683,6 +4744,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:87 msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." +"Drag play head and release near track to play audio from there; " +"SHIFT+release to synchronize audio at that point." msgstr "" "Trascinare la testina e rilasciarla in prossimità di un tracciato per " @@ -4700,10 +4761,10 @@ msgstr "Crea aree" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 msgid "Extrude Way" msgstr "Estrudi il percorso" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:252 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:416 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:430 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" @@ -4711,5 +4772,5 @@ "rettangolo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 msgid "Draw a rectangle of the desired size, then release the mouse button." msgstr "" @@ -4717,10 +4778,10 @@ "del mouse." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:420 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:434 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/ExtrudeAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 msgid "Drag a way segment to make a rectangle." msgstr "" @@ -4789,14 +4850,14 @@ msgstr "Seleziona, muovi e ruota gli oggetti." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:191 msgid "Add and move a virtual new node to way" msgstr "Aggiungi e muovi un nuovo nodo virtuale al percorso" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:220 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:223 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 msgid "Cannot move objects outside of the world." msgstr "Impossibile spostare degli oggetti fuori dal mondo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:418 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:432 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -4805,5 +4866,5 @@ "più vicino." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:422 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:436 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to remove); Shift-" @@ -4828,7 +4889,7 @@ "move zoom with right button" msgstr "" -"Cambiare il livello di ingrandimento mediante trascinamento o premendo Ctrl" -"+. or Ctrl+,; muoversi con Ctrl+su,sinistra,giù,destra; muovere il livello " -"di ingrandimento con il tasto destro" +"Cambiare il livello di ingrandimento mediante trascinamento o premendo " +"Ctrl+. or Ctrl+,; muoversi con Ctrl+su,sinistra,giù,destra; muovere il " +"livello di ingrandimento con il tasto destro" #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22 @@ -4868,5 +4929,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 msgid "Merge Anyway" -msgstr "" +msgstr "Incorpora comunque" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239 @@ -4879,32 +4940,32 @@ msgstr "Unisci {0} nodi" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Orthogonalize Shape" msgstr "Disponi ortogonalmente" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 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:60 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 msgid "Only two nodes allowed" msgstr "Sono permessi solo due nodi" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 msgid "Selection must consist only of ways." msgstr "La selezione deve comprendere solo percorsi." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 msgid "Please select one or more closed ways of at least four nodes." msgstr "Selezionare uno o più percorsi chiusi di almeno quattro nodi." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 msgid "Please select ways with almost right angles to orthogonalize." msgstr "" "Selezionare dei percorsi con gli angoli da ortogonalizzare quasi giusti." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 msgid "" "You are using the EPSG:4326 projection which might lead
            to " @@ -4916,9 +4977,9 @@ "proiezione per non ottenere più questo avvertimento.
            Si vuole continuare?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "Only one node selected" msgstr "Solo un nodo selezionato" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 msgid "Orthogonalize" msgstr "Disponi ortogonalmente" @@ -4969,5 +5030,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101 -msgid "Please select exactly three nodes or one way with exactly three nodes." +msgid "" +"Please select exactly three nodes or one way with exactly three nodes." msgstr "" "Seleziona esattamente tre nodi oppure un percorso formato esattamente da tre " @@ -4978,52 +5040,69 @@ msgstr "Questi nodi non sono disposti in cerchio" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../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:71 +msgid "Update Data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:72 +#, java-format +msgid "" +"This action will require {0} individual download requests. Do you wish to " +"continue?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 msgid "Open Location..." msgstr "Apri indirizzo URL..." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 msgid "Open an URL." msgstr "Apri un indirizzo URL." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 msgid "Separate Layer" msgstr "Livello separato" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 msgid "Enter URL to download:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:63 +msgstr "Inserisci URL da scaricare:" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 msgid "Download Location" msgstr "Scarica indirizzo URL" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 msgid "Download URL" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:73 +msgstr "Scarica URL" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 msgid "Add Node..." msgstr "Aggiungi nodo..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 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:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 msgid "Enter the coordinates for the new node." msgstr "Inserire le coordinate per il nuovo nodo." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 msgid "Use decimal degrees." msgstr "Usa i gradi decimali." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 msgid "Negative values denote Western/Southern hemisphere." msgstr "Valori negativi denotano l'emisfero Occidentale/Meridionale." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 #: ../plugins/livegps/livegps/LiveGpsDialog.java:54 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93 @@ -5032,5 +5111,5 @@ msgstr "Latitudine" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 #: ../plugins/livegps/livegps/LiveGpsDialog.java:56 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96 @@ -5073,14 +5152,14 @@ msgstr "Sposta Oggetti {0}" +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "Overwrite" msgstr "Sovrascrivi" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "File exists. Overwrite?" msgstr "Il file esiste. Sovrascriverlo?" @@ -5099,43 +5178,48 @@ msgstr "Seleziona qualcosa da copiare." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Separa percorsi" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "Duplica i nodi usati da più percorsi." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 msgid "This node is not glued to anything else." msgstr "Questo nodo non è attaccato ad altri elementi." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 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:90 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 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:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 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:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "Select either:" msgstr "Selezionare uno di questi:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +msgid "* One tagged node, or" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 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:103 -msgid "* One node that is used by more than one way and one of those ways, or" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +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:104 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -5144,5 +5228,5 @@ "oppure" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -5151,5 +5235,5 @@ "percorso." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -5164,10 +5248,14 @@ "e tutti i nodi saranno selezionati." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:160 +msgid "Unglued Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:373 #, java-format msgid "Dupe into {0} nodes" msgstr "Duplica in {0} nodi" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:320 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:397 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -5270,5 +5358,5 @@ msgstr "Annulla l'ultima azione." -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 msgid "No Shortcut" msgstr "Nessuna scorciatoia" @@ -5290,13 +5378,13 @@ msgstr "Dati OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:29 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:28 msgid "Downloading GPS data" msgstr "Scaricamento dei dati GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:41 msgid "Downloaded GPX Data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:71 +msgstr "Scarica dati GPX" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:69 msgid "Raw GPS data" msgstr "Dati GPS grezzi" @@ -5526,5 +5614,6 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169 -msgid "Header contains several values and cannot be mapped to a single string" +msgid "" +"Header contains several values and cannot be mapped to a single string" msgstr "" "L'intestazione contiene troppi valori e non è possibile mapparla su una " @@ -5582,5 +5671,6 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96 msgid "Open the OpenStreetBugs window and activate the automatic download" -msgstr "Apri la finestra di OpenStreetBugs e attiva lo scaricamento automatico" +msgstr "" +"Apri la finestra di OpenStreetBugs e attiva lo scaricamento automatico" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114 @@ -5886,5 +5976,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69 -msgid "Maximum number of segments allowed in each generated way. Default 250." +msgid "" +"Maximum number of segments allowed in each generated way. Default 250." msgstr "" "Numero massimo di segmenti permesso per ogni percorso generato. Predefinito " @@ -5909,6 +6000,7 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72 msgid "" -"Accuracy of Douglas-Peucker line simplification, measured in degrees." -"
            Lower values give more nodes, and more accurate lines. Default 0.0003." +"Accuracy of Douglas-Peucker line simplification, measured in " +"degrees.
            Lower values give more nodes, and more accurate lines. Default " +"0.0003." msgstr "" "Accuratezza della semplificazione lineare di Douglas-Peucker, misurata in " @@ -5965,5 +6057,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84 msgid "A plugin to trace water bodies on Landsat imagery." -msgstr "Una estensione per tracciare le superfici acquee su immagini Landsat." +msgstr "" +"Una estensione per tracciare le superfici acquee su immagini Landsat." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85 @@ -6418,5 +6511,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44 msgid "This test checks if a way has an endpoint very near to another way." -msgstr "Questo test controlla se una via finisce molto vicina ad un'altra via." +msgstr "" +"Questo test controlla se una via finisce molto vicina ad un'altra via." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:76 @@ -6572,10 +6666,11 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:509 msgid "" -"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." -"org/index.php/User:JLS/speller) or tag checking data files." -msgstr "" -"Sorgente (URL o nome del file) del controllo ortografico (vedi http://wiki." -"openstreetmap.org/index.php/User:JLS/speller) o file dati per il controllo " -"delle etichette." +"The sources (URL or filename) of spell check (see " +"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking " +"data files." +msgstr "" +"Sorgente (URL o nome del file) del controllo ortografico (vedi " +"http://wiki.openstreetmap.org/index.php/User:JLS/speller) o file dati per il " +"controllo delle etichette." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:510 @@ -6664,5 +6759,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 msgid "This test checks that there are no nodes at the very same location." -msgstr "Questo test verifica che non ci siano due nodi nella stessa posizione." +msgstr "" +"Questo test verifica che non ci siano due nodi nella stessa posizione." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:108 @@ -6853,17 +6949,17 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:28 msgid "autozoom" -msgstr "" +msgstr "autozoom" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29 msgid "autoload tiles" -msgstr "" +msgstr "scarica automaticamente i tile" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35 msgid "SlippyMap" -msgstr "" +msgstr "SlippyMap" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35 msgid "Settings for the SlippyMap plugin." -msgstr "" +msgstr "Impostazioni per l'estensione SlippyMap" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43 @@ -6873,13 +6969,13 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48 msgid "Auto zoom: " -msgstr "" +msgstr "Auto zoom: " #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53 msgid "Autoload Tiles: " -msgstr "" +msgstr "Carica utomaticamente i tile: " #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58 msgid "Max zoom lvl: " -msgstr "" +msgstr "Massimo livello di zoom: " #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81 @@ -7043,6 +7139,6 @@ msgstr "Aggiungi un nuovo livello" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:40 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:43 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 #, java-format @@ -7050,19 +7146,30 @@ msgstr "Scaricamento di {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:51 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:55 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 msgid "Contacting WMS Server..." msgstr "Collegamento al Server WMS in corso..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157 msgid "Create buildings" msgstr "Crea un edificio" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 msgid "CadastreGrabber: Illegal url." msgstr "CadastreGrabber: indirizzo url non valido." + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +msgid "" +"To avoid cadastre WMS overload,\n" +"building import size is limited to 1 km2 max." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +msgid "Please, enable auto-sourcing and check cadastre millesime." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78 @@ -7084,5 +7191,22 @@ msgstr "Catasto: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:128 +msgid "Cadastre" +msgstr "Catasto" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:139 +msgid "Auto sourcing" +msgstr "Sorgente auto-determinata" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164 +msgid "Invalid projection" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 +#, java-format +msgid "Change the projection to {0} first." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:169 msgid "" "To enable the cadastre WMS plugin, change\n" @@ -7091,12 +7215,4 @@ "Per abilitare l'estensione WMS del catasto, cambiare\n" "la proiezione di JOSM a Lambert e riavviare JOSM." - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132 -msgid "Cadastre" -msgstr "Catasto" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 -msgid "Auto sourcing" -msgstr "Sorgente auto-determinata" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20 @@ -7171,9 +7287,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:43 msgid "" -"More than one WMS layer present.\n" -"Select one of them first, then retry." -msgstr "" -"E' presente più di un layer WMS.\n" -"Selezionane uno e poi riprova." +"More than one WMS layer present\n" +"Select one of them first, then retry" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:19 @@ -7181,5 +7295,5 @@ msgstr "Carica la posizione dalla cache (solo se la cache è abilitata)" -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136 #, java-format @@ -7189,13 +7303,13 @@ msgstr[1] "Semplifica percorso (rimuovi {0} nodi)" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61 msgid "Extract SVG ViewBox..." msgstr "Estrai il riquadro di visualizzazione SVG..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65 msgid "Extract best fitting boundary..." msgstr "Estrai il riquadro più appropriato..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:120 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126 msgid "Create boundary" msgstr "Creazione confine" @@ -7231,15 +7345,15 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 msgid "Save WMS layer to file" msgstr "Salva il livello WMS su file" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "Load WMS layer from file" msgstr "Carica il livello WMS da file" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -7247,5 +7361,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 msgid "File Format Error" msgstr "Errore nel formato del file" @@ -7253,5 +7367,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 msgid "Error loading file" msgstr "Errore durante il caricamento del file" @@ -7281,49 +7395,52 @@ msgstr "Errore nella zona di Lambert della cache" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 msgid "Replace original background by JOSM background color." msgstr "Sostituisci lo sfondo originale con il colore di sfondo JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30 msgid "Reverse grey colors (for black backgrounds)." msgstr "Inverti i colori grigi (per sfondi neri)." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 msgid "Set background transparent." msgstr "Imposta lo sfondo trasparente." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34 msgid "Draw boundaries of downloaded data." msgstr "Traccia i contorni dei dati scaricati." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Enable automatic caching." msgstr "Abilita la cache automatica." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 msgid "Max. cache size (in MB)" msgstr "Massima dimensione della cache (in MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:53 -msgid "" -"A special handler of the french cadastre wms at www.cadastre.gouv." -"fr

            Please read the Terms and Conditions of Use here (in french): " -"
            http://www.cadastre.gouv.fr/scpc/html/" -"CU_01_ConditionsGenerales_fr.html
            before any upload of data created " -"by this plugin." -msgstr "" -"Un gestore speciale del wms francese del catasto all'indirizzo www.cadastre." -"gouv.fr

            Leggere i Termini e Condizioni d'Uso qui (in francese): " -"
            http://www.cadastre.gouv.fr/scpc/html/" -"CU_01_ConditionsGenerales_fr.html
            prima di effettuare qualsiasi " -"caricamento di dati creati da questa estensione." - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:58 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:55 +msgid "" +"A special handler of the french cadastre wms at " +"www.cadastre.gouv.fr

            Please read the Terms and Conditions of Use here " +"(in french):
            " +"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " +"
            before any upload of data created by this plugin." +msgstr "" +"Un gestore speciale del wms francese del catasto all'indirizzo " +"www.cadastre.gouv.fr

            Leggere i Termini e Condizioni d'Uso qui (in " +"francese):
            " +"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " +"
            prima di effettuare qualsiasi caricamento di dati creati da questa " +"estensione." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 msgid "French cadastre WMS" msgstr "WMS francese del catasto" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -7331,10 +7448,10 @@ "automatica" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65 msgid "Source" msgstr "Sorgente" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -7344,16 +7461,15 @@ "preferenze di JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 -msgid "" -"Invert the original texts from black to white (and all intermediate greys)." -msgstr "" -"Invertire i testi originali da neri a bianchi (e tutti i valori di grigio " -"intermedi)." - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +msgid "" +"Invert the original black and white colors (and all intermediate greys). " +"Useful for texts on dark backgrounds." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Allows multiple layers stacking" msgstr "Permette la sovrapposizione di livelli multipli" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:99 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" @@ -7361,13 +7477,26 @@ "trasparente." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Traccia un rettangolo attorno i dati scaricati dal server WMS." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:113 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 msgid "Image grab multiplier:" msgstr "Moltiplicatore di attrazione dell'immagine:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:162 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:125 +msgid "Grab smaller images (higher quality but use more memory)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +msgid "Fixed size square (default is 100m)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +msgid "Fixed size (from 25 to 1000 meters)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -7438,26 +7567,27 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:113 msgid "Join overlapping Areas" -msgstr "" +msgstr "Unisci aree sovrapposte" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" -msgstr "" +msgstr "Unisci aree che si sovrappongono l'un l'altra" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124 msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." msgstr "" +"QUESTO E'' SPERIMENTALE. Salva il tuo lavoro e verificalo prima di caricarlo." #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125 msgid "Continue anyway" -msgstr "" +msgstr "Continua comunque" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:147 msgid "Only up to two areas can be joined at the moment." -msgstr "" +msgstr "Attualmente solo due aree possono essere unite." #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:152 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." -msgstr "" +msgstr "\"{0}\" non è chiuso e quindi non può essere unito." #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:169 @@ -7480,15 +7610,17 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:186 msgid "Please select at least one closed way the should be joined." -msgstr "" +msgstr "Seleziona almeno un percorso chiuso che dovrebbe essere unito." #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:194 msgid "No intersections found. Nothing was changed." -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:254 +msgstr "non è stata trovata nessuna intersezione. Nulla è stato cambiato." + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:255 msgid "" "Some of the ways were part of relations that have been modified. Please " "verify no errors have been introduced." msgstr "" +"Alcuni percorsi facevano parte di relazioni che sono state modificate. Per " +"favore verifica che non siano stati introdotti errori." #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 @@ -7631,7 +7763,7 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:203 msgid "" -"Take a photo of your GPS receiver while it displays the time." -"
            Display that photo here.
            And then, simply capture the time you read " -"on the photo and select a timezone

            " +"Take a photo of your GPS receiver while it displays the " +"time.
            Display that photo here.
            And then, simply capture the time you " +"read on the photo and select a timezone
            " msgstr "" "Fotografa il tuo ricevitore GPS mentre indica l'ora.
            Visualizza qui " @@ -7700,5 +7832,6 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:484 -msgid "I can take a picture of my GPS receiver.
            Can this help?" +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 " @@ -7746,5 +7879,5 @@ msgstr "Fuso orario non valido" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #, java-format msgid "" @@ -7755,14 +7888,14 @@ "Formato atteso: {0}." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:579 msgid "Invalid offset" msgstr "Compensazione non valida" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:641 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:643 #, java-format msgid "Found {0} matchs of {1} in GPX track {2}" msgstr "Trovate {0} corrispondenze di {1} nel tracciato GPX {2}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:642 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:644 msgid "GPX Track loaded" msgstr "Tracciato GPS caricato" @@ -7770,5 +7903,5 @@ #: ../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/UploadDataGui.java:79 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 msgid "Upload Traces" msgstr "Carica tracciati" @@ -7778,59 +7911,73 @@ msgstr "Carica i tracciati su openstreetmap.org" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 -msgid "Upload GPX track" -msgstr "Carica tracciato GPX" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71 +msgid "Upload Trace" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Public" msgstr "Pubblico" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 msgid "Selected makes your trace public in openstreetmap.org" msgstr "" "Se selezionato rende pubblico il proprio tracciato in openstreetmap.org" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Description" msgstr "Descrizione" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:123 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 msgid "Tags" msgstr "Etichette" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:182 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:153 +#, java-format +msgid "Selected track: {0}" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:176 msgid "Connecting..." msgstr "Connessione in corso..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 -msgid "Uploading GPX track..." -msgstr "Caricamento del tracciato GPX in corso..." - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:214 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:199 +msgid "Upload cancelled" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:209 +msgid "Error while uploading" +msgstr "Errore durante il caricamento" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "Caricamento GPX completato con successo" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:227 -msgid "Error while uploading" -msgstr "Errore durante il caricamento" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:235 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +msgid "Upload failed. Server returned the following message: " +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 +#, java-format +msgid "Uploading GPX track: {0}% ({1} of {2})" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "Non è stata fornita alcuna descrizione. Specificarne una." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:252 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "Nessun livello GPX selezionato. Impossibile caricare un tracciato." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:241 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "Non è stato fornito alcun nome utente." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:244 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "Non è stata fornita alcuna password." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "Caricamento del tracciato GPX in corso" @@ -8017,5 +8164,6 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 msgid "Modify list of WMS servers displayed in the WMS plugin menu" -msgstr "Modifica la lista dei server WMS mostrata nel menù dell'estensione WMS" +msgstr "" +"Modifica la lista dei server WMS mostrata nel menù dell'estensione WMS" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37 @@ -8053,5 +8201,5 @@ msgstr "Scaricamento automatico" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" @@ -8059,10 +8207,10 @@ "Livello WMS ({0}), scaricamento automatico al livello di ingrandimento {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Livello WMS ({0}), scaricamento per il livello di ingrandimento {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -8071,19 +8219,19 @@ "oppure cambia risoluzione" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:232 msgid "Download visible tiles" msgstr "Scarica i tasselli visibili" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241 msgid "Change resolution" msgstr "Cambia risoluzione" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:253 msgid "Reload erroneous tiles" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:264 +msgstr "Ricarica tile sbagliati" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:271 msgid "Alpha channel" -msgstr "" +msgstr "Alpha channel" #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:53 @@ -8143,6 +8291,6 @@ "format=image/jpeg \n" "\n" -"Per il rettificatore di mappe Metacarta http://labs.metacarta.com/" -"rectifier/ , è sufficiente inserire l'identificativo pertinente.\n" +"Per il rettificatore di mappe Metacarta http://labs.metacarta.com/rectifier/ " +", è sufficiente inserire l'identificativo pertinente.\n" "Per aggiungere una voce al menù relativo al rettificatore di mappe " "Metacarta, creare manualmente l'URL come in questo esempio, sostituendo 73 " @@ -12345,11 +12493,12 @@ #: trans_presets.java:2470 msgid "Outdoor" -msgstr "Negozio per attività all'aria aperta (campeggio/arrampicata/pesca...)" +msgstr "" +"Negozio per attività all'aria aperta (campeggio/arrampicata/pesca...)" #: trans_presets.java:2472 msgid "Edit Outdoor Shop" msgstr "" -"Modifica negozio per attività all'aria aperta (campeggio/arrampicata/" -"pesca...)" +"Modifica negozio per attività all'aria aperta " +"(campeggio/arrampicata/pesca...)" #: trans_presets.java:2476 @@ -12982,4 +13131,7 @@ msgstr "verso il percorso" +#~ msgid "Please select something from the conflict list." +#~ msgstr "Selezionare qualcosa dalla lista dei conflitti." + #~ msgid "OSM History Information" #~ msgstr "Cronologia elementi OSM" @@ -12988,4 +13140,5 @@ #~ msgstr "Cerca ..." +#, java-format #~ msgid " ({0} node)" #~ msgid_plural " ({0} nodes)" @@ -12997,18 +13150,55 @@ #~ msgid "" -#~ "This is the basic relation editor which allows you to change the " -#~ "relation's tags as well as the members. In addition to this we should " -#~ "have a smart editor that detects the type of relationship and limits your " -#~ "choices in a sensible way." +#~ "This is the basic relation editor which allows you to change the relation's " +#~ "tags as well as the members. In addition to this we should have a smart " +#~ "editor that detects the type of relationship and limits your choices in a " +#~ "sensible way." #~ msgstr "" #~ "Questo è un semplice editor delle relazioni che permette di modificare le " -#~ "etichette e i membri delle relazioni. In aggiunta a questo si dovrebbe " -#~ "avere un editor più avanzato che rilevi il tipo di relazione e che limiti " -#~ "le scelte dell'utente in modo sensibile." +#~ "etichette e i membri delle relazioni. In aggiunta a questo si dovrebbe avere " +#~ "un editor più avanzato che rilevi il tipo di relazione e che limiti le " +#~ "scelte dell'utente in modo sensibile." #~ msgid "Highlight the member from the current table row as JOSM's selection" #~ msgstr "" -#~ "Evidenzia il membro dalla riga della tabella utilizzata come una " -#~ "selezione di JOSM" +#~ "Evidenzia il membro dalla riga della tabella utilizzata come una selezione " +#~ "di JOSM" + +#~ msgid "Upload this trace..." +#~ msgstr "Carica questa traccia..." + +#~ msgid "" +#~ "This functionality has been added only recently. Please
            use with " +#~ "care and check if it works as expected." +#~ msgstr "" +#~ "Questa funzionalità è stata aggiunta di recente.
            Usare con prudenza " +#~ "e controllare il suo corretto funzionamento." + +#~ msgid "Upload track filtered by JOSM" +#~ msgstr "Carica il percorso filtrato da JOSM" + +#~ msgid "Upload raw file: " +#~ msgstr "Carica il file grezzo: " + +#~ msgid "Description:" +#~ msgstr "Descrizione:" + +#~ msgid "Tags (keywords in GPX):" +#~ msgstr "Etichette (keywords in GPX):" + +#~ msgid "GPX-Upload" +#~ msgstr "Carica-GPX" + +#, java-format +#~ msgid "Upload raw file: {0}" +#~ msgstr "Carica il file: {0}" + +#~ msgid "Tags:" +#~ msgstr "Etichette:" + +#~ msgid "Choose the hue for the track color by the velocity at that point." +#~ msgstr "" +#~ "Scegli la tinta per il tracciato colorato in base alla velocità in quel " +#~ "punto." #~ msgid "Unknown type" @@ -13018,4 +13208,5 @@ #~ msgstr "NullPointerException, è possibile che manchino delle etichette." +#, java-format #~ msgid "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..." #~ msgstr "Scaricamento {0} {1} (id: {2}) {3}% {4}/{5} (manca {6})..." @@ -13042,4 +13233,5 @@ #~ msgstr "Elementi naturali" +#, java-format #~ msgid "Version: {0}
            Last change at {1}" #~ msgstr "Versione: {0}
            Ultima modifica {1}" @@ -13057,4 +13249,5 @@ #~ msgstr "EstensioneSurveyor" +#, java-format #~ msgid "Version {0} - Last change at {1}" #~ msgstr "Versione {0} - Ultima modifica il {1}" @@ -13066,7 +13259,4 @@ #~ msgstr "Percorsi con nomi simili." -#~ msgid "Untagged nodes." -#~ msgstr "Nodi senza etichetta." - #~ msgid "Open waypoints file" #~ msgstr "Apri un file contenente punti del percorso" @@ -13075,43 +13265,44 @@ #~ msgstr "Apre un file contenente punti del percorso." +#, java-format #~ msgid "Data error: lat value \"{0}\" is out of bounds." #~ msgstr "Errore nei dati: il valore lat \"{0}\" è fuori limite." +#, java-format #~ msgid "Data error: lon value \"{0}\" is out of bounds." #~ msgstr "Errore nei dati: il valore lon \"{0}\" è fuori limite." #~ msgid "" -#~ "Fulltext search:
            • Baker Street - 'Baker' and 'Street' " -#~ "in any key or name.
            • \"Baker Street\" - 'Baker Street' in " -#~ "any key or name.
            • name:Bak - 'Bak' anywhere in the name.
            • -name:Bak - not 'Bak' in the name.
            • foot: - " -#~ "key=foot set to any value.
            • Special targets:
            • type: " -#~ "- type of the object (node, way, relation)
            • user:... - all objects changed by user
            • id:... - object with given ID
            • nodes:... - object with given " -#~ "number of nodes
            • modified - all changed objects
            • selected - all selected objects
            • incomplete - " -#~ "all incomplete objects
            • Use | or OR to combine with " -#~ "logical or
            • Use \" to quote operators (e.g. if key " -#~ "contains :)
            • Use ( and ) to group expressions
              • " +#~ "Fulltext search:
              • Baker Street - 'Baker' and 'Street' in " +#~ "any key or name.
              • \"Baker Street\" - 'Baker Street' in any key " +#~ "or name.
              • name:Bak - 'Bak' anywhere in the name.
              • -" +#~ "name:Bak - not 'Bak' in the name.
              • foot: - key=foot set to " +#~ "any value.
              • Special targets:
              • type: - type of the " +#~ "object (node, way, relation)
              • user:... - " +#~ "all objects changed by user
              • id:... - object with given " +#~ "ID
              • nodes:... - object with given number of " +#~ "nodes
              • modified - all changed objects
              • selected -" +#~ " all selected objects
              • incomplete - all incomplete " +#~ "objects
              • Use | or OR to combine with logical " +#~ "or
              • Use \" to quote operators (e.g. if key contains " +#~ ":)
              • Use ( and ) to group expressions
              " #~ msgstr "" #~ "Ricerca del testo completa:
              • Via Nazionale - " #~ "''Nazionale'' e ''Via'' in qualsiasi chiave o nome.
              • \"Via " -#~ "Nazionale\" - ''Via Nazionale'' in qualsiasi chiave o nome.
              • name:Naz - ''Naz'' in qualsiasi punto nel nome.
              • -" -#~ "name:Naz - ''Naz'' non presente nel nome.
              • foot: - " -#~ "chiave=foot impostata con qualsiasi valore.
              • Ricerche speciali:
              • type: - tipo dell''oggetto (node, way, " -#~ "relation)
              • user:... - tutti gli oggetti modificati " -#~ "dall''utente
              • id:... - oggetto con l''identificativo dato
              • nodes:... - oggetto con un dato numero di nodi
              • modified - tutti gli oggetti modificati
              • selected - tutti gli oggetti selezionati
              • incomplete - tutti gli oggetti incompleti
              • Usare |" -#~ " oppure OR per combinare la ricerca con l''operatore logico " -#~ "or
              • Usare \" per racchiudere gli operatori (es. se la " -#~ "chiave contiene :)
              • Usare ( e ) per raggruppare le " -#~ "espressioni
              " +#~ "Nazionale\"               - ''Via Nazionale'' in qualsiasi chiave o " +#~ "nome.
            • name:Naz - ''Naz'' in qualsiasi punto nel " +#~ "nome.
            • -name:Naz - ''Naz'' non presente nel " +#~ "nome.
            • foot: - chiave=foot impostata con qualsiasi " +#~ "valore.
            • Ricerche speciali:
            • type: - tipo dell''oggetto " +#~ "(node, way, relation)
            • user:... - tutti " +#~ "gli oggetti modificati dall''utente
            • id:... - oggetto con " +#~ "l''identificativo dato
            • nodes:... - oggetto con un dato numero " +#~ "di nodi
            • modified - tutti gli oggetti " +#~ "modificati
            • selected - tutti gli oggetti " +#~ "selezionati
            • incomplete - tutti gli oggetti " +#~ "incompleti
            • Usare | oppure OR per combinare la ricerca " +#~ "con l''operatore logico or
            • Usare \" per racchiudere gli " +#~ "operatori (es. se la chiave contiene :)
            • Usare ( e ) " +#~ "per raggruppare le espressioni
            " #~ msgid "Add Node" @@ -13136,4 +13327,11 @@ #~ msgstr "autobus" +#, java-format +#~ msgid "The \"{0}\" way must contain at least 2 nodes." +#~ msgstr "Il percorso \"{0}\" deve contenere almeno 2 nodi." + +#~ msgid "Upload GPX track" +#~ msgstr "Carica tracciato GPX" + #~ msgid "Direct Upload to OpenStreetMap" #~ msgstr "Caricamento diretto su OpenStreetMap" Index: /applications/editors/josm/i18n/po/ja.po =================================================================== --- /applications/editors/josm/i18n/po/ja.po (revision 13832) +++ /applications/editors/josm/i18n/po/ja.po (revision 13833) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-15 22:03+0100\n" -"PO-Revision-Date: 2009-02-14 17:18+0000\n" -"Last-Translator: Hiroshi Miura \n" +"POT-Creation-Date: 2009-02-21 16:35+0100\n" +"PO-Revision-Date: 2009-02-21 18:07+0000\n" +"Last-Translator: caesium \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-02-15 20:41+0000\n" +"X-Launchpad-Export-Date: 2009-02-22 20:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 #, java-format msgid "" @@ -26,10 +26,9 @@ "\n" msgstr "" -"キーボードショートカット\"{0}\"がすでにアクション\"{3}\"({4})のためにとられて" -"いるために\n" +"キーボードショートカット\"{0}\"がすでにアクション\"{3}\"({4})のためにとられているために\n" "アクション\"{1}\"({2})への割り当てに失敗しました。\n" "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 msgid "" "This action will have no shortcut.\n" @@ -39,5 +38,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -48,5 +47,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(ヒント:設定でショートカットキーを選べます。)" @@ -57,17 +56,17 @@ #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 msgid "Information" msgstr "情報" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Do nothing" msgstr "何もしない" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Report Bug" msgstr "バグを報告する" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 msgid "" "An unexpected exception occurred.\n" @@ -78,34 +77,31 @@ "予想外の例外が発生しました。\n" "\n" -"これは通常プログラミングの誤りです。最新のJOSMのバージョンを使っている場合に" -"は、\n" +"これは通常プログラミングの誤りです。最新のJOSMのバージョンを使っている場合には、\n" "大目にみて、ぜひバグレポートをぜひお願いします。" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Unexpected Exception" msgstr "予期しない例外" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 #, java-format msgid "Please report a ticket at {0}" msgstr "{0}でトラブルチケットを報告してください。" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "（できる限り詳細に）エラーが発生するまでの手順を含めてください！" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:78 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " "a bug." -msgstr "" -"バグの報告前にJOSMの最新バージョンとすべてのプラグインのアップデートをしてく" -"ださい。" - -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79 +msgstr "バグの報告前にJOSMの最新バージョンとすべてのプラグインのアップデートをしてください。" + +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Be sure to include the following information:" msgstr "必ず次の情報を含めること:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75 msgid "(The text has already been copied to your clipboard.)" msgstr "(テキストはクリップボードにコピーされています。)" @@ -119,5 +115,5 @@ msgstr "サウンドの再生でエラーが発生しています" -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:94 @@ -125,5 +121,5 @@ msgstr "OSMサーバに接続中..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:48 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:32 @@ -131,10 +127,10 @@ msgstr "OSMデータをダウンロード中..." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 msgid "NullPointerException, possibly some missing tags." msgstr "ヌルポインタ例外です。失われたタグがあるのでしょう。" -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83 msgid "Preparing data..." msgstr "データを準備中..." @@ -153,7 +149,5 @@ "Server returned internal error. Try a reduced area or retry after waiting " "some time." -msgstr "" -"サーバが内部エラーを返しました。しばらく待ってから試すか、領域指定を縮小して" -"試してください。" +msgstr "サーバが内部エラーを返しました。しばらく待ってから試すか、領域指定を縮小して試してください。" #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 @@ -162,48 +156,48 @@ msgstr "{1}にポイント{0}をダウンロード中..." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:164 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:168 msgid "Unknown version" msgstr "バージョン番号は不明です" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 msgid "Found element in non-way." msgstr "ウエイ以外で要素が見つかりました" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 msgid " has zero ref" msgstr " はゼロ参照です。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 msgid "Found element in non-relation." msgstr "要素がリレーション以外に見つかりました" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:252 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250 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:294 msgid "Illegal object with id=0" msgstr "id=0の禁じられたオブジェクトです" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "必要な属性\"{0}\"がありません" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 #, java-format msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" msgstr "存在しないノードを含むため、ウエイ {0} をスキップします\n" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:502 msgid "Prepare OSM data..." msgstr "OSMデータを準備します…" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:518 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:516 msgid "Ill-formed node id" msgstr "III-形式のノードID" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:280 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:287 msgid "Parse error: invalid document structure for gpx document" msgstr "パースエラー：GPXファイルのドキュメント構造が不適切です" @@ -213,18 +207,18 @@ msgstr "サーバに接続中..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 msgid "Provide a brief comment for the changes you are uploading:" msgstr "アップロードする変更の概略コメントを入力してください。" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 msgid "Commit comment" msgstr "コメントを反映します" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" msgstr "{0}% ({1}/{2}), {3} 残っています. アップロード中 {4}: {5} (id: {6})" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64 @@ -234,34 +228,32 @@ msgstr "エラーが起こりました: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:192 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190 msgid "Opening changeset..." msgstr "変更セットを開いています…" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:226 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224 msgid "Server does not support changesets" msgstr "サーバは変更した設定をサポートしていません" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:246 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:428 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:609 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:184 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607 msgid "Unknown host" msgstr "不明なホスト" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282 msgid "Preparing..." msgstr "準備中..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:294 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292 msgid "Uploading..." msgstr "アップロード中..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375 msgid "Closing changeset..." msgstr "変更した設定を閉じています..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:652 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650 msgid "Transfer aborted due to error (will wait for 5 seconds):" msgstr "エラーのため転送が中断しました（５秒待ちます）：" @@ -295,21 +287,24 @@ #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95 msgid "Login" -msgstr "" +msgstr "ログイン" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95 #: ../core/src/org/openstreetmap/josm/Main.java:348 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:29 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 @@ -322,11 +317,11 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:110 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -341,11 +336,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:186 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 msgid "Creating main GUI" msgstr "メインGUIを作成します。" #: ../core/src/org/openstreetmap/josm/Main.java:195 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:271 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:278 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:56 msgid "Help" @@ -358,6 +353,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:345 msgid "Hint: Some changes came from uploading new data to the server." -msgstr "" -"ヒント：変更の一部は、新しいデータをサーバにアップロードすることで現れます。" +msgstr "ヒント：変更の一部は、新しいデータをサーバにアップロードすることで現れます。" #: ../core/src/org/openstreetmap/josm/Main.java:346 @@ -388,29 +382,27 @@ msgstr "不正な形式のファイルURL\"{0}\"を無視します。" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109 msgid "min lat" msgstr "最小緯度" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111 msgid "min lon" msgstr "最小経度" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:117 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "max lat" msgstr "最大緯度" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 msgid "max lon" msgstr "最大経度" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:122 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " "area)" -msgstr "" -"www.openstreetmap.orgからのURL（ダウンロードしたいエリアのURLをここに貼り付け" -"ることができます。）" - -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:134 +msgstr "www.openstreetmap.orgからのURL（ダウンロードしたいエリアのURLをここに貼り付けることができます。）" + +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130 msgid "Bounding Box" msgstr "境界囲み" @@ -446,6 +438,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:96 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:894 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:956 msgid "name" msgstr "名前" @@ -478,11 +470,11 @@ msgstr "ズーム" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:107 msgid "" "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " "move mouse. Select: Click." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +msgstr "ズーム:マウスのホイールか、ダブルクリック。地図の移動：右マウスボタンを押した状態で移動させる。選択：クリック。" + +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:109 msgid "Slippy map" msgstr "スリッピーマップ" @@ -493,7 +485,7 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:605 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:602 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:89 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -513,5 +505,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380 msgid "Remove" msgstr "削除" @@ -624,7 +616,5 @@ "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " "filename" -msgstr "" -"それぞれをダウンロード。x1,y1,x2,y2や、lat=y&lon=x&zoom=z を含むURLか、ファイ" -"ル名を指定できます。" +msgstr "それぞれをダウンロード。x1,y1,x2,y2や、lat=y&lon=x&zoom=z を含むURLか、ファイル名を指定できます。" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 @@ -633,6 +623,5 @@ "lat=y&lon=x&zoom=z or a filename" msgstr "" -"それぞれを生GPSとしてダウンロード。x1,y1,x2,y2を、lat=y&lon=x&zoom=zを含むURL" -"かファイル名で指定できます。" +"それぞれを生GPSとしてダウンロード。x1,y1,x2,y2を、lat=y&lon=x&zoom=zを含むURLかファイル名で指定できます。" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 @@ -640,7 +629,5 @@ "Add each to the initial selection. Can be a google-like search string or an " "URL which returns osm-xml" -msgstr "" -"それぞれを初期の選択として追加します。グーグルのような検索文字列やOSM-XMLを返" -"すURLで指定できます。" +msgstr "それぞれを初期の選択として追加します。グーグルのような検索文字列やOSM-XMLを返すURLで指定できます。" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 @@ -652,20 +639,20 @@ msgstr "もし指定されると、読み込む代わりに設定をリセットします。" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:109 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:186 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:198 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:108 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:191 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:203 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 msgid "Java OpenStreetMap Editor" msgstr "Java OpenStreetMapエディタ" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:111 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:110 msgid "Message of the day not available" msgstr "今日のメッセージはありません" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:200 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:205 msgid "Downloading \"Message of the day\"" msgstr "\"今日のメッセージ\"をダウンロード" @@ -705,33 +692,33 @@ msgstr "ズームアウト" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:234 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:474 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:512 msgid "" msgstr "<差異あり>" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:383 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:380 msgid "More information about this feature" msgstr "この機能の詳細情報" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:393 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:390 msgid "Optional Attributes:" msgstr "オプションの属性：" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:437 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "グループ \"{1}\"のプリセット\"{0}\"を使います" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:438 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:435 #, java-format msgid "Use preset ''{0}''" msgstr "プリセット \"{0}\"を使います" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 msgid "way" @@ -739,17 +726,17 @@ msgstr[0] "ウェイ" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:214 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 msgid "node" msgid_plural "nodes" msgstr[0] "ノード" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:81 @@ -758,14 +745,14 @@ msgstr[0] "関連" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 msgid "closedway" msgstr "閉じたウェイ" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:475 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 #, java-format msgid "Unknown type: {0}" msgstr "不明なタイプ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:549 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 #, java-format @@ -773,15 +760,15 @@ msgstr "タグの事前設定ソース {0} を読み込めません。" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:555 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 #, java-format msgid "Error parsing {0}: " msgstr "走査時にエラー: {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:572 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:569 #, java-format msgid "Elements of type {0} are supported." msgstr "タイプ{0}の要素がサポートされます" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595 #, java-format msgid "Change {0} object" @@ -789,9 +776,17 @@ msgstr[0] "{0}このオブジェクトを変更" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 msgid "Nothing selected!" msgstr "何も選択されていません！" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 +msgid "Selection unsuitable!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +msgid "Apply Preset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 msgid "Change Properties" msgstr "プロパティを変更する" @@ -802,14 +797,14 @@ msgstr "プリセットグループ \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:107 msgid "File" msgstr "ファイル" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:135 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:107 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:86 @@ -821,22 +816,22 @@ msgstr "編集" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 msgid "View" msgstr "表示" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:26 msgid "Tools" msgstr "ツール" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:141 msgid "Audio" msgstr "音声" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:142 msgid "Presets" msgstr "プリセット" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:40 @@ -848,18 +843,18 @@ msgstr "メニュー: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:210 msgid "Wireframe View" msgstr "ワイヤー・フレーム表示" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212 msgid "Toggle Wireframe view" msgstr "ワイヤー・フレーム表示切り替え" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:28 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 msgid "Contacting the OSM server..." msgstr "OSMサーバに接続…" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 #, java-format msgid "This will change up to {0} object." @@ -867,11 +862,11 @@ msgstr[0] "これは、最大{0}このオブジェクトが変更されます。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 msgid "An empty value deletes the key." msgstr "空の値でキーを削除。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66 @@ -881,7 +876,7 @@ msgstr "キー" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 @@ -890,45 +885,44 @@ msgstr "値" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333 msgid "Change values?" msgstr "値を変更しますか?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:257 #, java-format msgid "Change properties of up to {0} object" msgid_plural "Change properties of up to {0} objects" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +msgstr[0] "{0}このオブジェクトのプロパティーの変更" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 msgid "Please select a key" msgstr "キーを選択してください" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321 msgid "Please select a value" msgstr "値を選択してください" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:445 msgid "Please select the objects you want to change properties for." msgstr "プロパティを変えたいオブジェクトを選択してください。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 msgid "Properties/Memberships" msgstr "プロパティ/メンバー" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 msgid "Properties for selected objects." msgstr "選択されたオブジェクトのプロパティ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97 @@ -940,58 +934,58 @@ msgstr "トグル: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 msgid "Member Of" msgstr "メンバー" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Role" msgstr "役割" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:559 msgid "Change relation" msgstr "関連の変更" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560 #, java-format msgid "Really delete selection from relation {0}?" msgstr "本当に関連{0}から選択分を削除しますか？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 msgid "Delete from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 +msgstr "関連から削除" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:600 msgid "Add Properties" msgstr "プロパティの追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 msgid "Add a new key/value pair to all objects" msgstr "すべてのオブジェクトに新しいキー/値をペアで追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 msgid "Edit Properties" msgstr "プロパティの編集" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609 msgid "Edit the value of the selected key for all objects" msgstr "すべてのオブジェクトの選択したキーの値の編集" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 msgid "Delete Properties" msgstr "プロパティの削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:77 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:293 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 @@ -1000,98 +994,115 @@ msgstr "削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 msgid "Delete the selected key in all objects" msgstr "すべてのオブジェクトの選択したキーの削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:763 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "プロパティ: {0} / メンバー: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:769 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 msgid "Properties / Memberships" msgstr "プロパティ/メンバー" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178 +msgid "Apply Changes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 msgid "Create new relation" msgstr "新規関連作成" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208 msgid "Edit new relation" msgstr "新規関連編集" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209 #, java-format msgid "Edit relation #{0}" msgstr "関連 #{0}の編集" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230 +msgid "Basic" +msgstr "基本" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Occupied By" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:325 +msgstr "次によって占められる;" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311 msgid "Tags (empty value deletes tag)" msgstr "タグ（空の値でタグ自身を削除）" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313 msgid "Members" msgstr "メンバー" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 +msgid "Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 msgid "Move the currently selected members up" msgstr "現在選択したメンバーを一つ上に移動します" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358 +msgid "Add Selected" +msgstr "選択したものを追加" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359 +msgid "Add all currently selected objects as members" +msgstr "現在選択されている全てのオブジェクトをメンバーとして追加" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365 +msgid "Remove Selected" +msgstr "選択の削除" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366 +msgid "Remove all currently selected objects from relation" +msgstr "現在選択されている全てのオブジェクトを関連から削除" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 +msgid "Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 msgid "Move the currently selected members down" msgstr "選択したメンバーを一つ下に移動します" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356 -msgid "Add Selected" -msgstr "選択したものを追加" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:357 -msgid "Add all currently selected objects as members" -msgstr "現在選択されている全てのオブジェクトをメンバーとして追加" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:363 -msgid "Remove Selected" -msgstr "選択の削除" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:364 -msgid "Remove all currently selected objects from relation" -msgstr "現在選択されている全てのオブジェクトを関連から削除" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381 msgid "Remove the member in the current table row from this relation" msgstr "この関連から現在の行のメンバーを削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394 msgid "Download Members" msgstr "メンバーのダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:406 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395 msgid "Download all incomplete ways and nodes in relation" msgstr "この関連の全ての未完成のウェイとノードをダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:415 -msgid "Basic" -msgstr "基本" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:453 #, java-format msgid "Members: {0}" msgstr "メンバー: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:587 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:461 +#, java-format +msgid "Relation Editor: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:585 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 msgid "There were conflicts during import." -msgstr "インポート中に矛盾が発生しました。" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:595 +msgstr "インポート中に競合を発見しました。" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593 msgid "Error parsing server response." msgstr "サーバからの応答内容が不正です。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:600 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:594 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:598 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -1105,9 +1116,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:345 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 msgid "Error" msgstr "エラー" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:599 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597 msgid "Cannot connect to server." msgstr "サーバに接続できません。" @@ -1154,7 +1165,5 @@ "Revert the state of all currently selected objects to the version selected " "in the history list." -msgstr "" -"現在選択している全てのオブジェクトの状態を、ヒストリーの選択したバージョンへ" -"と戻します。" +msgstr "現在選択している全てのオブジェクトの状態を、ヒストリーの選択したバージョンへと戻します。" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:137 @@ -1193,7 +1202,5 @@ msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "" -"このパネルを閉じます。左側のツールバーのボタンを使うことで再度開くことができ" -"ます。" +msgstr "このパネルを閉じます。左側のツールバーのボタンを使うことで再度開くことができます。" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220 @@ -1211,5 +1218,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 msgid "Delete Layer" -msgstr "" +msgstr "レイヤー削除" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 @@ -1270,5 +1277,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:94 @@ -1278,5 +1285,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 msgid "" @@ -1339,16 +1346,24 @@ msgstr "選択: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +msgid "Open an editor for the selected relation" +msgstr "選択したリレーションの編集画面を開く" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +msgid "Delete the selected relation" +msgstr "選択したリレーションを削除" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 #: trans_presets.java:2904 msgid "Relations" msgstr "リレーション" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 msgid "Open a list of all relations." msgstr "全てのリレーションのリストを開く" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 @@ -1356,17 +1371,9 @@ msgstr "新規" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 msgid "Create a new relation" msgstr "新規リレーション作成" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open an editor for the selected relation" -msgstr "選択したリレーションの編集画面を開く" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -msgid "Delete the selected relation" -msgstr "選択したリレーションを削除" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:130 #, java-format msgid "Relations: {0}" @@ -1394,47 +1401,47 @@ msgstr "指示の集積: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 -msgid "Conflict" -msgstr "矛盾" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 -msgid "Merging conflicts." -msgstr "矛盾点の同化、吸収" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 msgid "Resolve" msgstr "解決" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:68 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Open a merge dialog of all selected items in the list above." msgstr "上記リストの全てのアイテムを結合するダイアログを開く" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:105 -msgid "Please select something from the conflict list." -msgstr "矛盾リストからなにか選択してください。" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +msgid "Conflict" +msgstr "競合" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +msgid "Merging conflicts." +msgstr "競合点の統合" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Resolve Conflicts" -msgstr "矛盾の解決" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134 +msgstr "競合の解決" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +msgid "Solve Conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 #, java-format msgid "Conflicts: {0}" -msgstr "矛盾: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136 +msgstr "競合: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Conflicts" -msgstr "矛盾" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:147 +msgstr "競合" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 msgid "conflict" -msgstr "矛盾しています" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +msgstr "競合" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 msgid "background" msgstr "背景" @@ -1456,5 +1463,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 msgid "Customize Color" @@ -1462,5 +1469,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1470,5 +1477,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1477,5 +1484,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:326 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:152 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -1490,8 +1497,8 @@ msgid "" "You need to pause audio at the moment when you hear your synchronization cue." -msgstr "" +msgstr "あなたの同期用キューと同期させる瞬間に、オーディオを一時停止する必要があります。" #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:265 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 #, java-format msgid "Audio synchronized at point {0}." @@ -1499,7 +1506,7 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232 msgid "Unable to synchronize in layer being played." -msgstr "" +msgstr "再生されているレイヤーと同期させることができません。" #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 @@ -1511,12 +1518,12 @@ "You need to have paused audio at the point on the track where you want the " "marker." -msgstr "" +msgstr "マークしたいトラックポイントでオーディオを一時停止する必要があります。" #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 msgid "No existing audio markers in this layer to offset from." -msgstr "" +msgstr "このレイヤには、開始オフセットを指すオーディオマーカーがありません。" #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:958 msgid "desc" msgstr "説明" @@ -1528,5 +1535,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 msgid "There was an error while trying to display the URL for this marker" -msgstr "" +msgstr "このマーカーのURLを表示するときにエラーが発生しました。" #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 @@ -1538,93 +1545,53 @@ msgstr "URL を表示する際にエラー" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166 msgid "" "You need to drag the play head near to the GPX track whose associated sound " "track you were playing." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 +msgstr "再生しているサウンドトラックに関連付いているGPXトラックの近くに再生の最初をドラッグする必要があります。" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " "point where you want to synchronize." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +msgstr "SHIFT+ドラッグで、再生開始点を合わせたいオーディオマーカの上か、トラックポイントの上に持ってくる必要があります。" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224 msgid "Unable to create new audio marker." msgstr "新しいオーディオマーカーを生成できません" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 msgid "Convert to data layer" msgstr "データレイヤーへ変換" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:725 -msgid "" -"Upload of unprocessed GPS data as map data is considered harmful." -"
            If you want to upload traces, look here:" -msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:645 +msgid "" +"Upload of unprocessed GPS data as map data is considered " +"harmful.
            If you want to upload traces, look here:" +msgstr "" +"マップデータとして加工されていないGPSデータをアップロードすることは、有害だと考えられています。
            もしトレースをアップロードしたいなら" +"ば、ここを見てください：" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:646 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:747 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:448 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:667 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "Converted from: {0}" msgstr "{0}からのコンバート" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612 -msgid "Upload this trace..." -msgstr "このトレースのアップロード…" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:616 -msgid "" -"This functionality has been added only recently. Please
            use with " -"care and check if it works as expected." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:102 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:107 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:626 -msgid "Upload track filtered by JOSM" -msgstr "JOSMによってフィルターされたトラックをアップロード" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:103 -#, java-format -msgid "Upload raw file: {0}" -msgstr "生ファイル {0}のアップロード" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:108 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:627 -msgid "Upload raw file: " -msgstr "生ファイルのアップロード: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640 -msgid "Description:" -msgstr "記述:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:123 -msgid "Tags:" -msgstr "タグ:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:129 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:648 -msgid "GPX-Upload" -msgstr "GPX-アップロード" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:229 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:217 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113 msgid "gps point" msgstr "GPSポイント" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 #: trans_presets.java:1795 trans_presets.java:1801 trans_presets.java:1807 #: trans_presets.java:1813 trans_presets.java:1819 trans_presets.java:1825 @@ -1643,10 +1610,10 @@ msgstr[0] "トラック" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 msgid "point" msgid_plural "points" msgstr[0] "ポイント" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 #, java-format msgid "a track with {0} point" @@ -1654,5 +1621,5 @@ msgstr[0] "{0}ポイントをもつトラック" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} consists of {1} track" @@ -1660,5 +1627,5 @@ msgstr[0] "{1}トラックを含む {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} point" @@ -1666,25 +1633,25 @@ msgstr[0] "{0} ポイント" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117 msgid "Customize line drawing" msgstr "線描画のカスタマイズ" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:296 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 msgid "Use global settings." msgstr "全体設定を使用" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 msgid "Draw lines between points for this layer." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:298 +msgstr "このレイヤーの点の間に線を引く。" + +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123 msgid "Do not draw lines between points for this layer." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:310 +msgstr "このレイヤーの点の間に線を引かない。" + +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:135 msgid "Select line drawing options" @@ -1718,5 +1685,5 @@ msgstr "JPEGイメージ(*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290 #, java-format msgid "{0} track, " @@ -1724,5 +1691,5 @@ msgstr[0] "{0} トラック " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 #, java-format msgid "{0} route, " @@ -1730,5 +1697,5 @@ msgstr[0] "{0}ルート, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 #, java-format msgid "{0} waypoint" @@ -1736,77 +1703,73 @@ msgstr[0] "{0} ウェイポイント" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #, java-format msgid "Name: {0}" msgstr "名前: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "Description: {0}" msgstr "記述: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 msgid "Timespan: " msgstr "Timespan: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Length: " msgstr "長さ: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:642 -msgid "Tags (keywords in GPX):" -msgstr "タグ（GPX中のキーワード）:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:655 msgid "time" msgstr "時刻" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:780 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:679 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:700 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 msgid "Download from OSM along this track" msgstr "このトラックに沿ってOSMからダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:686 msgid "Download everything within:" msgstr "次に含まれる全てをダウンロード:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 #, java-format msgid "{0} meters" msgstr "{0} メータ" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:692 msgid "Maximum area per request:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775 +msgstr "リクエストあたりの最大エリア数：" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 #, java-format msgid "{0} sq km" msgstr "{0} 平方キロメートル" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787 #, java-format msgid "" "This action will require {0} individual
            download requests. Do you " "wish
            to continue?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 +msgstr "この操作には、{0}この独立したダウンロード要求を
            必要とします。続けますか？" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:844 #, java-format msgid "Audio markers from {0}" msgstr "{0} からの音声マーカー" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 msgid "No GPX track available in layer to associate audio with." msgstr "音声に関連づいたGPXトラックがこのレイヤーにありません。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "" "Some waypoints with timestamps from before the start of the track were " "omitted." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1053 +msgstr "記録開始時点より過去の時刻を持つウェイポイントは無視します。" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -1890,5 +1853,5 @@ #, java-format msgid "There is no EXIF time within the file \"{0}\"." -msgstr "" +msgstr "ファイル\"{0}\"にEXIFの時刻情報がありません。" #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:490 @@ -1913,19 +1876,19 @@ msgstr "入力した時刻は、解釈できません" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:140 msgid "outside downloaded area" msgstr "ダウンロード領域の外" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 #, java-format msgid "{0} consists of:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:353 +msgstr "{0}は次からなります:" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:347 #, java-format msgid " ({0} deleted.)" msgstr " ({0}は削除されました)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:445 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 msgid "Convert to GPX layer" msgstr "GPXレイヤーの変換" @@ -1953,37 +1916,37 @@ msgstr "ブックマークを書き込みできません。" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 msgid "The geographic longitude at the mouse pointer." msgstr "マウスポインターで示される地理経度" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The name of the object at the mouse pointer." msgstr "マウスポインターで示されるオブジェクトの名前" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 msgid "The geographic latitude at the mouse pointer." msgstr "マウスポインターで示される地理緯度" +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +msgid "The angle between the previous and the current way segment." +msgstr "これより前のウェイセグメントとこのウェイセグメントの間の角度。" + #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 -msgid "The angle between the previous and the current way segment." -msgstr "" +msgid "The (compass) heading of the line segment being drawn." +msgstr "描かれている線分の(コンパスの)向き" #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 -msgid "The (compass) heading of the line segment being drawn." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:161 +msgstr "描きたい新規ウェイセグメントの長さ" + +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:160 msgid "(no object)" msgstr "(オブジェクトなし)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:62 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:56 msgid "Color" msgstr "色" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:57 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107 #: trans_presets.java:56 trans_presets.java:92 trans_presets.java:130 @@ -2084,27 +2047,36 @@ msgstr "名前" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:118 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:112 #, java-format msgid "Paint style {0}: {1}" msgstr "塗りつぶしスタイル{0}:{1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 msgid "Choose" msgstr "選択" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 msgid "Please select a color." msgstr "色を選択してください" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 #, java-format msgid "Choose a color for {0}" msgstr "{0}の色を選択" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +msgid "Set to default" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:172 +msgid "Set all to default" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:184 msgid "Colors used by different objects in JOSM." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:171 +msgstr "JOSMの異なるオブジェクトが使う配色" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:198 msgid "Colors" msgstr "色" @@ -2137,26 +2109,25 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45 msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
            The password is transfered in plain text to the server, encoded in the " -"URL.
            Do not use a valuable Password." -msgstr "" -"警告：パスワードは平文で設定ファイルに格納されます。
            パスワードは、" -"URLに付加されて平文でサーバに送信されます。
            他で使用しているパスワード" -"は使用しないでください。" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:45 +"WARNING: The password is stored in plain text in the preferences " +"file.
            The password is transfered in plain text to the server, encoded in " +"the URL.
            Do not use a valuable Password." +msgstr "" +"警告：パスワードは平文で設定ファイルに格納されます。
            パスワードは、URLに付加されて平文でサーバに送信されます。
            他で使用" +"しているパスワードは使用しないでください。" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44 msgid "Sort presets menu" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47 +msgstr "プリセットメニューの並び替え" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46 msgid "Enable built-in defaults" msgstr "ビルトインのデフォルトを有効" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:58 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69 msgid "Tagging preset source" msgstr "事前に設定した情報源をタグ付け" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:156 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 @@ -2164,5 +2135,5 @@ msgstr "編集する列を選択してください。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500 @@ -2171,24 +2142,27 @@ msgstr "削除する列を選択してください。" +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88 +msgid "" +"The sources (URL or filename) of tagging preset definition files. See " +"http://josm.openstreetmap.de/wiki/TaggingPresets for help." +msgstr "" +"タグ付けのソース(URL " +"やファイル名)が、定義ファイルに設定してあります。詳しくは、http://josm.openstreetmap.de/wiki/TaggingPreset" +"s を見てください。" + #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89 -msgid "" -"The sources (URL or filename) of tagging preset definition files. See http://" -"josm.openstreetmap.de/wiki/TaggingPresets for help." +msgid "Add a new tagging preset source to the list." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 -msgid "Add a new tagging preset source to the list." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 msgid "Delete the selected source from the list." msgstr "リストから選択した情報源を削除" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:94 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93 msgid "Tagging Presets" msgstr "事前設定のタグ付け" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97 msgid "Tagging preset sources" msgstr "事前設定の情報源をタグ付け" @@ -2200,8 +2174,8 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26 msgid "When saving, keep backup files ending with a ~" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200 +msgstr "保存時に、バックアップファイルを、ファイル名の末尾に~をつけてとっておく。" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:141 @@ -2209,34 +2183,34 @@ msgstr "プラグイン" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 msgid "Configure available plugins." msgstr "利用可能なプラグインを設定" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43 msgid "Download List" msgstr "ダウンロードリスト" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:80 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51 msgid "Update" msgstr "アップデート" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:60 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 msgid "Configure Sites..." msgstr "サイトの設定..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add either site-josm.xml or Wiki Pages." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100 +msgstr "site-josm.xmlかWikiページを追加する。" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99 msgid "Please select an entry." msgstr "エントリーを選択してください。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 msgid "Configure Plugin Sites" msgstr "プラグインサイトを設定" @@ -2267,9 +2241,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35 msgid "Modeless working (Potlatch style)" -msgstr "" +msgstr "モードなし作業（Potlatchスタイル)" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85 msgid "Do not require to switch modes (potlatch style workflow)" -msgstr "" +msgstr "モード切替が不要（potlatchスタイルの作業方法)" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91 @@ -2336,5 +2310,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38 msgid "Start of track (will always do this if no other markers available)." -msgstr "" +msgstr "追跡開始（有効なマーカーがないときには常に行う）" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:55 @@ -2346,5 +2320,5 @@ "Display a moving icon representing the point on the synchronized track where " "the audio currently playing was recorded." -msgstr "" +msgstr "現在再生されているオーディオが記録された場所と同期して、その点を示すアイコンを動かして表示する。" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:77 @@ -2352,5 +2326,5 @@ "Put text labels against audio (and image and web) markers as well as their " "button icons." -msgstr "" +msgstr "ボタンアイコンと同様、オーディオ（と画像やWeb）のマーカーに対してテキストのラベルを付与する。" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88 @@ -2367,5 +2341,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:112 msgid "When importing audio, apply it to any waypoints in the GPX layer." -msgstr "" +msgstr "オーディオのインポート時に、GPXレイヤーのウェイポイントに対して、適用する。" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:123 @@ -2412,9 +2386,9 @@ msgstr "ボイスレコーダの調整" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "Display Settings" msgstr "表示設定" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "" "Various settings that influence the visual representation of the whole " @@ -2422,55 +2396,63 @@ msgstr "プログラム全体の見た目に影響する各種設定" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings" msgstr "接続設定" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings for the OSM server." msgstr "OSMサーバへの接続設定" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Map Settings" msgstr "マップ設定" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Settings for the map projection and data interpretation." msgstr "地図投影法とデータ解釈の設定" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Audio Settings" msgstr "オーディオ設定" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Settings for the audio player and audio markers." msgstr "オーディオプレイヤーと音声マークの設定" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97 msgid "You have to restart JOSM for some settings to take effect." msgstr "設定を有効にするにはJOSMを再起動する必要があります。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:25 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 msgid "Draw lines between raw gps points." msgstr "元gpsポイント間に線を描画" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:27 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 msgid "Force lines if no segments imported." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:28 +msgstr "セグメントがインポートされなかったら、強制的に線を描画する。" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 msgid "Draw large GPS points." msgstr "大きなGPS点を表示" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 -msgid "Color tracks by velocity." -msgstr "速度でトラックの色分け" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34 +msgid "Velocity (red = slow, green = fast)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 +msgid "Dilution of Position (red = high, green = low, if available)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 +msgid "Single Color (can be customized for named layers)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:1346 msgid "Car" msgstr "自動車" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:309 trans_presets.java:635 trans_presets.java:833 #: trans_presets.java:842 trans_presets.java:851 trans_presets.java:864 @@ -2482,5 +2464,5 @@ msgstr "自転車" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:310 trans_presets.java:637 trans_presets.java:832 #: trans_presets.java:841 trans_presets.java:850 trans_presets.java:863 @@ -2491,72 +2473,73 @@ msgstr "徒歩" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 msgid "Draw Direction Arrows" msgstr "進行方向を矢印表示" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 msgid "Fast drawing (looks uglier)" msgstr "高速表示（若干汚い）" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180 msgid "Only interesting direction hints (e.g. with oneway tag)." msgstr "必要なときだけ方向ヒントを表示(例：一方通行の時）" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:186 msgid "Only on the head of a way." msgstr "ウェイの開始のみ" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44 msgid "Draw segment order numbers" msgstr "セグメントの順序番号を描画" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45 msgid "Draw boundaries of downloaded data" msgstr "ダウンロードデータの境界を描画" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46 msgid "Draw virtual nodes in select mode" msgstr "選択モードで仮想ノードを描画" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47 msgid "Draw inactive layers in other color" msgstr "不活性のレイヤーを他色で描画" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 msgid "Smooth map graphics (antialiasing)" msgstr "地図画像をスムース処理（アンチアライアス）" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 msgid "" "If your gps device draws too few lines, select this to draw lines along your " "way." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 +msgstr "これを選択すると、gpsデバイスが線を引かない場合、ウェイに沿って線を描画する。" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:71 msgid "" "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines." msgstr "線を描く最大長(m)。'-1'にすると全ての線を描く。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73 msgid "Maximum length (meters)" msgstr "最大長（ｍ）" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:77 msgid "" "Force drawing of lines if the imported data contain no line information." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:84 +msgstr "インポートしたデータが線の情報を有していないときに、強制的に線を引く。" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89 msgid "Draw direction arrows for lines, connecting GPS points." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90 -msgid "Draw the direction arrows using table lookups instead of complex math." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:96 +msgstr "GPSの点をつないで、方向の矢印付きの線を引く。" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95 +msgid "" +"Draw the direction arrows using table lookups instead of complex math." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:101 msgid "" "Don't draw arrows if they are not at least this distance away from the last " @@ -2564,49 +2547,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104 msgid "Minimum distance (pixels)" msgstr "最小距離（ピクセル）" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:109 -msgid "Choose the hue for the track color by the velocity at that point." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116 -msgid "Allows to tune the track coloring for different average speeds." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122 msgid "Draw larger dots for the GPS points." msgstr "GPSポイントに大きなドットを表示する" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136 +msgid "" +"All points and track segments will have the same color. Can be customized in " +"Layer Manager." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137 +msgid "Colors points and track segments by velocity." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:138 +msgid "" +"Colors points and track segments by dilution of position (HDOP). Your " +"capture device needs to logs that information." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143 +msgid "Allows to tune the track coloring for different average speeds." +msgstr "平均速度の違いによって、配色の仕方を調整するようにする。" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148 +msgid "Track and Point Coloring" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 msgid "GPS Points" msgstr "GPSポイント" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175 msgid "Draw direction hints for way segments." msgstr "ウェイのセグメントに方向のヒントを描く。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:163 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192 msgid "Draw the order numbers of all segments within their way." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:168 -msgid "Apply antialiasing to the map view resulting in a smoother appearance." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:197 +msgid "" +"Apply antialiasing to the map view resulting in a smoother appearance." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202 msgid "Draw the boundaries of data loaded from the server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:178 +msgstr "サーバから読み出したデータの境界を描く。" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:207 msgid "Draw virtual nodes in select mode for easy way modification." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183 +msgstr "ウェイの変更が容易になるように、選択モードで仮想ノードを描く。" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212 msgid "Draw the inactive data layers in a different color." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190 +msgstr "異なった色で、不活性になっているデータレイヤーを描く。" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219 msgid "OSM Data" msgstr "OSMデータ" @@ -2701,5 +2701,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:164 msgid "

            Keyboard Shortcuts

            " -msgstr "" +msgstr "

            キーボードショートカット

            " #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:165 @@ -2714,6 +2714,6 @@ "a menu entry of button for the first time. So some of your changes may " "become active even without restart --- but also without collistion handling. " -"This is another reason to restart JOSM after making any changes here." -"

            " +"This is another reason to restart JOSM after making any changes " +"here.

            " msgstr "" @@ -2726,8 +2726,9 @@ "key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also " "there will be 'keys' listed that correspond to a shortcut on your keyboard " -"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/" -"Semicolon on US keyboards, '.'/Period on German keyboards, ...) instead. Not " -"doing so may result in conflicts, as there is no way for JOSM to know that " -"Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...

            " +"(e.g. ':'/Colon). Please also do not use them, use the base key " +"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) " +"instead. Not doing so may result in conflicts, as there is no way for JOSM " +"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US " +"keyboard...

            " msgstr "" @@ -2751,6 +2752,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183 msgid "" -"

            The pseudo-modifier 'disabled' will disable the shortcut when encountered." -"

            " +"

            The pseudo-modifier 'disabled' will disable the shortcut when " +"encountered.

            " msgstr "" @@ -2820,67 +2821,67 @@ msgstr "修飾グループ" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:231 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:236 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:250 msgid "layer not in list." msgstr "レイヤーがリストにありません。" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "usage" msgstr "使用法" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 msgid "options" msgstr "オプション" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 msgid "Show this help" msgstr "このヘルプの表示" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Standard unix geometry argument" msgstr "標準のunix配置引数" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 msgid "Download the bounding box" msgstr "bounding boxをダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 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:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Open file (as raw gps, if .gpx)" msgstr "ファイルを開く（.gpxの場合生のGPSとして)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 msgid "Download the bounding box as raw gps" msgstr "bounding boxを生GPSとしてダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Select with the given search" msgstr "検索から選択" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 msgid "Don't launch in fullscreen mode" msgstr "フルスクリーン・モードで起動しない" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 msgid "Reset the preferences to default" msgstr "設定を既定に戻します。" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 msgid "Set the language." msgstr "言語の変更" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 msgid "examples" msgstr "例" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -2888,21 +2889,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 msgid "Instead of --download= you may specify osm://\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 msgid "Activating updated plugins" msgstr "アップデートしたプラグインの活性化" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 msgid "Loading early plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Setting defaults" msgstr "デフォルト設定" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171 msgid "Loading plugins" msgstr "プラグインのロード" @@ -2912,6 +2913,5 @@ msgid "{0} object has conflicts:" msgid_plural "{0} objects have conflicts:" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{0} 個のオブジェクトが競合しています:" #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:227 @@ -2936,6 +2936,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:108 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:164 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:162 #: trans_presets.java:308 trans_presets.java:309 trans_presets.java:310 #: trans_presets.java:311 trans_presets.java:312 trans_presets.java:313 @@ -2952,63 +2952,56 @@ msgstr "不明な" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:66 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 #, java-format msgid "" "Warning - loading of {0} plugin was requested. This plugin is no longer " "required." -msgstr "" -"警告 - {0}プラグインのロードを要求されています。このプラグインはもう必須では" -"ありません。" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:87 +msgstr "警告 - {0}プラグインのロードを要求されています。このプラグインはもう必須ではありません。" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 #, java-format msgid "Plugin requires JOSM update: {0}." msgstr "プラグインはJPSMのアップデートを要求しています: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." -msgstr "" -"プラグイン {0} は、プラグイン {1} の動作に必要ですが、見つかりませんでした。" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +msgstr "プラグイン {0} は、プラグイン {1} の動作に必要ですが、見つかりませんでした。" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 #, java-format msgid "Plugin not found: {0}." msgstr "プラグインが見つかりません： {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Last plugin update more than {0} days ago." -msgstr "最後のプラグインが更新されてから {0} 日が経ちました。" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127 +msgstr "プラグインの更新が最後に行われてから{0}日以上経過しました。" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 msgid "" "(You can change the number of days after which this warning appears
            by " "setting the config option 'pluginmanager.warntime'.)" -msgstr "" -"(設定オプションの'pluginmanager.warntime'を編集することで、
            この警告が何日" -"たつと出るか、変更できます。)" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 +msgstr "(設定オプションの'pluginmanager.warntime'を編集することで、
            この警告が何日たつと出るか、変更できます。)" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 msgid "Disable plugin" msgstr "このプラグインを使用不可にする" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "プラグイン {0} を読み込めません。設定から削除しますか？" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " "overwrite the existing ones." -msgstr "" -"アップロードしたプラグインを有効にできませんでした。JOSMが既存のプラグインに" -"上書きできる権限があるかどうか、確認してください。" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 +msgstr "アップロードしたプラグインを有効にできませんでした。JOSMが既存のプラグインに上書きできる権限があるかどうか、確認してください。" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 #, java-format msgid "" @@ -3016,37 +3009,32 @@ msgstr "\"{0}\"プラグインで、予期せぬ例外が発生しました。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "このプラグインから得られる情報では、作者は {0} です。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:262 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 msgid "" "Try updating to the newest version of this plugin before reporting a bug." -msgstr "" -"バグレポートをする前に、最新バージョンのプラグインにアップデートしてくださ" -"い。" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +msgstr "バグレポートをする前に、最新バージョンのプラグインにアップデートしてください。" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 msgid "Should the plugin be disabled?" msgstr "このプラグインを使用不可にしますか?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:278 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " "unload the plugin." -msgstr "" -"プラグインは設定から削除されています。プラグインをアンロードするためにJOSMを" -"再起動してください。" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281 +msgstr "プラグインは設定から削除されています。プラグインをアンロードするためにJOSMを再起動してください。" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " "about the problem." -msgstr "" -"プラグインを削除できませんでした。JOSMを入手した方に問題を報告してください。" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:322 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183 +msgstr "プラグインを削除できませんでした。JOSMを入手した方に問題を報告してください。" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:181 msgid "no description available" msgstr "説明がありません" @@ -3058,5 +3046,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 msgid "Update Plugins" msgstr "プラグインのアップデート" @@ -3077,6 +3065,5 @@ msgid "{0} Plugin successfully updated. Please restart JOSM." msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -msgstr[0] "" -"プラグイン{0}のアップデートに成功しました。JOSMを再起動してください。" +msgstr[0] "プラグイン{0}のアップデートに成功しました。JOSMを再起動してください。" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:138 @@ -3091,5 +3078,5 @@ msgstr "プラグイン {0}が壊れているか、自動的にダウンロードできないようです。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 #, java-format msgid "Downloaded plugin information from {0} site" @@ -3097,13 +3084,13 @@ msgstr[0] "{0} このサイトからプラグイン情報をダウンロードしました。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 msgid "No plugin information found." msgstr "プラグイン情報が見つかりません。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:76 msgid "All installed plugins are up to date." msgstr "インストールされた全てのプラグインは最新です。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 #, java-format msgid "" @@ -3116,9 +3103,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:105 msgid "Download missing plugins" msgstr "不足するプラグインをダウンロードします。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:106 #, java-format msgid "" @@ -3131,22 +3118,22 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 msgid "Download Plugins" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:170 +msgstr "ダウンロードプラグイン" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:168 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Version {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:176 msgid "Plugin bundled with JOSM" msgstr "JOSMに付属のプラグイン" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208 msgid "Plugin already exists" msgstr "プラグインはすでに存在しています" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:211 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:209 #, java-format msgid "" @@ -3156,19 +3143,18 @@ "{0}" msgstr "" -"プラグインはすでに有効です。現在のプラグインを削除し、新しいバージョンをダウ" -"ンロードしますか？\n" +"プラグインはすでに有効です。現在のプラグインを削除し、新しいバージョンをダウンロードしますか？\n" "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 msgid "Delete and Download" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224 +msgstr "削除とダウンロード" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:222 #, java-format msgid "Error deleting plugin file: {0}" msgstr "Error deleting plugin file: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:281 #, java-format msgid "Error reading plugin information file: {0}" @@ -3234,10 +3220,10 @@ msgstr "削除 {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:165 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 msgid "Conflicting relation" -msgstr "矛盾した関連" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159 +msgstr "競合中のリレーション" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 #, java-format msgid "" @@ -3248,5 +3234,5 @@ "関連から削除しますか？" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:166 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 #, java-format msgid "" @@ -3254,4 +3240,6 @@ "Delete from relation?" msgstr "" +"選択\"{0}\" は、関連 \"{1}\" で使われています。\n" +"関連から削除しますか？" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:330 @@ -3261,16 +3249,15 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:349 msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
            This can cause problems because other objects (that you don't see) might " -"use them.
            Do you really want to delete?" -msgstr "" -"ダウンロードしたエリア外のノードを削除しようとしています。
            （あなたが見て" -"いない）ほかのオブジェクトが使っているかもしれないので、この操作は問題を引き" -"起こします。
            本当に削除しますか？" +"You are about to delete nodes outside of the area you have " +"downloaded.
            This can cause problems because other objects (that you don't " +"see) might use them.
            Do you really want to delete?" +msgstr "" +"ダウンロードしたエリア外のノードを削除しようとしています。
            （あなたが見ていない）ほかのオブジェクトが使っているかもしれないので、この操作は問題を引" +"き起こします。
            本当に削除しますか？" #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 #, java-format msgid "Resolve {0} conflicts in {1} objects" -msgstr "{1}このオブジェクト中の{0}この矛盾が解決されました。" +msgstr "{1}個のオブジェクト中の{0}個の競合を解決" #: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 @@ -3307,6 +3294,5 @@ #, java-format msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "" -"設定ファイルにエラーがあります。古いファイルのバックアップを{0}に作ります。" +msgstr "設定ファイルにエラーがあります。古いファイルのバックアップを{0}に作ります。" #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 @@ -3393,124 +3379,135 @@ msgstr "サーバから設定をロードできませんでした。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:232 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "領域を指定するウエイが閉じていません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:426 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:428 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "マルチポリゴンのウェイ \"{0}\"は閉じていません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:527 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:765 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:776 msgid "Empty member in relation." msgstr "リレーションに登録すべきものがありません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:767 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:531 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "メンバー \"{0}\"を関連から削除" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:547 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "ウエイ\"{0}\"は二つ未満のポイントです。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:552 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:549 msgid "More than one \"from\" way found." msgstr "二つ以上の\"from\"ウェイがあります。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:558 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555 msgid "More than one \"to\" way found." msgstr "二つ以上の\"to\"ウェイがあります。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:561 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 +msgid "More than one \"via\" found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 #, java-format msgid "Unknown role ''{0}''." msgstr "不明なロール\"{0}\"です。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 #, java-format msgid "Unknown member type for ''{0}''." msgstr "{0}のメンバーのタイプが不明" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 msgid "No \"from\" way found." msgstr "\"from\"ウェイが見つかりません" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 msgid "No \"to\" way found." msgstr "\"to\"ウェイが見つかりません" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -msgid "No \"via\" node found." -msgstr "\"via\"ノードが見つかりません" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +msgid "No \"via\" node or way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 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:619 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:636 -#, java-format -msgid "The \"{0}\" way must contain at least 2 nodes." -msgstr "\"{0}\"ウェイは少なくとも2ノードからなる必要があります。" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:731 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +msgid "The \"to\" way doesn't start or end at a \"via\" node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:620 +msgid "The \"from\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:624 +msgid "The \"to\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:742 #, java-format msgid "Style for restriction {0} not found." msgstr "制約条件{0}のスタイルがありません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "ウェイ\"{1}\"に有効なロール\"{0}\"がありません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "マルチポリゴンにウェイではない\"{0}\"があります。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:847 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:858 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:949 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "内部のウェイ ''{0}''が外側にあります。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:987 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:998 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1012 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1023 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1195 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1206 msgid "untagged" msgstr "タグ付いていない" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1196 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207 msgid "text" msgstr "テキスト" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" msgstr "停止中" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:94 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:181 @@ -3518,13 +3515,13 @@ msgstr "選択済の" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" msgstr "タグ付いていないウェイ" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 msgid "incomplete way" msgstr "不完全なウェイ" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 msgid "highlight" msgstr "" @@ -3546,5 +3543,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:113 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:89 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:77 msgid "incomplete" @@ -3573,14 +3570,14 @@ msgstr[0] "{0} メンバー" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 msgid "Duplicate" msgstr "複製" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 msgid "Duplicate selection by copy and immediate paste." msgstr "コピー後すぐに貼り付けで複製" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 @@ -3589,5 +3586,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -3658,6 +3655,8 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:57 -msgid "Please select at least one node, way or relation." +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:60 +msgid "" +"Please select at least one node, way or relation. Only already uploaded " +"elements have a history." msgstr "" @@ -3680,7 +3679,7 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/TerracerAction.java:47 @@ -3791,7 +3790,5 @@ "The selected ways have differing relation memberships. Do you still want to " "combine them?" -msgstr "" -"選択したウェイは、それぞれ異なった関連へ含まれています。それでも、結合します" -"か？" +msgstr "選択したウェイは、それぞれ異なった関連へ含まれています。それでも、結合しますか？" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 @@ -3816,13 +3813,13 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:123 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:314 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:315 msgid "Enter values for all conflicts." -msgstr "全ての矛盾に値を入力します。" +msgstr "すべての競合に値を入力してください。" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 msgid "Solve Conflicts" -msgstr "" +msgstr "競合を解決する" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231 @@ -3870,7 +3867,5 @@ "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " "tracks." -msgstr "" -"備考：GPLは、OSMライセンスと互換性がありません。GPLでライセンスされているト" -"ラックをアップロードしないでください。" +msgstr "備考：GPLは、OSMライセンスと互換性がありません。GPLでライセンスされているトラックをアップロードしないでください。" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 @@ -3954,5 +3949,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #, java-format @@ -3978,15 +3973,19 @@ msgstr[0] "選択したノードは、いずれかのウェイの中間ではありません。" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125 -msgid "" -"There is more than one way using the node(s) you selected. Please select the " +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 +msgid "" +"There is more than one way using the node you selected. Please select the " "way also." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133 +msgid_plural "" +"There is more than one way using the nodes you selected. Please select the " +"way also." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137 msgid "The selected nodes do not share the same way." msgstr "選択したノードは同じウエイで共有されていません。" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -3994,12 +3993,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229 msgid "You must select two or more nodes to split a circular way." -msgstr "" -"円形につながったのウエイの分割には、二つ以上のノードを選択する必要がありま" -"す。" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226 +msgstr "円形につながったのウエイの分割には、二つ以上のノードを選択する必要があります。" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -4007,5 +4004,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 msgid "" "A role based relation membership was copied to all new ways.\n" @@ -4013,5 +4010,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:296 #, java-format msgid "Split way {0} into {1} parts" @@ -4051,5 +4048,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81 msgid "No conflicts to zoom to" -msgstr "ズームする矛盾はありません" +msgstr "ズームの対象になる競合はありません" #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 @@ -4113,5 +4110,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 msgid "There are unresolved conflicts. You have to resolve these first." -msgstr "" +msgstr "未解決の競合があります。まずこれらの競合を解決してください。" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 @@ -4398,5 +4395,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 msgid "Align Nodes in Circle" msgstr "ノードを円形に配列" @@ -4410,5 +4407,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 msgid "Please select at least four nodes." msgstr "少なくとも４つのノードを選択してください。" @@ -4440,9 +4437,9 @@ "There are unresolved conflicts. Conflicts will not be saved and handled as " "if you rejected all. Continue?" -msgstr "" +msgstr "未解決の競合があります。競合箇所は保存されず、あなたがすべて否定した様に扱われます。続けますか？" #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "Reject Conflicts and Save" -msgstr "" +msgstr "競合を否定して保存する" #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 @@ -4473,4 +4470,32 @@ msgstr "バックアップファイルから復元するときに、エラーになりました。" +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "" +"Show status report with useful information that can be attached to bugs" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92 +msgid "Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +msgid "Copy to clipboard and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 +msgid "Close" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 @@ -4482,13 +4507,13 @@ msgstr "最後に戻した処理を再度行います。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:44 msgid "Delete Mode" msgstr "削除モード" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:46 msgid "Delete nodes or ways." msgstr "ノードまたはウェイを削除します" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:84 @@ -4499,5 +4524,5 @@ msgstr "モード: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:130 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -4507,6 +4532,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:87 msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." +"Drag play head and release near track to play audio from there; " +"SHIFT+release to synchronize audio at that point." msgstr "" @@ -4520,23 +4545,23 @@ msgstr "エリアの作成" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 msgid "Extrude Way" msgstr "ウエイの延長" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:252 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:416 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:430 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 msgid "Draw a rectangle of the desired size, then release the mouse button." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:420 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:434 msgid "Release the mouse button to stop rotating." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 msgid "Drag a way segment to make a rectangle." msgstr "ドラッグして、ウェイのセグメントで長方形を作成します。" @@ -4604,19 +4629,19 @@ msgstr "オブジェクトの選択、移動および回転" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:191 msgid "Add and move a virtual new node to way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:220 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:223 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 msgid "Cannot move objects outside of the world." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:418 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:432 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:422 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:436 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to remove); Shift-" @@ -4685,30 +4710,30 @@ msgstr "{0}ノードを結合する" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Orthogonalize Shape" msgstr "直交した形状" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "角度が９０度ないしは２７０度になるようにノードを移動します。" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 msgid "Only two nodes allowed" msgstr "二つだけのノード選択が許されています" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 msgid "Selection must consist only of ways." msgstr "ウェイだけを選択してください。" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 msgid "Please select one or more closed ways of at least four nodes." msgstr "少なくとも４ノードからなる閉じたウェイを、一つ以上選択してください。" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 msgid "Please select ways with almost right angles to orthogonalize." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 msgid "" "You are using the EPSG:4326 projection which might lead
            to " @@ -4716,13 +4741,12 @@ "projection to get rid of this warning.
            Do you want to continue?" msgstr "" -"EPSG:4326投影法を使用しています。この投影法では、
            長方形の配置を行っ" -"た場合に、意図しない結果になるおそれがあります。
            対応するには、投影法を変" -"更してください。
            それでも続けますか？" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 +"EPSG:4326投影法を使用しています。この投影法では、
            長方形の配置を行った場合に、意図しない結果になるおそれがあります。
            対" +"応するには、投影法を変更してください。
            それでも続けますか？" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "Only one node selected" msgstr "ただ一つだけのノードが選択されています。" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 msgid "Orthogonalize" msgstr "" @@ -4773,8 +4797,7 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101 -msgid "Please select exactly three nodes or one way with exactly three nodes." -msgstr "" -"３つだけノードを選択するか、３つだけのノードを持つ１つのウェイを選択してくだ" -"さい。" +msgid "" +"Please select exactly three nodes or one way with exactly three nodes." +msgstr "３つだけノードを選択するか、３つだけのノードを持つ１つのウェイを選択してください。" #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121 @@ -4782,52 +4805,69 @@ msgstr "円形内にそのノードはありません。" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../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:71 +msgid "Update Data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:72 +#, java-format +msgid "" +"This action will require {0} individual download requests. Do you wish to " +"continue?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 msgid "Open Location..." msgstr "場所を開く..." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 msgid "Open an URL." msgstr "URL を開く。" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 msgid "Separate Layer" msgstr "レイヤーに分ける" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 msgid "Enter URL to download:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 msgid "Download Location" msgstr "ダウンロード先" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 msgid "Download URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 msgid "Add Node..." msgstr "ノードを追加..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 msgid "Add a node by entering latitude and longitude." msgstr "緯度経度を指定して、ノードを追加" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 msgid "Enter the coordinates for the new node." msgstr "新しいノードの座標を入力してください" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 msgid "Use decimal degrees." msgstr "十進経緯度を使う。" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 msgid "Negative values denote Western/Southern hemisphere." msgstr "負の値は、西半球（西経）または南半球（南緯）を意味します。" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 #: ../plugins/livegps/livegps/LiveGpsDialog.java:54 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93 @@ -4836,5 +4876,5 @@ msgstr "緯度" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 #: ../plugins/livegps/livegps/LiveGpsDialog.java:56 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96 @@ -4877,14 +4917,14 @@ msgstr "オブジェクトの移動 {0}" +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "Overwrite" msgstr "上書きする" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "File exists. Overwrite?" msgstr "ファイルが存在します。上書きしますか？" @@ -4903,52 +4943,57 @@ msgstr "コピーするものを選択してください。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "ウェイを引き離す" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "複数のウェイに使われているノードを複製します。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 msgid "This node is not glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 msgid "None of these nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of this way's nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 msgid "The current selection cannot be used for unglueing." msgstr "現在の選択は引き離せません。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "Select either:" msgstr "ほかを選択：" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +msgid "* One tagged node, or" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "* One node that is used by more than one way, or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 -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:104 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +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:117 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:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 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:107 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -4957,16 +5002,18 @@ "own copy and all nodes will be selected." msgstr "" -"備考：ウェイが選択されていれば、グルーされていないノードのあたらしいコピーが" -"つくられます。\n" -"そして新しいノードが選択状態になります。そうでなければ、全てのウェイの自身" -"の\n" +"備考：ウェイが選択されていれば、グルーされていないノードのあたらしいコピーがつくられます。\n" +"そして新しいノードが選択状態になります。そうでなければ、全てのウェイの自身の\n" "コピーが作られ、全てのノードが選択状態になります。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:160 +msgid "Unglued Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:373 #, java-format msgid "Dupe into {0} nodes" msgstr "{0}ノードと見なす" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:320 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:397 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -5067,5 +5114,5 @@ msgstr "最後の操作を戻します" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 msgid "No Shortcut" msgstr "ショートカットなし" @@ -5087,13 +5134,13 @@ msgstr "OpenStreetMapデータ" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:29 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:28 msgid "Downloading GPS data" msgstr "GPSデータをダウンロード中" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:41 msgid "Downloaded GPX Data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:71 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:69 msgid "Raw GPS data" msgstr "生のGPSデータ" @@ -5170,7 +5217,5 @@ "When reversing this way, the following changes to properties of the way and " "its nodes are suggested in order to maintain data consistency." -msgstr "" -"このウェイを反転するならば、データの一貫性を保つため、ウェイとそのノードのプ" -"ロパティーに対する以下の変更が推奨されます。" +msgstr "このウェイを反転するならば、データの一貫性を保つため、ウェイとそのノードのプロパティーに対する以下の変更が推奨されます。" #: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 @@ -5316,5 +5361,6 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169 -msgid "Header contains several values and cannot be mapped to a single string" +msgid "" +"Header contains several values and cannot be mapped to a single string" msgstr "" @@ -5456,6 +5502,6 @@ "talking to the plugin." msgstr "" -"リモコンプラグインは、常にlocalhostの8111番ポートで待ち受けます。プラグインと" -"会話をするほかのアプリケーションが参照するので、ポート番号は変更できません。" +"リモコンプラグインは、常にlocalhostの8111番ポートで待ち受けます。プラグインと会話をするほかのアプリケーションが参照するので、ポート番号は変更" +"できません。" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 @@ -5664,5 +5710,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69 -msgid "Maximum number of segments allowed in each generated way. Default 250." +msgid "" +"Maximum number of segments allowed in each generated way. Default 250." msgstr "各生成されたウェイで許されるセグメントの最大数。既定値は250" @@ -5681,6 +5728,7 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72 msgid "" -"Accuracy of Douglas-Peucker line simplification, measured in degrees." -"
            Lower values give more nodes, and more accurate lines. Default 0.0003." +"Accuracy of Douglas-Peucker line simplification, measured in " +"degrees.
            Lower values give more nodes, and more accurate lines. Default " +"0.0003." msgstr "" @@ -6310,6 +6358,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:509 msgid "" -"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." -"org/index.php/User:JLS/speller) or tag checking data files." +"The sources (URL or filename) of spell check (see " +"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking " +"data files." msgstr "" @@ -6729,6 +6778,5 @@ #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." -msgstr "" -"グローバルサット・データロガー DG1000からGPXレイヤーにデータをインポート" +msgstr "グローバルサット・データロガー DG1000からGPXレイヤーにデータをインポート" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 @@ -6766,6 +6814,6 @@ msgstr "新規レイヤーを作成" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:40 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:43 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 #, java-format @@ -6773,19 +6821,30 @@ msgstr "ダウンロード {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:51 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:55 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 msgid "Contacting WMS Server..." msgstr "WMSサーバに接続中..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157 msgid "Create buildings" msgstr "ビルの作成" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 msgid "CadastreGrabber: Illegal url." msgstr "CadastreGrabber: 不正な url." + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +msgid "" +"To avoid cadastre WMS overload,\n" +"building import size is limited to 1 km2 max." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +msgid "Please, enable auto-sourcing and check cadastre millesime." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78 @@ -6807,17 +6866,26 @@ msgstr "Cadastre: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:128 +msgid "Cadastre" +msgstr "Cadastre" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:139 +msgid "Auto sourcing" +msgstr "自動ソーシング" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164 +msgid "Invalid projection" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 +#, java-format +msgid "Change the projection to {0} first." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:169 msgid "" "To enable the cadastre WMS plugin, change\n" "the JOSM projection to Lambert and restart" msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132 -msgid "Cadastre" -msgstr "Cadastre" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 -msgid "Auto sourcing" -msgstr "自動ソーシング" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20 @@ -6889,9 +6957,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:43 msgid "" -"More than one WMS layer present.\n" -"Select one of them first, then retry." -msgstr "" -"複数のWMSレイヤーがあります。\n" -"先にどれかを選択して、やり直してください。" +"More than one WMS layer present\n" +"Select one of them first, then retry" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:19 @@ -6899,5 +6965,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136 #, java-format @@ -6906,13 +6972,13 @@ msgstr[0] "ウェイの簡素化 ( {0} このノードを削除)" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61 msgid "Extract SVG ViewBox..." msgstr "SVG ViewBoxを取り出し..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65 msgid "Extract best fitting boundary..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:120 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126 msgid "Create boundary" msgstr "行政区画の作成" @@ -6948,15 +7014,15 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 msgid "Save WMS layer to file" msgstr "WMSレイヤーをファイルに保存" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "Load WMS layer from file" msgstr "WMSレイヤーをファイルから読み込む" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -6964,5 +7030,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 msgid "File Format Error" msgstr "ファイルフォーマットエラー" @@ -6970,5 +7036,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 msgid "Error loading file" msgstr "ファイルの読み込みエラー" @@ -6994,52 +7060,53 @@ msgstr "ランベルトゾーンキャッシュエラー" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 msgid "Replace original background by JOSM background color." msgstr "JOSM背景色で、オリジナルの背景を置き換える。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30 msgid "Reverse grey colors (for black backgrounds)." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 msgid "Set background transparent." msgstr "背景を透明に設定。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34 msgid "Draw boundaries of downloaded data." msgstr "ダウンロードデータの境界を描画" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Enable automatic caching." msgstr "自動キャッシュを有効にする" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 msgid "Max. cache size (in MB)" msgstr "最大キャッシュサイズをMB単位で指定します。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:53 -msgid "" -"A special handler of the french cadastre wms at www.cadastre.gouv." -"fr

            Please read the Terms and Conditions of Use here (in french): " -"
            http://www.cadastre.gouv.fr/scpc/html/" -"CU_01_ConditionsGenerales_fr.html
            before any upload of data created " -"by this plugin." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:58 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:55 +msgid "" +"A special handler of the french cadastre wms at " +"www.cadastre.gouv.fr

            Please read the Terms and Conditions of Use here " +"(in french):
            " +"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " +"
            before any upload of data created by this plugin." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 msgid "French cadastre WMS" msgstr "French cadastre WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65 msgid "Source" msgstr "情報ソース" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -7047,26 +7114,40 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 -msgid "" -"Invert the original texts from black to white (and all intermediate greys)." +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +msgid "" +"Invert the original black and white colors (and all intermediate greys). " +"Useful for texts on dark backgrounds." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 +msgid "Allows multiple layers stacking" msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 -msgid "Allows multiple layers stacking" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:99 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "WMSレイヤーを透明にします。右が不透明、左が透明です。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "WMSサーバからダウンロードしたデータの周囲に長方形を描画します。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:113 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 msgid "Image grab multiplier:" msgstr "イメージ取得倍率:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:162 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:125 +msgid "Grab smaller images (higher quality but use more memory)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +msgid "Fixed size square (default is 100m)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +msgid "Fixed size (from 25 to 1000 meters)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -7175,5 +7256,5 @@ msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:254 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:255 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -7318,11 +7399,10 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:203 msgid "" -"Take a photo of your GPS receiver while it displays the time." -"
            Display that photo here.
            And then, simply capture the time you read " -"on the photo and select a timezone
            " -msgstr "" -" 使用しているGPSレシーバーの、時刻を表示しているところの写真をとりま" -"す。
            その写真をここに表示してください。
            そして写真に表示されている時刻" -"を読み取って、タイムゾーンを選択します。
            " +"Take a photo of your GPS receiver while it displays the " +"time.
            Display that photo here.
            And then, simply capture the time you " +"read on the photo and select a timezone
            " +msgstr "" +" 使用しているGPSレシーバーの、時刻を表示しているところの写真をとります。
            その写真をここに表示してください。
            " +"そして写真に表示されている時刻を読み取って、タイムゾーンを選択します。
            " #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:221 @@ -7388,5 +7468,6 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:484 -msgid "I can take a picture of my GPS receiver.
            Can this help?" +msgid "" +"I can take a picture of my GPS receiver.
            Can this help?" msgstr "" @@ -7432,5 +7513,5 @@ msgstr "不正なタイムゾーン" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #, java-format msgid "" @@ -7439,14 +7520,14 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:579 msgid "Invalid offset" msgstr "不正なオフセット" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:641 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:643 #, java-format msgid "Found {0} matchs of {1} in GPX track {2}" msgstr "GPXトラック {2} に対して、{1}こ中、{0}この写真が関連づけられました。" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:642 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:644 msgid "GPX Track loaded" msgstr "GPXトラックが読み込まれました" @@ -7454,5 +7535,5 @@ #: ../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/UploadDataGui.java:79 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 msgid "Upload Traces" msgstr "トレースのアップロード" @@ -7462,58 +7543,72 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 -msgid "Upload GPX track" -msgstr "gpsトラックのアップロード" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71 +msgid "Upload Trace" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Public" msgstr "公開" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 msgid "Selected makes your trace public in openstreetmap.org" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Description" msgstr "説明" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:123 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 msgid "Tags" msgstr "タグ" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:182 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:153 +#, java-format +msgid "Selected track: {0}" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:176 msgid "Connecting..." msgstr "接続中..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 -msgid "Uploading GPX track..." -msgstr "gpsトラックのアップロード中..." - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:214 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:199 +msgid "Upload cancelled" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:209 +msgid "Error while uploading" +msgstr "アップロードする際にエラー" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "GPXアップロードが成功しました。" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:227 -msgid "Error while uploading" -msgstr "アップロードする際にエラー" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:235 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +msgid "Upload failed. Server returned the following message: " +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 +#, java-format +msgid "Uploading GPX track: {0}% ({1} of {2})" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "記述が与えられていません。なにか記入してください。" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:252 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "GPXレイヤーが選ばれていません。トレースのアップロードはできません。" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:241 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "ユーザ名が与えられていません。" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:244 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "パスワードが与えられていません。" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "GPXトラックのアップロード" @@ -7648,7 +7743,5 @@ "Firefox not found. Please set firefox executable in the Map Settings page of " "the preferences." -msgstr "" -"Firefoxが見つかりません。設定のマップ設定ページでfirefoxの実行ファイルの位置" -"を設定してください。" +msgstr "Firefoxが見つかりません。設定のマップ設定ページでfirefoxの実行ファイルの位置を設定してください。" #: ../plugins/osmarender/src/OsmarenderPlugin.java:121 @@ -7734,32 +7827,32 @@ msgstr "自動ダウンロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:232 msgid "Download visible tiles" msgstr "見えるタイルのダウンロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241 msgid "Change resolution" msgstr "解像度の変更" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:253 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:264 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:271 msgid "Alpha channel" msgstr "" @@ -8502,6 +8595,5 @@ "area, or use planet.osm" msgstr "" -"あまりにたくさんのノードを要求しました（制限は50,000です)。 より小さなエリア" -"で要求し直すか、planet.osmを使用してください。" +"あまりにたくさんのノードを要求しました（制限は50,000です)。 より小さなエリアで要求し直すか、planet.osmを使用してください。" #: specialmessages.java:7 @@ -10940,5 +11032,5 @@ #: trans_presets.java:1898 msgid "Sport (Ball)" -msgstr "ボールスポーツ" +msgstr "球技" #: trans_presets.java:1899 @@ -11489,5 +11581,5 @@ #: trans_presets.java:2206 msgid "Edit Survey Point" -msgstr "測点" +msgstr "測点の編集" #: trans_presets.java:2210 @@ -11673,9 +11765,9 @@ #: trans_presets.java:2304 msgid "Hunting Stand" -msgstr "射撃の標的" +msgstr "Hunting Stand" #: trans_presets.java:2305 msgid "Edit a Hunting Stand" -msgstr "射撃の標的の編集" +msgstr "Hunting Standの編集" #: trans_presets.java:2308 @@ -11721,9 +11813,9 @@ #: trans_presets.java:2326 msgid "Baby Hatch" -msgstr "孵卵場" +msgstr "赤ちゃんポスト" #: trans_presets.java:2328 msgid "Edit a Baby Hatch" -msgstr "孵卵場の編集" +msgstr "赤ちゃんポストの編集" #: trans_presets.java:2331 @@ -12113,9 +12205,9 @@ #: trans_presets.java:2545 msgid "Veterinary" -msgstr "獣医" +msgstr "動物病院" #: trans_presets.java:2548 msgid "Edit Veterinary" -msgstr "獣医の編集" +msgstr "動物病院の編集" #: trans_presets.java:2555 @@ -12377,5 +12469,5 @@ #: trans_presets.java:2751 msgid "Allotments" -msgstr "" +msgstr "貸し農園" #: trans_presets.java:2752 @@ -12401,9 +12493,11 @@ #: trans_presets.java:2768 msgid "Village Green" -msgstr "" +msgstr "里山" #: trans_presets.java:2770 msgid "Edit Village Green Landuse" msgstr "" +"Copy text \t\r\n" +"里山利用区画" #: trans_presets.java:2775 @@ -12425,9 +12519,9 @@ #: trans_presets.java:2786 msgid "Recreation Ground" -msgstr "" +msgstr "レクレーション広場" #: trans_presets.java:2788 msgid "Edit Recreation Ground Landuse" -msgstr "" +msgstr "レクレーション広場利用区画の編集" #: trans_presets.java:2794 @@ -12635,4 +12729,40 @@ msgstr "ウエイへ" +#~ msgid "Please select something from the conflict list." +#~ msgstr "競合リストからどれか選択してください。" + +#~ msgid "Upload this trace..." +#~ msgstr "このトレースのアップロード…" + +#~ msgid "" +#~ "This functionality has been added only recently. Please
            use with " +#~ "care and check if it works as expected." +#~ msgstr "この機能は最近追加されたばかりです。
            注意して利用し、期待したように動いているか確認してください" + +#~ msgid "Upload track filtered by JOSM" +#~ msgstr "JOSMによってフィルターされたトラックをアップロード" + +#~ msgid "Upload raw file: " +#~ msgstr "生ファイルのアップロード: " + +#~ msgid "Description:" +#~ msgstr "記述:" + +#~ msgid "Tags (keywords in GPX):" +#~ msgstr "タグ（GPX中のキーワード）:" + +#~ msgid "GPX-Upload" +#~ msgstr "GPX-アップロード" + +#, java-format +#~ msgid "Upload raw file: {0}" +#~ msgstr "生ファイル {0}のアップロード" + +#~ msgid "Tags:" +#~ msgstr "タグ:" + +#~ msgid "Choose the hue for the track color by the velocity at that point." +#~ msgstr "地点の速度によって、軌跡の色彩を変える配色を行う。" + #~ msgid "Highway Exit" #~ msgstr "道路の出口" @@ -12646,2 +12776,9 @@ #~ msgid "Exit Name" #~ msgstr "出口の名前" + +#, java-format +#~ msgid "The \"{0}\" way must contain at least 2 nodes." +#~ msgstr "\"{0}\"ウェイは少なくとも2ノードからなる必要があります。" + +#~ msgid "Upload GPX track" +#~ msgstr "gpsトラックのアップロード" Index: /applications/editors/josm/i18n/po/nl.po =================================================================== --- /applications/editors/josm/i18n/po/nl.po (revision 13832) +++ /applications/editors/josm/i18n/po/nl.po (revision 13833) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-15 22:03+0100\n" -"PO-Revision-Date: 2009-02-14 14:32+0000\n" +"POT-Creation-Date: 2009-02-21 16:35+0100\n" +"PO-Revision-Date: 2009-02-21 16:10+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Dutch \n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-02-15 20:40+0000\n" +"X-Launchpad-Export-Date: 2009-02-22 20:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 #, java-format msgid "" @@ -30,5 +30,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 msgid "" "This action will have no shortcut.\n" @@ -38,5 +38,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -47,5 +47,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Tip: je kunt sneltoetsen in Voorkeuren bewerken.)" @@ -56,17 +56,17 @@ #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 msgid "Information" msgstr "Informatie" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Do nothing" msgstr "Niets doen" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Report Bug" msgstr "Fout melden" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 msgid "" "An unexpected exception occurred.\n" @@ -80,19 +80,19 @@ "van JOSM gebruikt, wees dan vriendelijk en dien een foutenrapport in." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Unexpected Exception" msgstr "Onverwachte uitzondering" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 #, java-format msgid "Please report a ticket at {0}" msgstr "Maak een melding bij {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" "Beschrijf de gevolgde stappen die tot de fout leidde (zo precies mogelijk)!" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:78 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -102,9 +102,9 @@ "je de fout meldt." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Be sure to include the following information:" msgstr "Voeg zeker de volgende informatie toe:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75 msgid "(The text has already been copied to your clipboard.)" msgstr "(De tekst is reeds gekopieerd naar je klembord.)" @@ -118,5 +118,5 @@ msgstr "Fout tijdens afspelen van het geluid" -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:94 @@ -124,5 +124,5 @@ msgstr "Met OSM-server verbinden..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:48 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:32 @@ -130,10 +130,10 @@ msgstr "OSM-gegevens downloaden" -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 msgid "NullPointerException, possibly some missing tags." msgstr "NullPointer-uitzondering, mogelijk ontbreken er tags." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83 msgid "Preparing data..." msgstr "Gegevens voorbereiden..." @@ -162,48 +162,48 @@ msgstr "Downloaden van punten {0} tot {1}..." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:164 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:168 msgid "Unknown version" msgstr "Onbekende versie" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 msgid "Found element in non-way." msgstr "-element in niet-weg gevonden." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 msgid " has zero ref" msgstr " heeft geen referenties" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 msgid "Found element in non-relation." msgstr "-element in niet-relatie gevonden." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:252 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250 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:294 msgid "Illegal object with id=0" msgstr "Ongeldig object met id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Verplicht attribuut \"{0}\" ontbreekt." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 #, java-format msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" msgstr "Een weg overslaan omdat het een niet bestaande knoop bevat: {0}\n" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:502 msgid "Prepare OSM data..." msgstr "OSM-gegevens voorbereiden..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:518 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:516 msgid "Ill-formed node id" msgstr "Misvormde knoop-id" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:280 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:287 msgid "Parse error: invalid document structure for gpx document" msgstr "Ontleedfout: documentstructuur van GPX-bestand is ongeldig" @@ -213,18 +213,18 @@ msgstr "Met server verbinden..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Beschrijf kort de veranderingen die je upload:" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 msgid "Commit comment" msgstr "Opmerking bevestigen" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" msgstr "{0}% ({1}/{2}), {3} te gaan. Uploading {4}: {5} (id: {6})" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64 @@ -234,34 +234,32 @@ msgstr "Een fout is opgetreden: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:192 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190 msgid "Opening changeset..." msgstr "Changeset openen" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:226 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224 msgid "Server does not support changesets" msgstr "Server ondersteunt geen changesets" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:246 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:428 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:609 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:184 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607 msgid "Unknown host" msgstr "Onbekende host" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282 msgid "Preparing..." msgstr "Voorbereiden…" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:294 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292 msgid "Uploading..." msgstr "Uploaden..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375 msgid "Closing changeset..." msgstr "Changeset sluiten" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:652 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650 msgid "Transfer aborted due to error (will wait for 5 seconds):" msgstr "Verzending is afgebroken vanwege een fout (zal 5 seconden wachten):" @@ -299,17 +297,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95 #: ../core/src/org/openstreetmap/josm/Main.java:348 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:29 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 @@ -322,11 +323,11 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:110 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -341,11 +342,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:186 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 msgid "Creating main GUI" msgstr "Hoofd-GUI aanmaken" #: ../core/src/org/openstreetmap/josm/Main.java:195 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:271 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:278 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:56 msgid "Help" @@ -390,21 +391,21 @@ msgstr "Ongeldige bestands-URL negeren: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109 msgid "min lat" msgstr "min lat" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111 msgid "min lon" msgstr "min lon" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:117 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "max lat" msgstr "max lat" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 msgid "max lon" msgstr "max lon" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:122 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -414,5 +415,5 @@ "downloaden)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:134 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130 msgid "Bounding Box" msgstr "Omvattend gebied" @@ -448,6 +449,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:96 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:894 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:956 msgid "name" msgstr "naam" @@ -480,5 +481,5 @@ msgstr "zoom" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:107 msgid "" "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -488,5 +489,5 @@ "en muis bewegen. Selecteer" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:109 msgid "Slippy map" msgstr "Slippy-kaart" @@ -497,7 +498,7 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:605 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:602 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:89 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -517,5 +518,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380 msgid "Remove" msgstr "Verwijderen" @@ -560,5 +561,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:195 msgid "Download area too large; will probably be rejected by server" -msgstr "Gebied te groot om te downloaden; server zal waarschijnlijk weigeren." +msgstr "" +"Gebied te groot om te downloaden; server zal waarschijnlijk weigeren." #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:198 @@ -634,6 +636,6 @@ "filename" msgstr "" -"Alles downloaden. Mogelijkheden: x1,y1,x2,y2, een URL met " -"lat=y&lon=x&zoom=z of een bestandsnaam" +"Alles downloaden. Mogelijkheden: x1,y1,x2,y2, een URL met lat=y&lon=x&zoom=z " +" of een bestandsnaam" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 @@ -663,20 +665,20 @@ "plaats van gelezen." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:109 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:186 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:198 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:108 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:191 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:203 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 msgid "Java OpenStreetMap Editor" msgstr "Java OpenStreetMap Editor" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:111 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:110 msgid "Message of the day not available" msgstr "Melding van de dag niet beschikbaar" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:200 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:205 msgid "Downloading \"Message of the day\"" msgstr "\"Dagmelding\" downloaden" @@ -716,33 +718,33 @@ msgstr "Uitzoomen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:234 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:474 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:512 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:383 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:380 msgid "More information about this feature" msgstr "Meer informatie over deze functionaliteit" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:393 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:390 msgid "Optional Attributes:" msgstr "Optionele attributen:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:437 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Voorkeuze ''{0}'' van groep ''{1}'' gebruiken" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:438 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:435 #, java-format msgid "Use preset ''{0}''" msgstr "Voorkeuze ''{0}'' gebruiken" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 msgid "way" @@ -751,11 +753,11 @@ msgstr[1] "wegen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:214 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 msgid "node" msgid_plural "nodes" @@ -763,6 +765,6 @@ msgstr[1] "knopen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:81 @@ -772,14 +774,14 @@ msgstr[1] "relaties" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 msgid "closedway" msgstr "afgesloten weg" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:475 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 #, java-format msgid "Unknown type: {0}" msgstr "Onbekend type: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:549 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 #, java-format @@ -787,15 +789,15 @@ msgstr "Kan voorkeuzebron voor tagging niet lezen: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:555 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 #, java-format msgid "Error parsing {0}: " msgstr "Fout bij ontleden van {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:572 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:569 #, 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:607 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595 #, java-format msgid "Change {0} object" @@ -804,9 +806,17 @@ msgstr[1] "{0} objecten wijzigen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 msgid "Nothing selected!" msgstr "Niets geselecteerd!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 +msgid "Selection unsuitable!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +msgid "Apply Preset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 msgid "Change Properties" msgstr "Eigenschappen veranderen" @@ -817,14 +827,14 @@ msgstr "Voorkeuzegroep ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:107 msgid "File" msgstr "Bestand" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:135 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:107 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:86 @@ -836,22 +846,22 @@ msgstr "Bewerken" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 msgid "View" msgstr "Beeld" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:26 msgid "Tools" msgstr "Gereedschappen" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:141 msgid "Audio" msgstr "Geluid" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:142 msgid "Presets" msgstr "Voorkeuze" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:40 @@ -863,18 +873,18 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:210 msgid "Wireframe View" msgstr "Draadmodelweergave" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212 msgid "Toggle Wireframe view" msgstr "Draadmodelweergave in- of uitschakelen" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:28 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 msgid "Contacting the OSM server..." msgstr "Met OSM-server verbinden..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 #, java-format msgid "This will change up to {0} object." @@ -883,11 +893,11 @@ msgstr[1] "Dit verandert {0} objecten." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 msgid "An empty value deletes the key." msgstr "Een lege waarde verwijdert de sleutel." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66 @@ -897,7 +907,7 @@ msgstr "Sleutel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 @@ -906,10 +916,10 @@ msgstr "Waarde" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333 msgid "Change values?" msgstr "Waarden aanpassen?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:257 #, java-format msgid "Change properties of up to {0} object" @@ -918,33 +928,33 @@ msgstr[1] "Eigenschappen van {0} objecten aanpassen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 msgid "Please select a key" msgstr "Selecteer een sleutel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321 msgid "Please select a value" msgstr "Selecteer een waarde" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:445 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:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 msgid "Properties/Memberships" msgstr "Eigenschappen/Lidmaatschappen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 msgid "Properties for selected objects." msgstr "Eigenschappen voor geselecteerde objecten." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97 @@ -956,58 +966,58 @@ msgstr "Omschakelen: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 msgid "Member Of" msgstr "Lid van" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Role" msgstr "Rol" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:559 msgid "Change relation" msgstr "Relatie wijzigen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560 #, 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:564 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 msgid "Delete from relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:600 msgid "Add Properties" msgstr "Eigenschappen toevoegen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 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:609 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 msgid "Edit Properties" msgstr "Eigenschappen bewerken" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609 msgid "Edit the value of the selected key for all objects" msgstr "De geselecteerde sleutelwaarde voor alle objecten bewerken" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 msgid "Delete Properties" msgstr "Eigenschappen verwijderen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:77 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:293 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 @@ -1016,98 +1026,115 @@ msgstr "Verwijderen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 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:766 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:763 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Eigenschappen: {0} / Leden: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:769 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 msgid "Properties / Memberships" msgstr "Eigenschappen / Leden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178 +msgid "Apply Changes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 msgid "Create new relation" msgstr "Nieuwe relatie aanmaken" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208 msgid "Edit new relation" msgstr "Nieuw relatie bewerken" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209 #, java-format msgid "Edit relation #{0}" msgstr "Relatie #{0} bewerken" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230 +msgid "Basic" +msgstr "Basis" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Occupied By" msgstr "Bezet door" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311 msgid "Tags (empty value deletes tag)" msgstr "Tags (lege waarde verwijdert de tag)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313 msgid "Members" msgstr "Leden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 +msgid "Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 msgid "Move the currently selected members up" msgstr "De geselecteerde leden omhoog verplaatsen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358 +msgid "Add Selected" +msgstr "Selectie toevoegen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359 +msgid "Add all currently selected objects as members" +msgstr "Alle geselecteerde objecten als leden toevoegen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365 +msgid "Remove Selected" +msgstr "Geselecteerde verwijderen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366 +msgid "Remove all currently selected objects from relation" +msgstr "Alle nu geselecteerde objecten uit relatie verwijderen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 +msgid "Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 msgid "Move the currently selected members down" msgstr "De geselecteerde leden omlaag verplaatsen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356 -msgid "Add Selected" -msgstr "Selectie toevoegen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:357 -msgid "Add all currently selected objects as members" -msgstr "Alle geselecteerde objecten als leden toevoegen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:363 -msgid "Remove Selected" -msgstr "Geselecteerde verwijderen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:364 -msgid "Remove all currently selected objects from relation" -msgstr "Alle nu geselecteerde objecten uit relatie verwijderen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381 msgid "Remove the member in the current table row from this relation" msgstr "De leden in de huidige tabelrij uit deze relatie verwijderen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394 msgid "Download Members" msgstr "Leden downloaden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:406 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395 msgid "Download all incomplete ways and nodes in relation" msgstr "Alle incomplete wegen en daarbij behorende knopen downloaden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:415 -msgid "Basic" -msgstr "Basis" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:453 #, java-format msgid "Members: {0}" msgstr "Leden: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:587 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:461 +#, java-format +msgid "Relation Editor: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:585 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 msgid "There were conflicts during import." msgstr "Er zijn conflicten tijdens het importeren." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593 msgid "Error parsing server response." msgstr "Ontleden van de serverreactie is mislukt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:600 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:594 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:598 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -1121,9 +1148,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:345 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 msgid "Error" msgstr "Fout" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:599 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597 msgid "Cannot connect to server." msgstr "Kan niet met server verbinden." @@ -1187,5 +1214,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 msgid "Open a list of people working on the selected objects." -msgstr "Een lijst openen met mensen die aan de geselecteerde objecten werken." +msgstr "" +"Een lijst openen met mensen die aan de geselecteerde objecten werken." #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 @@ -1247,5 +1275,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 msgid "Toggle visible state of the marker text and icons." -msgstr "Zichtbaarheid van de markertekst en pictogrammen in- of uitschakelen." +msgstr "" +"Zichtbaarheid van de markertekst en pictogrammen in- of uitschakelen." #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 @@ -1286,5 +1315,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:94 @@ -1294,5 +1323,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 msgid "" @@ -1360,16 +1389,24 @@ msgstr "Selectie: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +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:67 +msgid "Delete the selected relation" +msgstr "De geselecteerde relatie verwijderen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 #: trans_presets.java:2904 msgid "Relations" msgstr "Relaties" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 msgid "Open a list of all relations." msgstr "Een lijst met alle relaties openen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 @@ -1377,17 +1414,9 @@ msgstr "Nieuw" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 msgid "Create a new relation" msgstr "Een nieuwe relatie aanmaken" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -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:90 -msgid "Delete the selected relation" -msgstr "De geselecteerde relatie verwijderen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:130 #, java-format msgid "Relations: {0}" @@ -1408,5 +1437,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 msgid "Open a list of all commands (undo buffer)." -msgstr "Een lijst met alle mogelijk opdrachten openen (buffer ongedaan maken)." +msgstr "" +"Een lijst met alle mogelijk opdrachten openen (buffer ongedaan maken)." #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63 @@ -1415,49 +1445,49 @@ msgstr "Opdrachtenlijst: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +msgid "Resolve" +msgstr "Oplossen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +msgid "Open a merge dialog of all selected items in the list above." +msgstr "" +"Een samenvoegingdialoog voor de geselecteerde elementen in bovenstaande " +"lijst openen." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Conflict" msgstr "Conflict" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 msgid "Merging conflicts." msgstr "Samenvoegconflicten." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67 -msgid "Resolve" -msgstr "Oplossen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:68 -msgid "Open a merge dialog of all selected items in the list above." -msgstr "" -"Een samenvoegingdialoog voor de geselecteerde elementen in bovenstaande " -"lijst openen." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:105 -msgid "Please select something from the conflict list." -msgstr "Een selectie uit de conflictenlijst maken." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Resolve Conflicts" msgstr "Conflicten oplossen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +msgid "Solve Conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 #, java-format msgid "Conflicts: {0}" msgstr "Conflicten: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Conflicts" msgstr "Conflicten" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 msgid "conflict" msgstr "conflict" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 msgid "background" msgstr "achtergrond" @@ -1481,5 +1511,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 msgid "Customize Color" @@ -1487,5 +1517,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1495,5 +1525,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1502,5 +1532,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:326 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:152 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -1518,5 +1548,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:265 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 #, java-format msgid "Audio synchronized at point {0}." @@ -1524,5 +1554,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232 msgid "Unable to synchronize in layer being played." msgstr "Kan in de afgespeelde laag niet synchroniseren." @@ -1545,5 +1575,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:958 msgid "desc" msgstr "beschr" @@ -1565,5 +1595,5 @@ msgstr "Fouten tijden tonen URL" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -1573,5 +1603,5 @@ "geluidsspoor afspeelde." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -1581,18 +1611,18 @@ "of op het trackpunt waar je wilt synchroniseren." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224 msgid "Unable to create new audio marker." msgstr "Kan nieuwe geluidsmarker niet aanmaken." #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 msgid "Convert to data layer" msgstr "Naar gegevenslaag omzetten" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:725 -msgid "" -"Upload of unprocessed GPS data as map data is considered harmful." -"
            If you want to upload traces, look here:" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:645 +msgid "" +"Upload of unprocessed GPS data as map data is considered " +"harmful.
            If you want to upload traces, look here:" msgstr "" "Onverwerkte GPS-gegevens uploaden als kaartgegevens kan schadelijk " @@ -1600,66 +1630,22 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:646 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:747 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:448 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:667 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "Converted from: {0}" msgstr "Omgezet van: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612 -msgid "Upload this trace..." -msgstr "Dit spoor uploaden..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:616 -msgid "" -"This functionality has been added only recently. Please
            use with " -"care and check if it works as expected." -msgstr "" -"Deze functionaliteit is recent toegevoegd. Gebruikt het
            " -"voorzichtig en controleer of het werkt zoals verwacht." - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:102 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:107 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:626 -msgid "Upload track filtered by JOSM" -msgstr "Track gefilterd door JOSM uploaden" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:103 -#, java-format -msgid "Upload raw file: {0}" -msgstr "Raw-bestand uploaden: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:108 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:627 -msgid "Upload raw file: " -msgstr "Raw-bestand uploaden: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640 -msgid "Description:" -msgstr "Beschrijving:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:123 -msgid "Tags:" -msgstr "Tags:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:129 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:648 -msgid "GPX-Upload" -msgstr "GPX-upload" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:229 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:217 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113 msgid "gps point" msgstr "GPS-punt" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 #: trans_presets.java:1795 trans_presets.java:1801 trans_presets.java:1807 #: trans_presets.java:1813 trans_presets.java:1819 trans_presets.java:1825 @@ -1679,5 +1665,5 @@ msgstr[1] "tracks" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 msgid "point" msgid_plural "points" @@ -1685,5 +1671,5 @@ msgstr[1] "Punten" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 #, java-format msgid "a track with {0} point" @@ -1692,5 +1678,5 @@ msgstr[1] "Een track met {0} punten" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} consists of {1} track" @@ -1699,5 +1685,5 @@ msgstr[1] "{0} bestaat uit {1} tracks" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} point" @@ -1706,25 +1692,25 @@ msgstr[1] "{0} punten" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117 msgid "Customize line drawing" msgstr "Lijntekening aanpassen" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:296 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 msgid "Use global settings." msgstr "Algemene instellingen gebruiken." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 msgid "Draw lines between points for this layer." msgstr "Lijnen tussen punten in deze laag tekenen." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:298 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123 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/RawGpsLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:135 msgid "Select line drawing options" @@ -1758,5 +1744,5 @@ msgstr "JPEG-afbeeldingen (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290 #, java-format msgid "{0} track, " @@ -1765,5 +1751,5 @@ msgstr[1] "{0} tracks, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 #, java-format msgid "{0} route, " @@ -1772,5 +1758,5 @@ msgstr[1] "{0} routes, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 #, java-format msgid "{0} waypoint" @@ -1779,55 +1765,51 @@ msgstr[1] "{0} waypoints" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #, java-format msgid "Name: {0}" msgstr "Naam: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "Description: {0}" msgstr "Beschrijving: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 msgid "Timespan: " msgstr "Tijdsperiode: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Length: " msgstr "Lengte: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:642 -msgid "Tags (keywords in GPX):" -msgstr "Tags (trefwoord in GPX):" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:655 msgid "time" msgstr "tijd" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:780 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:679 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:700 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 msgid "Download from OSM along this track" msgstr "Uit OSM langs deze track downloaden" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:686 msgid "Download everything within:" msgstr "Alles downloaden binnen:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 #, java-format msgid "{0} meters" msgstr "{0} meters" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:692 msgid "Maximum area per request:" msgstr "Maximum oppervlak per verzoek:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 #, java-format msgid "{0} sq km" msgstr "{0} km2" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787 #, java-format msgid "" @@ -1838,14 +1820,14 @@ "verder
            gaan?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:844 #, java-format msgid "Audio markers from {0}" msgstr "Geluidsmarkers van {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 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:1049 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "" "Some waypoints with timestamps from before the start of the track were " @@ -1855,5 +1837,5 @@ "overgeslagen." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -1963,19 +1945,19 @@ msgstr "Ingevoerde tijd kon niet worden ontleed." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:140 msgid "outside downloaded area" msgstr "buiten gedownload gebied" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 #, java-format msgid "{0} consists of:" msgstr "{0} bestaat uit:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:353 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:347 #, java-format msgid " ({0} deleted.)" msgstr " ({0} verwijderd.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:445 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 msgid "Convert to GPX layer" msgstr "Naar GPX-laag omzetten" @@ -2003,37 +1985,37 @@ msgstr "Kan bladwijzer niet schrijven." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 msgid "The geographic longitude at the mouse pointer." msgstr "De geografische lengtegraad bij de cursor." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The name of the object at the mouse pointer." msgstr "De naam van het object bij de cursor." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 msgid "The geographic latitude at the mouse pointer." msgstr "De geografische breedtegraad bij de cursor." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The angle between the previous and the current way segment." msgstr "De hoek tussen het vorige en het huidige wegsegment." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The (compass) heading of the line segment being drawn." msgstr "De (kompas)richting van het lijnsegment dat wordt getekend." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The length of the new way segment being drawn." msgstr "De lengte van het nieuwe wegsegment dat wordt getekend." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:160 msgid "(no object)" msgstr "(geen object)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:62 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:56 msgid "Color" msgstr "Kleur" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:57 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107 #: trans_presets.java:56 trans_presets.java:92 trans_presets.java:130 @@ -2134,27 +2116,36 @@ msgstr "Naam" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:118 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:112 #, java-format msgid "Paint style {0}: {1}" msgstr "Tekenstijl {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 msgid "Choose" msgstr "Kies" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 msgid "Please select a color." msgstr "Selecteer een kleur." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 #, java-format msgid "Choose a color for {0}" msgstr "Selecteer een kleur voor {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +msgid "Set to default" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:172 +msgid "Set all to default" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:184 msgid "Colors used by different objects in JOSM." msgstr "Kleuren gebruikt door verschillende objecten in JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:171 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:198 msgid "Colors" msgstr "Kleuren" @@ -2188,27 +2179,27 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45 msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
            The password is transfered in plain text to the server, encoded in the " -"URL.
            Do not use a valuable Password." +"WARNING: The password is stored in plain text in the preferences " +"file.
            The password is transfered in plain text to the server, encoded in " +"the URL.
            Do not use a valuable Password." msgstr "" "WAARSCHUWING: het wachtwoord wordt als gewone tekst in het " "voorkeurenbestand opgeslagen
            en ook als gewone tekst naar de server " -"verzonden, verwerkt in de URL.
            Gebruik dus geen waardevol wachtwoord." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:45 +"verzonden, verwerkt in de URL.
            Gebruik dus geen waardevol " +"wachtwoord." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44 msgid "Sort presets menu" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46 msgid "Enable built-in defaults" msgstr "Ingebouwde standaarden ingeschakelen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:58 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69 msgid "Tagging preset source" msgstr "Bron tagvoorkeuze" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:156 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 @@ -2216,5 +2207,5 @@ msgstr "Selecteer een rij om te bewerken." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500 @@ -2223,26 +2214,26 @@ msgstr "Selecteer een rij om te verwijderen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89 -msgid "" -"The sources (URL or filename) of tagging preset definition files. See http://" -"josm.openstreetmap.de/wiki/TaggingPresets for help." +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88 +msgid "" +"The sources (URL or filename) of tagging preset definition files. See " +"http://josm.openstreetmap.de/wiki/TaggingPresets for help." msgstr "" "De bronnen (URL of bestandsnaam) van bestanden met tagvoorkeuzedefinities. " "Zie http://josm.openstreetmap.de/wiki/TaggingPresets voor hulp." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89 msgid "Add a new tagging preset source to the list." msgstr "Een nieuwe tagvoorkeuzebron aan de lijst toevoegen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 msgid "Delete the selected source from the list." msgstr "De geselecteerde bron uit de lijst verwijderen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:94 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93 msgid "Tagging Presets" msgstr "Tagvoorkeuzen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97 msgid "Tagging preset sources" msgstr "Bronnen tagvoorkeuzen" @@ -2257,6 +2248,6 @@ "Tijdens het opslaan worden backupbestanden, eindigend op een ~, behouden." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:141 @@ -2264,34 +2255,34 @@ msgstr "Plugins" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 msgid "Configure available plugins." msgstr "Beschikbare plugins configureren" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43 msgid "Download List" msgstr "Lijst downloaden" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:80 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51 msgid "Update" msgstr "Update" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:60 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 msgid "Configure Sites..." msgstr "Sites configureren..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add either site-josm.xml or Wiki Pages." msgstr "site-josm.xml of Wiki-paginas toevoegen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99 msgid "Please select an entry." msgstr "Selecteer een invoer." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 msgid "Configure Plugin Sites" msgstr "Plugin-site configureren" @@ -2391,5 +2382,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38 msgid "Start of track (will always do this if no other markers available)." -msgstr "Trackstart (doet dit altijd als geen andere markers beschikbaar zijn)." +msgstr "" +"Trackstart (doet dit altijd als geen andere markers beschikbaar zijn)." #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:55 @@ -2482,9 +2474,9 @@ msgstr "Calibratie geluidsopname" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "Display Settings" msgstr "Beeldscherminstellingen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "" "Various settings that influence the visual representation of the whole " @@ -2493,55 +2485,64 @@ "Verschillende instellingen die het uiterlijk van het programma beïnvloeden." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings" msgstr "Verbindingsinstellingen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings for the OSM server." msgstr "Verbindingsinstellingen voor de OSM-server." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Map Settings" msgstr "Kaartinstellingen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Settings for the map projection and data interpretation." msgstr "Instellingen voor kaartprojectie en interpretatie van gegevens." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Audio Settings" msgstr "Geluidsinstellingen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Settings for the audio player and audio markers." msgstr "Instellingen voor de geluidsspeler en geluidsmarkers." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97 msgid "You have to restart JOSM for some settings to take effect." -msgstr "U dient JOSM opnieuw te starten om sommige instellingen te activeren." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:25 +msgstr "" +"U dient JOSM opnieuw te starten om sommige instellingen te activeren." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 msgid "Draw lines between raw gps points." msgstr "Teken lijnen tussen rauwe GPS punten." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:27 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 msgid "Force lines if no segments imported." msgstr "Forceer lijnen indien er geen segmenten geïmporteerd zijn." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:28 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 msgid "Draw large GPS points." msgstr "Grote GPS-punten tekenen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 -msgid "Color tracks by velocity." -msgstr "Snelheid bepaalt kleur van tracks." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34 +msgid "Velocity (red = slow, green = fast)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 +msgid "Dilution of Position (red = high, green = low, if available)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 +msgid "Single Color (can be customized for named layers)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:1346 msgid "Car" msgstr "Auto" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:309 trans_presets.java:635 trans_presets.java:833 #: trans_presets.java:842 trans_presets.java:851 trans_presets.java:864 @@ -2553,5 +2554,5 @@ msgstr "Fiets" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:310 trans_presets.java:637 trans_presets.java:832 #: trans_presets.java:841 trans_presets.java:850 trans_presets.java:863 @@ -2562,44 +2563,44 @@ msgstr "Te voet" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 msgid "Draw Direction Arrows" msgstr "Teken richting pijlen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 msgid "Fast drawing (looks uglier)" msgstr "Sneltekenen (minder fraai)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180 msgid "Only interesting direction hints (e.g. with oneway tag)." msgstr "Alleen interessante richtingwijzers (b.v. met éénrichtingstag)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:186 msgid "Only on the head of a way." msgstr "Alleen op de kop van een weg." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44 msgid "Draw segment order numbers" msgstr "Nummers segmentvolgorde tekenen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45 msgid "Draw boundaries of downloaded data" msgstr "Grenzen gedownload gebied tekenen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46 msgid "Draw virtual nodes in select mode" msgstr "Virtuele knopen in selectiemodus tekenen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47 msgid "Draw inactive layers in other color" msgstr "Inactieve lagen in andere kleur tekenen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 msgid "Smooth map graphics (antialiasing)" msgstr "Gladde kaartafbeeldingen (anti-aliasing)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 msgid "" "If your gps device draws too few lines, select this to draw lines along your " @@ -2609,5 +2610,5 @@ "je pad te tekenen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:71 msgid "" "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines." @@ -2616,9 +2617,9 @@ "tekenen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73 msgid "Maximum length (meters)" msgstr "Maximum lengte (meters)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:77 msgid "" "Force drawing of lines if the imported data contain no line information." @@ -2627,15 +2628,16 @@ "bevatten." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:84 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89 msgid "Draw direction arrows for lines, connecting GPS points." msgstr "Richtingspijlen voor lijnen tekenen, de GPS-punten verbindend." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90 -msgid "Draw the direction arrows using table lookups instead of complex math." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95 +msgid "" +"Draw the direction arrows using table lookups instead of complex math." msgstr "" "De richtingspijlen tekenen door te zoeken in tabellen i.p.v. ingewikkelde " "wiskunde." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:96 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:101 msgid "" "Don't draw arrows if they are not at least this distance away from the last " @@ -2644,53 +2646,70 @@ "Geen pijlen tekenen als ze niet minstens deze afstand hebben tot de vorige." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104 msgid "Minimum distance (pixels)" msgstr "Minimum afstand (pixels)" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:109 -msgid "Choose the hue for the track color by the velocity at that point." -msgstr "De tint van de trackkleur bepalen door de snelheid op dat punt." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116 -msgid "Allows to tune the track coloring for different average speeds." -msgstr "" -"Staat toe om de kleur van de track te variëren naar gemiddelde snelheden." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122 msgid "Draw larger dots for the GPS points." msgstr "De GPS-punten groter tekenen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136 +msgid "" +"All points and track segments will have the same color. Can be customized in " +"Layer Manager." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137 +msgid "Colors points and track segments by velocity." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:138 +msgid "" +"Colors points and track segments by dilution of position (HDOP). Your " +"capture device needs to logs that information." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143 +msgid "Allows to tune the track coloring for different average speeds." +msgstr "" +"Staat toe om de kleur van de track te variëren naar gemiddelde snelheden." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148 +msgid "Track and Point Coloring" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 msgid "GPS Points" msgstr "GPS-punten" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175 msgid "Draw direction hints for way segments." msgstr "Richtingwijzers voor wegsegmenten tekenen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:163 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192 msgid "Draw the order numbers of all segments within their way." msgstr "De volgordenummers van alle segmenten binnen hun weg tekenen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:168 -msgid "Apply antialiasing to the map view resulting in a smoother appearance." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:197 +msgid "" +"Apply antialiasing to the map view resulting in a smoother appearance." msgstr "" "Anti-aliasing op het kaartbeeld toepassen, met een vloeiender uiterlijk als " "gevolg." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202 msgid "Draw the boundaries of data loaded from the server." msgstr "De grenzen van de gegevens tekenen die geladen zijn van de server." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:178 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:207 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" "Virtuele knopen in geselecteerde modus tekenen voor eenvoudigere bewerking." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212 msgid "Draw the inactive data layers in a different color." msgstr "De inactieve gegevenslagen in een andere kleur tekenen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219 msgid "OSM Data" msgstr "OSM-gegevens" @@ -2801,6 +2820,6 @@ "a menu entry of button for the first time. So some of your changes may " "become active even without restart --- but also without collistion handling. " -"This is another reason to restart JOSM after making any changes here." -"

            " +"This is another reason to restart JOSM after making any changes " +"here.

            " msgstr "" "

            Daarnaast worden de sneltoetsen geactiveerd als de opdrachten voor de " @@ -2818,8 +2837,9 @@ "key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also " "there will be 'keys' listed that correspond to a shortcut on your keyboard " -"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/" -"Semicolon on US keyboards, '.'/Period on German keyboards, ...) instead. Not " -"doing so may result in conflicts, as there is no way for JOSM to know that " -"Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...

            " +"(e.g. ':'/Colon). Please also do not use them, use the base key " +"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) " +"instead. Not doing so may result in conflicts, as there is no way for JOSM " +"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US " +"keyboard...

            " msgstr "" "

            Het kan je opgevallen zijn dat de toetsenselectielijst op de volgende " @@ -2829,10 +2849,10 @@ "je toetsenbord geen Copy-toets heeft (PC-toetsenborden hebben hem niet, Sun-" "toetsenborden wel), gebruik het dan ook niet. Ook zullen er 'toetsen' in de " -"lijst staan die overeenkomen met een sneltoets op je toetsenbord (b.v. ':'/" -"dubbele punt). Gebruik deze ook niet, maar in plaats daarvan de basistoets " -"(';'/puntkomma op US-toetsenborden, '.'/punt op Duitse toetsenborden, enz.). " -"Als je deze regels overtreedt kunnen er conflicten ontstaan omdat JOSM niet " -"kan weten dat CTRL+SHIFT+; en CTRL+: op een US-toetsenbord eigenlijk " -"hetzelfde is...

            " +"lijst staan die overeenkomen met een sneltoets op je toetsenbord (b.v. " +"':'/dubbele punt). Gebruik deze ook niet, maar in plaats daarvan de " +"basistoets (';'/puntkomma op US-toetsenborden, '.'/punt op Duitse " +"toetsenborden, enz.). Als je deze regels overtreedt kunnen er conflicten " +"ontstaan omdat JOSM niet kan weten dat CTRL+SHIFT+; en CTRL+: op een US-" +"toetsenbord eigenlijk hetzelfde is...

            " #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:177 @@ -2861,6 +2881,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183 msgid "" -"

            The pseudo-modifier 'disabled' will disable the shortcut when encountered." -"

            " +"

            The pseudo-modifier 'disabled' will disable the shortcut when " +"encountered.

            " msgstr "" "

            De pseudo-aanpasser 'uitgeschakeld' zal de sneltoets uitschakelen als het " @@ -2932,67 +2952,67 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:231 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:236 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:250 msgid "layer not in list." msgstr "laag niet in lijst." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." msgstr "Kan geen vertaling voor taalgebied {0} vinden. Naar {1} terugvallen." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "usage" msgstr "gebruik" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 msgid "options" msgstr "opties" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 msgid "Show this help" msgstr "Deze hulptekst tonen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Standard unix geometry argument" msgstr "Standaard UNIX-geometrieargument" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 msgid "Download the bounding box" msgstr "Het omgrensde gebied downloaden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 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:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Open file (as raw gps, if .gpx)" msgstr "Open bestand (als rawe GPS, indien .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 msgid "Download the bounding box as raw gps" msgstr "Het omgrensde gebied downloaden als rawe GPS" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Select with the given search" msgstr "Met de opgegeven zoekactie selecteren" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 msgid "Don't launch in fullscreen mode" msgstr "Niet in volschermmodus starten" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 msgid "Reset the preferences to default" msgstr "De voorkeuren herstellen op standaardwaarden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 msgid "Set the language." msgstr "De taal instellen." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 msgid "examples" msgstr "voorbeelden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3002,21 +3022,21 @@ "zorg dat je wat gegevens laadt voor --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 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:161 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 msgid "Activating updated plugins" msgstr "Bijgewerkte plugins activeren" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 msgid "Loading early plugins" msgstr "Vroege plugins laden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Setting defaults" msgstr "Standaarden instellen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171 msgid "Loading plugins" msgstr "Plugins laden" @@ -3050,6 +3070,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:108 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:164 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:162 #: trans_presets.java:308 trans_presets.java:309 trans_presets.java:310 #: trans_presets.java:311 trans_presets.java:312 trans_presets.java:313 @@ -3066,5 +3086,5 @@ msgstr "onbekend" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:66 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 #, java-format msgid "" @@ -3075,25 +3095,25 @@ "noodzakelijk." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 #, java-format msgid "Plugin requires JOSM update: {0}." msgstr "Plugin vereist JOSM-update: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "Plugin {1} heeft plugin {0} nodig, maar deze is niet aangetroffen." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 #, java-format msgid "Plugin not found: {0}." msgstr "Plugin niet gevonden: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Laatste plugin-update is meer dan {0} dagen geleden." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 msgid "" "(You can change the number of days after which this warning appears
            by " @@ -3103,17 +3123,17 @@ "via de configuratieoptie 'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 msgid "Disable plugin" msgstr "Plugin uitschakelen" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Laden van plugin {0} is mislukt. Deze uit de voorkeuren verwijderen?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -3123,18 +3143,18 @@ "rechten heeft om de bestaande plugins te overschrijven." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 #, java-format msgid "" "An unexpected exception occurred that may have come from the ''{0}'' plugin." msgstr "" -"Een onverwachte uitzondering is opgetreden, mogelijk afkomstig van de \"{0}" -"\"-plugin." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:259 +"Een onverwachte uitzondering is opgetreden, mogelijk afkomstig van de " +"\"{0}\"-plugin." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Volgens de informatie in de plugin, is de auteur {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:262 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -3143,9 +3163,9 @@ "fout rapporteert." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 msgid "Should the plugin be disabled?" msgstr "Moet de plugin worden uitgeschakeld?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:278 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -3155,5 +3175,5 @@ "uit de applicatie te halen." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -3163,6 +3183,6 @@ "over dit probleem." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:322 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:181 msgid "no description available" msgstr "geen omschrijving beschikbaar" @@ -3174,5 +3194,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 msgid "Update Plugins" msgstr "Plugins bijwerken" @@ -3208,5 +3228,5 @@ "De plugin {0} lijkt beschadigd of kan niet automatisch worden gedownload." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 #, java-format msgid "Downloaded plugin information from {0} site" @@ -3215,13 +3235,13 @@ msgstr[1] "Plugin-informatie van {0} sites downloaden" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 msgid "No plugin information found." msgstr "Geen plugin-informatie gevonden." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:76 msgid "All installed plugins are up to date." msgstr "Alle geïnstalleerde plugins zijn bijgewerkt." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 #, java-format msgid "" @@ -3234,9 +3254,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:105 msgid "Download missing plugins" msgstr "Ontbrekende plugins downloaden" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:106 #, java-format msgid "" @@ -3249,22 +3269,22 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 msgid "Download Plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:170 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:168 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: versie {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:176 msgid "Plugin bundled with JOSM" msgstr "Plugin gebundeld met JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208 msgid "Plugin already exists" msgstr "Plugin bestaat al" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:211 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:209 #, java-format msgid "" @@ -3279,15 +3299,15 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 msgid "Delete and Download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:222 #, java-format msgid "Error deleting plugin file: {0}" msgstr "Fout tijdens verwijderen plugin-bestand: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:281 #, java-format msgid "Error reading plugin information file: {0}" @@ -3354,10 +3374,10 @@ msgstr "{0} {1} verwijderen" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:165 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 msgid "Conflicting relation" msgstr "Conflicterende relatie" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 #, java-format msgid "" @@ -3368,5 +3388,5 @@ "Uit relatie verwijderen?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:166 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 #, java-format msgid "" @@ -3383,7 +3403,7 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:349 msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
            This can cause problems because other objects (that you don't see) might " -"use them.
            Do you really want to delete?" +"You are about to delete nodes outside of the area you have " +"downloaded.
            This can cause problems because other objects (that you don't " +"see) might use them.
            Do you really want to delete?" msgstr "" "Je staat op het punt knopen te verwijderen buiten het gebied dat je hebt " @@ -3515,124 +3535,135 @@ msgstr "Kan geen voorkeuren van server laden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:232 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "Oppervlak van weg is niet gesloten." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:426 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:428 #, 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:527 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:765 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:776 msgid "Empty member in relation." msgstr "Relatie bevat leeg lid." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:767 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:531 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Lid \"{0}\" in relatie wissen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:547 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 #, 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:552 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:549 msgid "More than one \"from\" way found." msgstr "Meer dan een \"van\"-weg gevonden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:558 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555 msgid "More than one \"to\" way found." msgstr "Meer dan een \"naar\"-weg gevonden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:561 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 +msgid "More than one \"via\" found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 #, java-format msgid "Unknown role ''{0}''." msgstr "Onbekende rol \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Onbekend lidtype voor \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 msgid "No \"from\" way found." msgstr "Geen \"van\"-weg gevonden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 msgid "No \"to\" way found." msgstr "Geen \"naar\"-weg gevonden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -msgid "No \"via\" node found." -msgstr "Geen \"via\"-knoop gevonden." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +msgid "No \"via\" node or way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 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:619 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:636 -#, java-format -msgid "The \"{0}\" way must contain at least 2 nodes." -msgstr "De \"{0}\"-weg moet uit minstens 2 knopen bestaan." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:731 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +msgid "The \"to\" way doesn't start or end at a \"via\" node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:620 +msgid "The \"from\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:624 +msgid "The \"to\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:742 #, 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:787 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 #, 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:798 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Niet-weg \"{0}\" in multipolygoon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:847 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:858 #, 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:927 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 #, 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:938 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:949 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Binnenweg \"{0}\" is uitwendig." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:987 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:998 #, 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:1012 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1023 #, 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:1195 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1206 msgid "untagged" msgstr "niet-getagd" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1196 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207 msgid "text" msgstr "tekst" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" msgstr "inactief" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:94 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:181 @@ -3640,13 +3671,13 @@ msgstr "geselecteerd" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" msgstr "ongetagde weg" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 msgid "incomplete way" msgstr "incomplete weg" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 msgid "highlight" msgstr "" @@ -3668,5 +3699,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:113 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:89 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:77 msgid "incomplete" @@ -3696,14 +3727,14 @@ msgstr[1] "{0} leden" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 msgid "Duplicate" msgstr "Dupliceren" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 msgid "Duplicate selection by copy and immediate paste." msgstr "Dupliceer selectie door kopiëren en direct plakken." -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 @@ -3712,5 +3743,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -3781,7 +3812,9 @@ msgstr "Geschiedenis van OSM-wegen of -knopen weergeven." -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:57 -msgid "Please select at least one node, way or relation." -msgstr "Selecteer minstens één knoop, weg of relatie." +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:60 +msgid "" +"Please select at least one node, way or relation. Only already uploaded " +"elements have a history." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 @@ -3803,7 +3836,7 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/TerracerAction.java:47 @@ -3941,5 +3974,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:123 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:314 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:315 msgid "Enter values for all conflicts." msgstr "Waarden voor alle conflicten invoeren." @@ -3947,5 +3980,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 msgid "Solve Conflicts" msgstr "" @@ -4081,5 +4114,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #, java-format @@ -4106,17 +4139,19 @@ msgstr[1] "De geselecteerde knopen liggen niet in het midden van enige weg." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125 -msgid "" -"There is more than one way using the node(s) you selected. Please select the " +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 +msgid "" +"There is more than one way using the node you selected. Please select the " "way also." -msgstr "" -"Er is meer dan één weg die van de door jou geselecteerde kno(o)p(en) gebruik " -"maakt. Selecteer ook de weg." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133 +msgid_plural "" +"There is more than one way using the nodes you selected. Please select the " +"way also." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137 msgid "The selected nodes do not share the same way." msgstr "De geselecteerde knopen hebben niet dezelfde weg gemeen." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -4124,11 +4159,11 @@ msgstr[1] "De geselecteerde weg bevat niet alle geselecteerde knopen." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229 msgid "You must select two or more nodes to split a circular way." msgstr "" "Je moet twee of meer knopen selecteren om een rondgaande weg te splitsen" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -4138,5 +4173,5 @@ "selecteer knopen in het midden van de weg.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 msgid "" "A role based relation membership was copied to all new ways.\n" @@ -4147,5 +4182,5 @@ "Je moet dit controleren en waar nodig corrigeren." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:296 #, java-format msgid "Split way {0} into {1} parts" @@ -4398,5 +4433,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "\"Lange straat\" - 'Lange' en 'straat' in een sleutel of naam." +msgstr "" +"\"Lange straat\" - 'Lange' en 'straat' in een sleutel of naam." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 @@ -4537,5 +4573,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 msgid "Align Nodes in Circle" msgstr "Knopen uitlijnen in een cirkel" @@ -4549,5 +4585,5 @@ msgstr "Sommige knopen zitten (bijna) op de lijn" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 msgid "Please select at least four nodes." msgstr "Selecteer minstens vier knopen." @@ -4616,4 +4652,32 @@ msgstr "Het herstellen van backupbestand is mislukt." +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "" +"Show status report with useful information that can be attached to bugs" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92 +msgid "Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +msgid "Copy to clipboard and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 +msgid "Close" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 @@ -4625,13 +4689,13 @@ msgstr "De laatste ongedaan gemaakte opdracht herstellen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:44 msgid "Delete Mode" msgstr "Verwijdermodus" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:46 msgid "Delete nodes or ways." msgstr "Knopen of wegen verwijderen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:84 @@ -4642,5 +4706,5 @@ msgstr "Modus: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:130 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -4652,6 +4716,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:87 msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." +"Drag play head and release near track to play audio from there; " +"SHIFT+release to synchronize audio at that point." msgstr "" "Afspeelstart verslepen en loslaten nabij track om het geluid vanaf daar af " @@ -4667,14 +4731,14 @@ msgstr "Gebieden aanmaken" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 msgid "Extrude Way" msgstr "Weg uittrekken" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:252 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:416 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:430 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/ExtrudeAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 msgid "Draw a rectangle of the desired size, then release the mouse button." msgstr "" @@ -4682,10 +4746,10 @@ "loslaten." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:420 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:434 msgid "Release the mouse button to stop rotating." msgstr "De muisknop loslaten om het roteren te stoppen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 msgid "Drag a way segment to make a rectangle." msgstr "Een wegsegment verslepen om een rechthoek te maken." @@ -4753,14 +4817,14 @@ msgstr "Objecten selecteren, verplaatsen en roteren" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:191 msgid "Add and move a virtual new node to way" msgstr "Een virtuele, nieuw knoop toevoegen en verplaatsen naar een weg" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:220 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:223 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 msgid "Cannot move objects outside of the world." msgstr "Kan objecten niet buiten de wereld plaatsen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:418 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:432 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -4769,5 +4833,5 @@ "met dichtstbijzijnde knoop." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:422 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:436 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to remove); Shift-" @@ -4845,30 +4909,30 @@ msgstr "{0} knopen samenvoegen" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Orthogonalize Shape" msgstr "Vorm orthogonaal maken" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 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:60 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 msgid "Only two nodes allowed" msgstr "Slechts twee knopen toegestaan" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 msgid "Selection must consist only of ways." msgstr "Selectie mag slechts wegen bevatten." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 msgid "Please select one or more closed ways of at least four nodes." msgstr "Één of meer gesloten wegen met minstens vier knopen selecteren." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 msgid "Please select ways with almost right angles to orthogonalize." msgstr "Selecteer wegen met nagenoeg rechte hoeken om orthogonaal te maken." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 msgid "" "You are using the EPSG:4326 projection which might lead
            to " @@ -4880,9 +4944,9 @@ "waarschuwing te verwijderen.
            Wil je verder gaan?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "Only one node selected" msgstr "Slechts één knoop geselecteerd" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 msgid "Orthogonalize" msgstr "Orthogonaal maken" @@ -4933,5 +4997,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101 -msgid "Please select exactly three nodes or one way with exactly three nodes." +msgid "" +"Please select exactly three nodes or one way with exactly three nodes." msgstr "Selecteer precies drie knopen of een weg met precies drie knopen." @@ -4940,52 +5005,69 @@ msgstr "Deze knopen staan niet in een cirkel." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../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:71 +msgid "Update Data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:72 +#, java-format +msgid "" +"This action will require {0} individual download requests. Do you wish to " +"continue?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 msgid "Open Location..." msgstr "Locatie openen…" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 msgid "Open an URL." msgstr "Een URL openen." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 msgid "Separate Layer" msgstr "Laag scheiden" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 msgid "Enter URL to download:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 msgid "Download Location" msgstr "Locatie downloaden" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 msgid "Download URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 msgid "Add Node..." msgstr "Knoop toevoegen..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 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:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 msgid "Enter the coordinates for the new node." msgstr "Coördinaten van de nieuwe knoop invoeren." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 msgid "Use decimal degrees." msgstr "Decimale graden gebruiken." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negatieve waarden duiden op het westelijk/zuidelijk halfrond." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 #: ../plugins/livegps/livegps/LiveGpsDialog.java:54 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93 @@ -4994,5 +5076,5 @@ msgstr "Breedtegraad" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 #: ../plugins/livegps/livegps/LiveGpsDialog.java:56 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96 @@ -5035,14 +5117,14 @@ msgstr "Verplaatst objecten {0}" +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "Overwrite" msgstr "Overschrijven?" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "File exists. Overwrite?" msgstr "Bestand bestaat al. Overschrijven?" @@ -5061,43 +5143,48 @@ msgstr "Selecteer iets om te kopiëren" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Wegen losmaken" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "Dubbele knopen die door meerdere wegen worden gebruikt." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 msgid "This node is not glued to anything else." msgstr "De knoop is met niets anders verbonden." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 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:90 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 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:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 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:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "Select either:" msgstr "Selecteer één van beide:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +msgid "* One tagged node, or" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 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:103 -msgid "* One node that is used by more than one way and one of those ways, or" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +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:104 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -5106,5 +5193,5 @@ "weg, of" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -5113,5 +5200,5 @@ "één weg." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -5125,10 +5212,14 @@ "geselecteerd worden." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:160 +msgid "Unglued Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:373 #, java-format msgid "Dupe into {0} nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:320 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:397 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -5231,5 +5322,5 @@ msgstr "De laatste opdracht opgedaan maken." -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 msgid "No Shortcut" msgstr "Geen sneltoets" @@ -5251,13 +5342,13 @@ msgstr "OpenStreetMap-gegevens" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:29 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:28 msgid "Downloading GPS data" msgstr "GPS-gegevens worden gedownload" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:41 msgid "Downloaded GPX Data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:71 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:69 msgid "Raw GPS data" msgstr "Rauwe GPS-gegevens" @@ -5481,5 +5572,6 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169 -msgid "Header contains several values and cannot be mapped to a single string" +msgid "" +"Header contains several values and cannot be mapped to a single string" msgstr "" "Kop bevat meerdere waarden en kan niet in een enkele string worden geplaatst" @@ -5536,5 +5628,6 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96 msgid "Open the OpenStreetBugs window and activate the automatic download" -msgstr "Opent het OpenStreetBugs-scherm en activeert de automatische download" +msgstr "" +"Opent het OpenStreetBugs-scherm en activeert de automatische download" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114 @@ -5562,7 +5655,7 @@ "upload this data. Maybe you have selected the wrong layer?" msgstr "" -"De geselecteerde gegevens bevatten gegevens van OpenStreetBugs." -"
            Deze gegevens kan je niet uploaden. Heb je misschien de verkeerde laag " -"geselecteerd?" +"De geselecteerde gegevens bevatten gegevens van " +"OpenStreetBugs.
            Deze gegevens kan je niet uploaden. Heb je misschien de " +"verkeerde laag geselecteerd?" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 @@ -5837,5 +5930,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69 -msgid "Maximum number of segments allowed in each generated way. Default 250." +msgid "" +"Maximum number of segments allowed in each generated way. Default 250." msgstr "" "Maximum aantal segmenten toegestaan in een aangemaakte weg (standaard 250)." @@ -5859,9 +5953,10 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72 msgid "" -"Accuracy of Douglas-Peucker line simplification, measured in degrees." -"
            Lower values give more nodes, and more accurate lines. Default 0.0003." -msgstr "" -"Nauwkeurigheid van de Douglas-Peucker lijnvereenvoudiging, gemeten in graden." -"
            Lagere waarden resulteren in meer knopen en nauwkeurigere lijnen. " +"Accuracy of Douglas-Peucker line simplification, measured in " +"degrees.
            Lower values give more nodes, and more accurate lines. Default " +"0.0003." +msgstr "" +"Nauwkeurigheid van de Douglas-Peucker lijnvereenvoudiging, gemeten in " +"graden.
            Lagere waarden resulteren in meer knopen en nauwkeurigere lijnen. " "Standaard 0.0003." @@ -6510,10 +6605,11 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:509 msgid "" -"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." -"org/index.php/User:JLS/speller) or tag checking data files." -msgstr "" -"De bronnen (URL of bestandsnaam) van spellingscontrole (zie http://wiki." -"openstreetmap.org/index.php/User:JLS/speller) of gegevensbestanden van " -"tagchecker." +"The sources (URL or filename) of spell check (see " +"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking " +"data files." +msgstr "" +"De bronnen (URL of bestandsnaam) van spellingscontrole (zie " +"http://wiki.openstreetmap.org/index.php/User:JLS/speller) of " +"gegevensbestanden van tagchecker." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:510 @@ -6617,5 +6713,6 @@ #: ../plugins/livegps/livegps/LiveGpsPlugin.java:41 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." +msgstr "" +"Met gpsd-server verbinden en de huidige locatie in LiveGPS-laag tonen." #: ../plugins/livegps/livegps/LiveGpsPlugin.java:53 @@ -6926,6 +7023,6 @@ msgstr "" "Kan bibliotheek rxtxSerial niet laden. Als je ondersteuning bij het " -"installeren nodig hebt, kijk dan op Globalsat: http://www.raphael-mack.de/" -"josm-globalsat-gpx-import-plugin/" +"installeren nodig hebt, kijk dan op Globalsat: http://www.raphael-" +"mack.de/josm-globalsat-gpx-import-plugin/" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 @@ -6974,6 +7071,6 @@ msgstr "Voegt nieuwe laag toe" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:40 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:43 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 #, java-format @@ -6981,19 +7078,30 @@ msgstr "{0} downloaden" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:51 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:55 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 msgid "Contacting WMS Server..." msgstr "Met WMS-server verbinden..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157 msgid "Create buildings" msgstr "Gebouwen aanmaken" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 msgid "CadastreGrabber: Illegal url." msgstr "CadastreGrabber: ongeldige URL." + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +msgid "" +"To avoid cadastre WMS overload,\n" +"building import size is limited to 1 km2 max." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +msgid "Please, enable auto-sourcing and check cadastre millesime." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78 @@ -7015,5 +7123,22 @@ msgstr "Cadastre: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:128 +msgid "Cadastre" +msgstr "Kadaster" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:139 +msgid "Auto sourcing" +msgstr "Automatisch vullen" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164 +msgid "Invalid projection" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 +#, java-format +msgid "Change the projection to {0} first." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:169 msgid "" "To enable the cadastre WMS plugin, change\n" @@ -7022,12 +7147,4 @@ "Verander de JOSM-projectie en herstart om\n" "de kadaster-WMS-plugin in te schakelen." - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132 -msgid "Cadastre" -msgstr "Kadaster" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 -msgid "Auto sourcing" -msgstr "Automatisch vullen" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20 @@ -7100,6 +7217,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:43 msgid "" -"More than one WMS layer present.\n" -"Select one of them first, then retry." +"More than one WMS layer present\n" +"Select one of them first, then retry" msgstr "" @@ -7108,5 +7225,5 @@ msgstr "Locatie uit buffer laden (alleen als buffer ingeschakeld is)" -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136 #, java-format @@ -7116,13 +7233,13 @@ msgstr[1] "Vereenvoudig weg (verwijder {0} knopen)" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61 msgid "Extract SVG ViewBox..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65 msgid "Extract best fitting boundary..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:120 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126 msgid "Create boundary" msgstr "Kader aanmaken" @@ -7158,15 +7275,15 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 msgid "Save WMS layer to file" msgstr "WMS-laag in bestand opslaan" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "Load WMS layer from file" msgstr "WMS-laag uit bestand laden" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -7174,5 +7291,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 msgid "File Format Error" msgstr "Fout in bestandsindeling" @@ -7180,5 +7297,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 msgid "Error loading file" msgstr "Laden bestand is mislukt" @@ -7207,48 +7324,52 @@ msgstr "Fout in buffer Lambert-zone" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 msgid "Replace original background by JOSM background color." -msgstr "Oorspronkelijke achtergrond vervangen door achtergrondkleur van JOSM." - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31 +msgstr "" +"Oorspronkelijke achtergrond vervangen door achtergrondkleur van JOSM." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30 msgid "Reverse grey colors (for black backgrounds)." msgstr "Grijstinten omkeren (voor zwarte achtergronden)." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 msgid "Set background transparent." msgstr "Achtergrond transparant maken." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34 msgid "Draw boundaries of downloaded data." msgstr "Grenzen van gedownloade gegevens tekenen" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Enable automatic caching." msgstr "Automatisch bufferen inschakelen" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 msgid "Max. cache size (in MB)" msgstr "Max. buffergrootte (in MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:53 -msgid "" -"A special handler of the french cadastre wms at www.cadastre.gouv." -"fr

            Please read the Terms and Conditions of Use here (in french): " -"
            http://www.cadastre.gouv.fr/scpc/html/" -"CU_01_ConditionsGenerales_fr.html
            before any upload of data created " -"by this plugin." -msgstr "" -"Een speciale bewerker van de Franse kadaster WMS op www.cadastre.gouv." -"fr

            Lees de gebruiksvoorwaarden (in het Frans):
            http://" -"www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:55 +msgid "" +"A special handler of the french cadastre wms at " +"www.cadastre.gouv.fr

            Please read the Terms and Conditions of Use here " +"(in french):
            " +"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " +"
            before any upload of data created by this plugin." +msgstr "" +"Een speciale bewerker van de Franse kadaster WMS op " +"www.cadastre.gouv.fr

            Lees de gebruiksvoorwaarden (in het Frans): " +"
            " +"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " "
            voor het uploaden van gegevens die met deze plugin zijn gemaakt." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:58 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 msgid "French cadastre WMS" msgstr "Franse kadaster WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -7256,10 +7377,10 @@ "ingeschakeld" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65 msgid "Source" msgstr "Bron" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -7269,16 +7390,15 @@ "in de JOSM-voorkeuren is opgegeven." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 -msgid "" -"Invert the original texts from black to white (and all intermediate greys)." -msgstr "" -"De oorspronkelijke teksten van zwart naar wit omkeren (en alle " -"tussenliggende grijstinten)." - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +msgid "" +"Invert the original black and white colors (and all intermediate greys). " +"Useful for texts on dark backgrounds." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Allows multiple layers stacking" msgstr "Stapelen van meerdere lagen toestaan" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:99 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" @@ -7286,13 +7406,26 @@ "doorzichtig." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Een rechthoek om de gedownloade gegevens van de WMS-server tekenen." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:113 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 msgid "Image grab multiplier:" msgstr "Image-grab-vermenigvuldiger" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:162 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:125 +msgid "Grab smaller images (higher quality but use more memory)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +msgid "Fixed size square (default is 100m)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +msgid "Fixed size (from 25 to 1000 meters)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -7410,5 +7543,5 @@ msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:254 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:255 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -7556,7 +7689,7 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:203 msgid "" -"Take a photo of your GPS receiver while it displays the time." -"
            Display that photo here.
            And then, simply capture the time you read " -"on the photo and select a timezone

            " +"Take a photo of your GPS receiver while it displays the " +"time.
            Display that photo here.
            And then, simply capture the time you " +"read on the photo and select a timezone
            " msgstr "" "Maak een opname van je GPS-ontvanger met de tijd weergegeven.
            Toon " @@ -7626,5 +7759,6 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:484 -msgid "I can take a picture of my GPS receiver.
            Can this help?" +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?" @@ -7671,5 +7805,5 @@ msgstr "Ongeldige tijdzone" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #, java-format msgid "" @@ -7680,14 +7814,14 @@ "Verwachte indeling: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:579 msgid "Invalid offset" msgstr "Ongeldige verschuiving" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:641 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:643 #, java-format msgid "Found {0} matchs of {1} in GPX track {2}" msgstr "{0} overeenkomsten van {1} in GPX-track {2} gevonden" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:642 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:644 msgid "GPX Track loaded" msgstr "GPX-track geladen" @@ -7695,5 +7829,5 @@ #: ../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/UploadDataGui.java:79 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 msgid "Upload Traces" msgstr "Sporen uploaden" @@ -7703,58 +7837,72 @@ msgstr "Sporen naar openstreetmap.org uploaden" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 -msgid "Upload GPX track" -msgstr "GPX-track uploaden" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71 +msgid "Upload Trace" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Public" msgstr "Openbaar" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 msgid "Selected makes your trace public in openstreetmap.org" msgstr "Indien geselecteerd wordt je spoor openbaar in openstreetmap.org" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Description" msgstr "Beschrijving" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:123 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 msgid "Tags" msgstr "Tags" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:182 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:153 +#, java-format +msgid "Selected track: {0}" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:176 msgid "Connecting..." msgstr "Verbinden..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 -msgid "Uploading GPX track..." -msgstr "GPX-track uploaden..." - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:214 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:199 +msgid "Upload cancelled" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:209 +msgid "Error while uploading" +msgstr "Uploaden is mislukt" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "GPX-track is geupload" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:227 -msgid "Error while uploading" -msgstr "Uploaden is mislukt" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:235 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +msgid "Upload failed. Server returned the following message: " +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 +#, java-format +msgid "Uploading GPX track: {0}% ({1} of {2})" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "Geen beschrijving opgegeven. Voer deze s.v.p. in," -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:252 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "Geen GPX-laag geselecteerd. Kan geen spoor uploaden." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:241 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "Geen gebruikersnaam opgegeven." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:244 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "Geen wachtwoord opgegeven." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "GPX-track uploaden" @@ -7980,15 +8128,15 @@ msgstr "Automatisch downloaden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS-laag ({0}), automatisch in zoom {1} downloaden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS-laag ({0}), in zoom {1} downloaden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -7996,17 +8144,17 @@ "Het gevraagde gebied is te groot. Zoom iets in of verander de resolutie" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:232 msgid "Download visible tiles" msgstr "Zichtbare tegels downloaden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241 msgid "Change resolution" msgstr "Resolutie veranderen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:253 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:264 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:271 msgid "Alpha channel" msgstr "" @@ -12902,21 +13050,58 @@ msgstr "naar weg" +#~ msgid "Please select something from the conflict list." +#~ msgstr "Een selectie uit de conflictenlijst maken." + #~ msgid "Please select objects for which you want to change properties." #~ msgstr "Selecteer objecten waarvan de eigenschappen moeten veranderen." #~ msgid "" -#~ "This is the basic relation editor which allows you to change the " -#~ "relation's tags as well as the members. In addition to this we should " -#~ "have a smart editor that detects the type of relationship and limits your " -#~ "choices in a sensible way." +#~ "This is the basic relation editor which allows you to change the relation's " +#~ "tags as well as the members. In addition to this we should have a smart " +#~ "editor that detects the type of relationship and limits your choices in a " +#~ "sensible way." #~ msgstr "" -#~ "Dit is een eenvoudig relatieeditor waarmee je de relatietags en de leden " -#~ "kan bewerken. Daarnaast zouden we een uitgebreide editor moeten hebben " -#~ "die het soort relatie detecteert en de keuzen op een passende manier " -#~ "beperkt." +#~ "Dit is een eenvoudig relatieeditor waarmee je de relatietags en de leden kan " +#~ "bewerken. Daarnaast zouden we een uitgebreide editor moeten hebben die het " +#~ "soort relatie detecteert en de keuzen op een passende manier beperkt." #~ msgid "Highlight the member from the current table row as JOSM's selection" #~ msgstr "De leden in de huidige tabelrij markeren als JOSM's selectie" +#~ msgid "Upload this trace..." +#~ msgstr "Dit spoor uploaden..." + +#~ msgid "" +#~ "This functionality has been added only recently. Please
            use with " +#~ "care and check if it works as expected." +#~ msgstr "" +#~ "Deze functionaliteit is recent toegevoegd. Gebruikt het
            " +#~ "voorzichtig en controleer of het werkt zoals verwacht." + +#~ msgid "Upload track filtered by JOSM" +#~ msgstr "Track gefilterd door JOSM uploaden" + +#~ msgid "Upload raw file: " +#~ msgstr "Raw-bestand uploaden: " + +#~ msgid "Description:" +#~ msgstr "Beschrijving:" + +#~ msgid "Tags (keywords in GPX):" +#~ msgstr "Tags (trefwoord in GPX):" + +#~ msgid "GPX-Upload" +#~ msgstr "GPX-upload" + +#, java-format +#~ msgid "Upload raw file: {0}" +#~ msgstr "Raw-bestand uploaden: {0}" + +#~ msgid "Tags:" +#~ msgstr "Tags:" + +#~ msgid "Choose the hue for the track color by the velocity at that point." +#~ msgstr "De tint van de trackkleur bepalen door de snelheid op dat punt." + #~ msgid "Unknown type" #~ msgstr "Onbekend type" @@ -12925,4 +13110,5 @@ #~ msgstr "NullPointer-uitzondering, mogelijk door ontbrekende tags." +#, java-format #~ msgid "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..." #~ msgstr "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} resteert)..." @@ -12949,4 +13135,5 @@ #~ msgstr "Natuurlijk" +#, java-format #~ msgid "Version: {0}
            Last change at {1}" #~ msgstr "Versie: {0}
            Laatste verandering op {1}" @@ -12964,4 +13151,5 @@ #~ msgstr "SurveyorPlugin" +#, java-format #~ msgid "Version {0} - Last change at {1}" #~ msgstr "Versie {0} - Laatste aanpassing op {1}" @@ -12973,7 +13161,9 @@ #~ msgstr "Een waypointsbestand openen." +#, java-format #~ msgid "Data error: lat value \"{0}\" is out of bounds." #~ msgstr "Gegevensfout: lat-waarde \"{0}\" ligt buiten het bereik." +#, java-format #~ msgid "Data error: lon value \"{0}\" is out of bounds." #~ msgstr "Gegevensfout: lon-waarde \"{0}\" ligt buiten het bereik." @@ -12994,4 +13184,11 @@ #~ msgstr "bus" +#, java-format +#~ msgid "The \"{0}\" way must contain at least 2 nodes." +#~ msgstr "De \"{0}\"-weg moet uit minstens 2 knopen bestaan." + +#~ msgid "Upload GPX track" +#~ msgstr "GPX-track uploaden" + #~ msgid "Direct Upload to OpenStreetMap" #~ msgstr "Direct uploaden naar OpenStreetMap" Index: /applications/editors/josm/i18n/po/pl.po =================================================================== --- /applications/editors/josm/i18n/po/pl.po (revision 13832) +++ /applications/editors/josm/i18n/po/pl.po (revision 13833) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-15 22:03+0100\n" -"PO-Revision-Date: 2009-02-15 17:44+0000\n" +"POT-Creation-Date: 2009-02-21 16:35+0100\n" +"PO-Revision-Date: 2009-02-22 10:19+0000\n" "Last-Translator: Łukasz Jernaś \n" "Language-Team: Polish \n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2009-02-15 20:40+0000\n" +"X-Launchpad-Export-Date: 2009-02-22 20:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: POLAND\n" @@ -23,5 +23,5 @@ "X-Poedit-Basepath: ../dev/josm/i18n/\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 #, java-format msgid "" @@ -34,5 +34,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 msgid "" "This action will have no shortcut.\n" @@ -42,5 +42,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -51,5 +51,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Podpowiedź: Możesz zmienić skróty klawiszowe w ustawieniach.)" @@ -60,17 +60,17 @@ #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 msgid "Information" msgstr "Informacje" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Do nothing" msgstr "Nic nie rób" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Report Bug" msgstr "Zgłoś błąd" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 msgid "" "An unexpected exception occurred.\n" @@ -84,14 +84,14 @@ "z najnowszej wersji JOSM, rozważ proszę możliwość zgłoszenia błędu." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Unexpected Exception" msgstr "Nieoczekiwany błąd" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 #, java-format msgid "Please report a ticket at {0}" msgstr "Proszę zgłosić bład pod adresem {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" @@ -99,5 +99,5 @@ "błędną sytuację." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:78 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -107,9 +107,9 @@ "błędu." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Be sure to include the following information:" msgstr "Upewnij się, żeby załączyć następujące informacje:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75 msgid "(The text has already been copied to your clipboard.)" msgstr "(Tekst już został skopiowany do schowka.)" @@ -123,5 +123,5 @@ msgstr "Błąd odtwarzania dźwięku" -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:94 @@ -129,5 +129,5 @@ msgstr "Łączenie z serwerem OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:48 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:32 @@ -135,11 +135,11 @@ msgstr "Pobieranie danych OSM..." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 msgid "NullPointerException, possibly some missing tags." msgstr "" "Wyjątek NullPointerException, prawdopodobnie brakuje jakichś znaczników." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83 msgid "Preparing data..." msgstr "Przygotowywanie danych..." @@ -169,48 +169,49 @@ msgstr "Pobieram punkty od {0} do {1}..." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:164 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:168 msgid "Unknown version" msgstr "Nieznana wersja" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 msgid "Found element in non-way." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 msgid " has zero ref" msgstr " nie posiada referencji" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 msgid "Found element in non-relation." msgstr "Znaleziono tag w" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:252 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250 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:294 msgid "Illegal object with id=0" msgstr "Niedozwolony obiekt z id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Brak wymaganego atrybutu \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 #, java-format msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "Pomijanie drogi, ponieważ zawiera ona węzeł, który nie istnieje: {0}\n" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +msgstr "" +"Pomijanie drogi, ponieważ zawiera ona węzeł, który nie istnieje: {0}\n" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:502 msgid "Prepare OSM data..." msgstr "Przygotowywanie danych OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:518 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:516 msgid "Ill-formed node id" msgstr "Zły format identyfikatora węzła" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:280 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:287 msgid "Parse error: invalid document structure for gpx document" msgstr "Błąd parsowania: błędna struktura dokumentu gpx" @@ -220,18 +221,18 @@ msgstr "Łączenie z serwerem..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 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/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 msgid "Commit comment" msgstr "Komentarz zmiany" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" msgstr "{0}% ({1}/{2}), {3} pozostało. Przesyłanie {4}: {5} (id: {6})" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64 @@ -241,34 +242,32 @@ msgstr "Wystąpił błąd: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:192 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190 msgid "Opening changeset..." msgstr "Otwieranie zestawu zmian..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:226 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224 msgid "Server does not support changesets" msgstr "Serwer nie wspiera wersjonowania" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:246 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:428 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:609 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:184 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607 msgid "Unknown host" msgstr "Nieznany adres" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282 msgid "Preparing..." msgstr "Przygotowywanie..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:294 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292 msgid "Uploading..." msgstr "Wysyłanie..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375 msgid "Closing changeset..." msgstr "Zamykanie zestawu zmian..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:652 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650 msgid "Transfer aborted due to error (will wait for 5 seconds):" msgstr "Transfer przerwany z powodu błędu (czekam 5 sekund):" @@ -306,17 +305,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95 #: ../core/src/org/openstreetmap/josm/Main.java:348 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:29 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 @@ -329,11 +331,11 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:110 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -348,11 +350,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:186 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 msgid "Creating main GUI" msgstr "Przygotowywanie interfejsu użytkownika" #: ../core/src/org/openstreetmap/josm/Main.java:195 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:271 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:278 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:56 msgid "Help" @@ -361,5 +363,6 @@ #: ../core/src/org/openstreetmap/josm/Main.java:258 msgid "The projection could not be read from preferences. Using EPSG:4326" -msgstr "Odwzorowanie nie mogło zostać odczytane z ustawień. Używanie EPSG:4326" +msgstr "" +"Odwzorowanie nie mogło zostać odczytane z ustawień. Używanie EPSG:4326" #: ../core/src/org/openstreetmap/josm/Main.java:345 @@ -395,21 +398,21 @@ msgstr "Pominięto niepoprawny URL do pliku: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109 msgid "min lat" msgstr "min szer." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111 msgid "min lon" msgstr "min dł." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:117 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "max lat" msgstr "max szer." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 msgid "max lon" msgstr "max dł." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:122 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -418,5 +421,5 @@ "Adres URL z www.openstreetmap.org (można wkleić adres aby pobrać obszar)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:134 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130 msgid "Bounding Box" msgstr "Wybrany obszar" @@ -452,6 +455,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:96 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:894 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:956 msgid "name" msgstr "nazwa" @@ -484,5 +487,5 @@ msgstr "powiększenie" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:107 msgid "" "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -490,5 +493,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:109 msgid "Slippy map" msgstr "Mapa \"Slippy\"" @@ -499,7 +502,7 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:605 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:602 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:89 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -519,5 +522,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380 msgid "Remove" msgstr "Usuń" @@ -584,5 +587,5 @@ #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:91 msgid "true: the property is explicitly switched on" -msgstr "" +msgstr "prawda: właściwość jest domyśłnie ustawiona" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:96 @@ -654,20 +657,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:109 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:186 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:198 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:108 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:191 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:203 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 msgid "Java OpenStreetMap Editor" msgstr "OpenStreetMap - Edytor Java" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:111 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:110 msgid "Message of the day not available" msgstr "Wiadomość dnia jest niedostępna" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:200 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:205 msgid "Downloading \"Message of the day\"" msgstr "Pobieranie wiadomości dnia" @@ -707,33 +710,33 @@ msgstr "Zmniejsz" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:234 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:474 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:512 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:383 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:380 msgid "More information about this feature" msgstr "Więcej informacji na temat tej funkcji" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:393 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:390 msgid "Optional Attributes:" msgstr "Dodatkowe atrybuty:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:437 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Używa szablon \"{0}\" z grupy \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:438 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:435 #, java-format msgid "Use preset ''{0}''" msgstr "Używa szablon \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 msgid "way" @@ -743,11 +746,11 @@ msgstr[2] "dróg" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:214 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 msgid "node" msgid_plural "nodes" @@ -756,6 +759,6 @@ msgstr[2] "węzłów" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:81 @@ -766,30 +769,30 @@ msgstr[2] "relacji" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 msgid "closedway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:475 +msgstr "zamknięta droga" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 #, java-format msgid "Unknown type: {0}" msgstr "Nieznany typ: {0}" +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:549 +#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 +#, java-format +msgid "Could not read tagging preset source: {0}" +msgstr "Nie można odczytać źródła szablonów: {0}" + #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 -#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 -#, java-format -msgid "Could not read tagging preset source: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:555 #, java-format msgid "Error parsing {0}: " msgstr "Błąd podczas przetwarzania {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:572 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:569 #, 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:607 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595 #, java-format msgid "Change {0} object" @@ -799,9 +802,17 @@ msgstr[2] "Zmień {0} obiektów" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 msgid "Nothing selected!" msgstr "Nic nie wybrano!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 +msgid "Selection unsuitable!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +msgid "Apply Preset" +msgstr "Zastosuj szablon" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 msgid "Change Properties" msgstr "Zmień właściwości" @@ -812,14 +823,14 @@ msgstr "Grupa szablonów \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:107 msgid "File" msgstr "Plik" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:135 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:107 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:86 @@ -831,22 +842,22 @@ msgstr "Edycja" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 msgid "View" msgstr "Widok" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:26 msgid "Tools" msgstr "Narzędzia" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:141 msgid "Audio" msgstr "Dźwięk" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:142 msgid "Presets" msgstr "Szablony" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:40 @@ -858,18 +869,18 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:210 msgid "Wireframe View" msgstr "Widok szkieletowy" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212 msgid "Toggle Wireframe view" msgstr "Przełącza widok szkieletowy" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:28 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 msgid "Contacting the OSM server..." msgstr "Nawiązywanie połączenia z serwerem OSM..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 #, java-format msgid "This will change up to {0} object." @@ -879,11 +890,11 @@ msgstr[2] "Ta operacja może zmienić {0} obiektów." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 msgid "An empty value deletes the key." msgstr "Ustawienie wartości na pustą usuwa klucz" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66 @@ -893,7 +904,7 @@ msgstr "Klucz" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 @@ -902,10 +913,10 @@ msgstr "Wartość" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333 msgid "Change values?" msgstr "Zmienić wartości?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:257 #, java-format msgid "Change properties of up to {0} object" @@ -915,33 +926,33 @@ msgstr[2] "Zmiana właściwości {0} obiektów." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 msgid "Please select a key" msgstr "Proszę wybierz klucz" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321 msgid "Please select a value" msgstr "Proszę wybierz wartość" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:445 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:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 msgid "Properties/Memberships" msgstr "Właściwości/członkostwo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 msgid "Properties for selected objects." msgstr "Właściwości zaznaczonych obiektów." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97 @@ -953,58 +964,58 @@ msgstr "Przełącz: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 msgid "Member Of" msgstr "Członek" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Role" msgstr "Rola" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:559 msgid "Change relation" msgstr "Zmień relację" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560 #, 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:564 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 msgid "Delete from relation" msgstr "Usuń z relacji" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:600 msgid "Add Properties" msgstr "Dodaj właściwości" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 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:609 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 msgid "Edit Properties" msgstr "Edytuj Właściwości" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609 msgid "Edit the value of the selected key for all objects" msgstr "Edytuj wartość wybranego klucza dla wszystkich obiektów" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 msgid "Delete Properties" msgstr "Usuń właściwość" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:77 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:293 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 @@ -1013,98 +1024,115 @@ msgstr "Usuń" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 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:766 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:763 #, 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:769 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 msgid "Properties / Memberships" msgstr "Właściwości / członkostwo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178 +msgid "Apply Changes" +msgstr "Zastosuj zmiany" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 msgid "Create new relation" msgstr "Tworzy nową relację" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208 msgid "Edit new relation" msgstr "Edytuje nową relację" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209 #, java-format msgid "Edit relation #{0}" msgstr "Modyfikuj relację #{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230 +msgid "Basic" +msgstr "Podstawowe" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Occupied By" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:325 +msgstr "Zajęte przez" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311 msgid "Tags (empty value deletes tag)" msgstr "Etykiety (ustawienie wartości na pustą usuwa etykietę)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313 msgid "Members" msgstr "Członkowie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 +msgid "Move Up" +msgstr "Przesuń w górę" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 msgid "Move the currently selected members up" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338 +msgstr "Przesuń aktualnie zaznaczonych członkół w górę" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358 +msgid "Add Selected" +msgstr "Dodaj zaznaczone" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359 +msgid "Add all currently selected objects as members" +msgstr "Dodaj wszystkie obecnie zaznaczone obiekty jako członków" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365 +msgid "Remove Selected" +msgstr "Usuń zaznaczone" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366 +msgid "Remove all currently selected objects from relation" +msgstr "Usuń wszystkie zaznaczone obiekty z relacji" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 +msgid "Move Down" +msgstr "Przesuń w dół" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 msgid "Move the currently selected members down" msgstr "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356 -msgid "Add Selected" -msgstr "Dodaj zaznaczone" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:357 -msgid "Add all currently selected objects as members" -msgstr "Dodaj wszystkie obecnie zaznaczone obiekty jako członków" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:363 -msgid "Remove Selected" -msgstr "Usuń zaznaczone" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:364 -msgid "Remove all currently selected objects from relation" -msgstr "Usuń wszystkie zaznaczone obiekty z relacji" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381 msgid "Remove the member in the current table row from this relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:405 +msgstr "Usuń z relacji członka zawartego w aktualnym wierszu tabeli z" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394 msgid "Download Members" msgstr "Pobierz członków" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:406 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395 msgid "Download all incomplete ways and nodes in relation" msgstr "Pobierz wszystkie niekompletne drogi i węzły w relacji" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:415 -msgid "Basic" -msgstr "Podstawowe" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:453 #, java-format msgid "Members: {0}" msgstr "Członkowie: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:587 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:461 +#, java-format +msgid "Relation Editor: {0}" +msgstr "Edytor relacji: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:585 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 msgid "There were conflicts during import." msgstr "Wystąpiły konfikty podczas importowania." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593 msgid "Error parsing server response." msgstr "Błąd podczas parsowania odpowiedzi serwera." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:600 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:594 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:598 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -1118,9 +1146,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:345 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 msgid "Error" msgstr "Błąd" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:599 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597 msgid "Cannot connect to server." msgstr "Nie można połączyć się z serwerem." @@ -1128,5 +1156,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87 msgid "Click Reload to refresh list" -msgstr "" +msgstr "Kliknij \"Odśwież\" by zaktualizować listę" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:90 @@ -1280,5 +1308,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:94 @@ -1288,5 +1316,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 msgid "" @@ -1355,16 +1383,24 @@ msgstr "Zaznaczenie: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +msgid "Open an editor for the selected relation" +msgstr "Otwiera okno edycji dla zaznaczonej relacji." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +msgid "Delete the selected relation" +msgstr "Usuwa zaznaczoną relację." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 #: trans_presets.java:2904 msgid "Relations" msgstr "Relacje" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 msgid "Open a list of all relations." msgstr "Otwiera listę wszystkich relacji" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 @@ -1372,17 +1408,9 @@ msgstr "Nowa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 msgid "Create a new relation" msgstr "Utwórz nową relację" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open an editor for the selected relation" -msgstr "Otwiera okno edycji dla zaznaczonej relacji." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -msgid "Delete the selected relation" -msgstr "Usuwa zaznaczoną relację." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:130 #, java-format msgid "Relations: {0}" @@ -1410,47 +1438,47 @@ msgstr "Historia poleceń: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +msgid "Resolve" +msgstr "Rozwiąż" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +msgid "Open a merge dialog of all selected items in the list above." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Conflict" msgstr "Konflikt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 msgid "Merging conflicts." msgstr "Rozwiązywanie konflików." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67 -msgid "Resolve" -msgstr "Rozwiąż" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:68 -msgid "Open a merge dialog of all selected items in the list above." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:105 -msgid "Please select something from the conflict list." -msgstr "Wybierz coś z listy konfliktów." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Resolve Conflicts" msgstr "Rozwiąż konflikty" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +msgid "Solve Conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 #, java-format msgid "Conflicts: {0}" msgstr "Konflikty: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Conflicts" msgstr "Konflikty" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 msgid "conflict" msgstr "konflikt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 msgid "background" msgstr "tło" @@ -1476,5 +1504,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 msgid "Customize Color" @@ -1482,5 +1510,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1490,5 +1518,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1497,5 +1525,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:326 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:152 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -1513,5 +1541,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:265 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 #, java-format msgid "Audio synchronized at point {0}." @@ -1519,5 +1547,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232 msgid "Unable to synchronize in layer being played." msgstr "" @@ -1538,5 +1566,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:958 msgid "desc" msgstr "opis" @@ -1558,5 +1586,5 @@ msgstr "Błąd podczas wyświetlania adresu" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -1564,5 +1592,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -1570,81 +1598,39 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224 msgid "Unable to create new audio marker." -msgstr "" +msgstr "Nie można utworzyć nowego znacznika dźwiękowego." #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 msgid "Convert to data layer" msgstr "Przekształć w warstwę danych" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:725 -msgid "" -"Upload of unprocessed GPS data as map data is considered harmful." -"
            If you want to upload traces, look here:" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:645 +msgid "" +"Upload of unprocessed GPS data as map data is considered " +"harmful.
            If you want to upload traces, look here:" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:646 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:747 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:448 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:667 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "Converted from: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612 -msgid "Upload this trace..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:616 -msgid "" -"This functionality has been added only recently. Please
            use with " -"care and check if it works as expected." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:102 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:107 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:626 -msgid "Upload track filtered by JOSM" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:103 -#, java-format -msgid "Upload raw file: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:108 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:627 -msgid "Upload raw file: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640 -msgid "Description:" -msgstr "Opis:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:123 -msgid "Tags:" -msgstr "Etykiety:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:129 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:648 -msgid "GPX-Upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:229 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:324 +msgstr "Przekonwertowany z: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:217 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113 msgid "gps point" msgstr "punkt GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 #: trans_presets.java:1795 trans_presets.java:1801 trans_presets.java:1807 #: trans_presets.java:1813 trans_presets.java:1819 trans_presets.java:1825 @@ -1665,5 +1651,5 @@ msgstr[2] "tras" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 msgid "point" msgid_plural "points" @@ -1672,5 +1658,5 @@ msgstr[2] "punktów" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 #, java-format msgid "a track with {0} point" @@ -1680,5 +1666,5 @@ msgstr[2] "trasa z {0} punktami" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} consists of {1} track" @@ -1688,5 +1674,5 @@ msgstr[2] "{0} składa się z {1} ścieżek" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} point" @@ -1696,25 +1682,25 @@ msgstr[2] "{0} punktów" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117 msgid "Customize line drawing" msgstr "Dostosuj rysowanie linii" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:296 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 msgid "Use global settings." msgstr "Użyj ustawień globalnych." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 msgid "Draw lines between points for this layer." msgstr "Rysuj linie pomiędzy punktami na tej warstwie." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:298 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123 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/RawGpsLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:135 msgid "Select line drawing options" @@ -1723,10 +1709,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 msgid "Markers From Named Points" -msgstr "" +msgstr "Znaczniki nazwanych punktów" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179 #, java-format msgid "Named Trackpoints from {0}" -msgstr "" +msgstr "Nazwane punkty GPS z {0}" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:186 @@ -1748,5 +1734,5 @@ msgstr "Pliki JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290 #, java-format msgid "{0} track, " @@ -1756,5 +1742,5 @@ msgstr[2] "{0} śladów, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 #, java-format msgid "{0} route, " @@ -1764,5 +1750,5 @@ msgstr[2] "{0} tras, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 #, java-format msgid "{0} waypoint" @@ -1772,55 +1758,51 @@ msgstr[2] "{0} punktów" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #, java-format msgid "Name: {0}" msgstr "Nazwa: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "Description: {0}" msgstr "Opis: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 msgid "Timespan: " msgstr "Okres czasu: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Length: " msgstr "Długość: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:642 -msgid "Tags (keywords in GPX):" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:655 msgid "time" msgstr "czas" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:780 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:679 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:700 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 msgid "Download from OSM along this track" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 +msgstr "Pobierz dane OSM wzdłuż tej ścieżki" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:686 msgid "Download everything within:" msgstr "Pobierz wszystko pomiędzy:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 #, java-format msgid "{0} meters" msgstr "{0} metrów" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:692 msgid "Maximum area per request:" msgstr "Maksymalny obszar na zapytanie:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 #, java-format msgid "{0} sq km" msgstr "{0} km kw." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787 #, java-format msgid "" @@ -1828,17 +1810,19 @@ "wish
            to continue?" msgstr "" -"Ta akcja będzie wymagała {0} osobnych pobrań.\r\n" -"Czy kontynuować?" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 +"Ta akcja będzie wymagała {0} osobnych pobrań.
            Czy " +"kontynuować?" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:844 #, java-format msgid "Audio markers from {0}" msgstr "Markery audio z {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 msgid "No GPX track available in layer to associate audio with." msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1049 +"Nie można znaleźć żadnej ścieżki GPX, którą by można zsynchronizować z " +"danymi dźwiękowymi." + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "" "Some waypoints with timestamps from before the start of the track were " @@ -1846,5 +1830,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -1930,5 +1914,5 @@ #, java-format msgid "There is no EXIF time within the file \"{0}\"." -msgstr "" +msgstr "Plik {0} nie zawiera żadnych danych EXIF o czasie." #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:490 @@ -1953,19 +1937,19 @@ msgstr "Podany czas nie został rozpoznany." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:140 msgid "outside downloaded area" msgstr "poza pobranym obszarem" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 #, java-format msgid "{0} consists of:" msgstr "Obiekty na warstwie {0}:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:353 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:347 #, java-format msgid " ({0} deleted.)" msgstr " ({0} usuniętych.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:445 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 msgid "Convert to GPX layer" msgstr "" @@ -1993,37 +1977,37 @@ msgstr "Zapisanie zakładek niemożliwe." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 msgid "The geographic longitude at the mouse pointer." msgstr "Długość geograficzna punktu wskazywanego przez kursor." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The name of the object at the mouse pointer." msgstr "Nazwa obiektu wskazywanego przez kursor." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 msgid "The geographic latitude at the mouse pointer." msgstr "Szerokość geograficzna punktu wskazywanego przez kursor." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The angle between the previous and the current way segment." msgstr "Kąt pomiędzy poprzednim i bieżącym segmentem tworzonej drogi." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The (compass) heading of the line segment being drawn." msgstr "Namiar (kompasowy) tworzonego odcinka." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The length of the new way segment being drawn." msgstr "Długość nowego, tworzonego odcinka." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:160 msgid "(no object)" msgstr "(brak obiektu)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:62 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:56 msgid "Color" msgstr "Kolor" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:57 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107 #: trans_presets.java:56 trans_presets.java:92 trans_presets.java:130 @@ -2124,27 +2108,36 @@ msgstr "Nazwa" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:118 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:112 #, java-format msgid "Paint style {0}: {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148 +msgstr "Styl rysowania {0}: {1}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 msgid "Choose" msgstr "Wybierz" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 msgid "Please select a color." msgstr "Proszę wybrać kolor." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 #, java-format msgid "Choose a color for {0}" msgstr "Wybierz kolor dla {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +msgid "Set to default" +msgstr "Ustaw na domyślne" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:172 +msgid "Set all to default" +msgstr "Domyślne ustawienie dla wszystkich" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:184 msgid "Colors used by different objects in JOSM." msgstr "Kolory wykorzystywane przez różne obiekty w JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:171 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:198 msgid "Colors" msgstr "Kolory" @@ -2177,27 +2170,27 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45 msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
            The password is transfered in plain text to the server, encoded in the " -"URL.
            Do not use a valuable Password." -msgstr "" -"UWAGA: Hasło jest zapisywane otwartym tekstem w pliku ustawień." -"
            Hasło jest przesyłane otwartym tekstem podczas połączenia z serwerem i " -"jest częścią adresu.
            Nie należy używać żadnych wartościowych haseł" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:45 +"WARNING: The password is stored in plain text in the preferences " +"file.
            The password is transfered in plain text to the server, encoded in " +"the URL.
            Do not use a valuable Password." +msgstr "" +"UWAGA: Hasło jest zapisywane otwartym tekstem w pliku " +"ustawień.
            Hasło jest przesyłane otwartym tekstem podczas połączenia z " +"serwerem i jest częścią adresu.
            Nie należy używać żadnych " +"wartościowych haseł" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44 msgid "Sort presets menu" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47 +msgstr "Sortuj menu szablonów" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46 msgid "Enable built-in defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:58 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69 msgid "Tagging preset source" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:68 +msgstr "Źródło szablonów" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:156 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 @@ -2205,5 +2198,5 @@ msgstr "Proszę wybrać wiersz do edycji" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500 @@ -2212,24 +2205,24 @@ msgstr "Proszę wybrać wiersz do usunięcia" +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88 +msgid "" +"The sources (URL or filename) of tagging preset definition files. See " +"http://josm.openstreetmap.de/wiki/TaggingPresets for help." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89 -msgid "" -"The sources (URL or filename) of tagging preset definition files. See http://" -"josm.openstreetmap.de/wiki/TaggingPresets for help." +msgid "Add a new tagging preset source to the list." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 -msgid "Add a new tagging preset source to the list." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 msgid "Delete the selected source from the list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:94 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93 msgid "Tagging Presets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97 msgid "Tagging preset sources" msgstr "" @@ -2244,6 +2237,6 @@ "Podczas zapisywania, pozostawia kopie zapasowe pliku dodając ~ do nazwy" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:141 @@ -2251,34 +2244,34 @@ msgstr "Wtyczki" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 msgid "Configure available plugins." msgstr "Konfiguracja dostępnych wtyczek." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43 msgid "Download List" msgstr "Pobierz listę" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:80 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51 msgid "Update" msgstr "Aktualizacja" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:60 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 msgid "Configure Sites..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add either site-josm.xml or Wiki Pages." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99 msgid "Please select an entry." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 msgid "Configure Plugin Sites" msgstr "" @@ -2454,9 +2447,9 @@ msgstr "Kalibracja urządzenia nagrywającego" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "Display Settings" msgstr "Ustawienia wyświetlania" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "" "Various settings that influence the visual representation of the whole " @@ -2464,56 +2457,64 @@ msgstr "Różnorodne ustawienia, które wpływają na wygląd programu." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings" msgstr "Ustawienia połączenia" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings for the OSM server." msgstr "Ustawienia połączenia z serwerem OSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Map Settings" msgstr "Ustawienia mapy" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Settings for the map projection and data interpretation." msgstr "Ustawienia odwzorowania kartograficznego oraz interpretacji danych." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Audio Settings" msgstr "Ustawienia audio" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Settings for the audio player and audio markers." msgstr "Ustawienia odtwarzacza audio oraz znaczników audio." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97 msgid "You have to restart JOSM for some settings to take effect." msgstr "" "Musisz ponownie uruchomić JOSM aby niektóre ustawienia stały się aktywne." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:25 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 msgid "Draw lines between raw gps points." msgstr "Rysuj linie pomiędzy punktami GPS." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:27 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 msgid "Force lines if no segments imported." msgstr "Wymuszaj rysowanie linii jeżeli nie zaimportowano odcinków." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:28 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 msgid "Draw large GPS points." msgstr "Rysuj duże punkty GPS." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 -msgid "Color tracks by velocity." -msgstr "Koloruj trasy na podstawie prędkości." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34 +msgid "Velocity (red = slow, green = fast)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 +msgid "Dilution of Position (red = high, green = low, if available)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 +msgid "Single Color (can be customized for named layers)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:1346 msgid "Car" msgstr "Samochód" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:309 trans_presets.java:635 trans_presets.java:833 #: trans_presets.java:842 trans_presets.java:851 trans_presets.java:864 @@ -2525,5 +2526,5 @@ msgstr "Rowery" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:310 trans_presets.java:637 trans_presets.java:832 #: trans_presets.java:841 trans_presets.java:850 trans_presets.java:863 @@ -2534,44 +2535,44 @@ msgstr "Ruch pieszy" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 msgid "Draw Direction Arrows" msgstr "Rysuj strzałki kierunkowe" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 msgid "Fast drawing (looks uglier)" msgstr "Szybsze rysowanie (wygląda gorzej)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180 msgid "Only interesting direction hints (e.g. with oneway tag)." msgstr "tylko jeżeli mają znaczenie (np.: dla drogi jednokierunkowej)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:186 msgid "Only on the head of a way." msgstr "Tylko na początku drogi." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44 msgid "Draw segment order numbers" msgstr "Numeruj kolejne segmenty dróg." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45 msgid "Draw boundaries of downloaded data" msgstr "Rysuj granicę obszaru pobranych danych" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46 msgid "Draw virtual nodes in select mode" msgstr "Rysuj węzły wirtualne podczas pracy w trybie zaznaczania" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47 msgid "Draw inactive layers in other color" msgstr "Zaznaczaj nieaktywne warstwy innym kolorem" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 msgid "Smooth map graphics (antialiasing)" msgstr "Wygładzaj rysowaną mapę (antyaliasing)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 msgid "" "If your gps device draws too few lines, select this to draw lines along your " @@ -2581,5 +2582,5 @@ "rysować linie wzdłuż drogi." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:71 msgid "" "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines." @@ -2588,9 +2589,9 @@ "rysować linie." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73 msgid "Maximum length (meters)" msgstr "Maksymalna długość (w metrach)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:77 msgid "" "Force drawing of lines if the imported data contain no line information." @@ -2599,15 +2600,16 @@ "liniach." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:84 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89 msgid "Draw direction arrows for lines, connecting GPS points." msgstr "Oznaczaj kierunek wszystkich odcinków, łączących punkty GPS." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90 -msgid "Draw the direction arrows using table lookups instead of complex math." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95 +msgid "" +"Draw the direction arrows using table lookups instead of complex math." msgstr "" "Rysuje strzałki kierunkowe korzystając z przygotowanych wartości zamiast " "obliczeń matematycznych." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:96 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:101 msgid "" "Don't draw arrows if they are not at least this distance away from the last " @@ -2615,50 +2617,67 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104 msgid "Minimum distance (pixels)" msgstr "Minimalna odległość (w pikselach)" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:109 -msgid "Choose the hue for the track color by the velocity at that point." -msgstr "Wybierz kolor ścieżki na podstawie prędkości w punkcie." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116 -msgid "Allows to tune the track coloring for different average speeds." -msgstr "" -"Pozwana na dostrojenie kolorowania ścieżek dla różnych prędkości średnich." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122 msgid "Draw larger dots for the GPS points." msgstr "Rysuj większe kropki dla punktów GPS." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136 +msgid "" +"All points and track segments will have the same color. Can be customized in " +"Layer Manager." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137 +msgid "Colors points and track segments by velocity." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:138 +msgid "" +"Colors points and track segments by dilution of position (HDOP). Your " +"capture device needs to logs that information." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143 +msgid "Allows to tune the track coloring for different average speeds." +msgstr "" +"Pozwana na dostrojenie kolorowania ścieżek dla różnych prędkości średnich." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148 +msgid "Track and Point Coloring" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 msgid "GPS Points" msgstr "Punkty GPS" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175 msgid "Draw direction hints for way segments." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:163 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192 msgid "Draw the order numbers of all segments within their way." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:168 -msgid "Apply antialiasing to the map view resulting in a smoother appearance." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:197 +msgid "" +"Apply antialiasing to the map view resulting in a smoother appearance." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202 msgid "Draw the boundaries of data loaded from the server." msgstr "Rysuje granice obszaru danych pobranych z serwera." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:178 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:207 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212 msgid "Draw the inactive data layers in a different color." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219 msgid "OSM Data" msgstr "Dane OSM" @@ -2719,5 +2738,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:39 msgid "Setting Preference entries directly. Use with caution!" -msgstr "Bezpośrednie, ręczne ustawianie preferencji. Należy używać ostrożnie!" +msgstr "" +"Bezpośrednie, ręczne ustawianie preferencji. Należy używać ostrożnie!" #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:55 @@ -2768,6 +2788,6 @@ "a menu entry of button for the first time. So some of your changes may " "become active even without restart --- but also without collistion handling. " -"This is another reason to restart JOSM after making any changes here." -"

            " +"This is another reason to restart JOSM after making any changes " +"here.

            " msgstr "" @@ -2780,8 +2800,9 @@ "key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also " "there will be 'keys' listed that correspond to a shortcut on your keyboard " -"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/" -"Semicolon on US keyboards, '.'/Period on German keyboards, ...) instead. Not " -"doing so may result in conflicts, as there is no way for JOSM to know that " -"Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...

            " +"(e.g. ':'/Colon). Please also do not use them, use the base key " +"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) " +"instead. Not doing so may result in conflicts, as there is no way for JOSM " +"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US " +"keyboard...

            " msgstr "" @@ -2805,6 +2826,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183 msgid "" -"

            The pseudo-modifier 'disabled' will disable the shortcut when encountered." -"

            " +"

            The pseudo-modifier 'disabled' will disable the shortcut when " +"encountered.

            " msgstr "" @@ -2874,10 +2895,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:231 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:236 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:250 msgid "layer not in list." msgstr "warstwa nie jest na liście." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -2885,57 +2906,57 @@ "Nie udało się odnaleźć tłumaczenia dla języka: {0}. Użyty zostanie {1}." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "usage" msgstr "użycie" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 msgid "options" msgstr "opcje" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 msgid "Show this help" msgstr "Wyświetl tę pomoc" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +msgid "Standard unix geometry argument" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +msgid "Download the bounding box" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 -msgid "Standard unix geometry argument" +msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 -msgid "Download the bounding box" +msgid "Open file (as raw gps, if .gpx)" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 -msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" +msgid "Download the bounding box as raw gps" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 -msgid "Open file (as raw gps, if .gpx)" +msgid "Select with the given search" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 -msgid "Download the bounding box as raw gps" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 -msgid "Select with the given search" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 msgid "Don't launch in fullscreen mode" msgstr "Nie uruchamiaj w trybie pełnoekranowym" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 msgid "Reset the preferences to default" msgstr "Przywróć domyślne ustawienia" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 msgid "Set the language." msgstr "Ustaw język" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 msgid "examples" msgstr "przykłady" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -2943,21 +2964,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 msgid "Instead of --download= you may specify osm://\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 msgid "Activating updated plugins" msgstr "Aktywacja zaktualizowanych wtyczek" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 msgid "Loading early plugins" msgstr "Ładowanie wczesnych wtyczek" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Setting defaults" msgstr "Zapisywanie domyślnych ustawień" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171 msgid "Loading plugins" msgstr "Ładowanie wtyczek" @@ -2991,6 +3012,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:108 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:164 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:162 #: trans_presets.java:308 trans_presets.java:309 trans_presets.java:310 #: trans_presets.java:311 trans_presets.java:312 trans_presets.java:313 @@ -3007,5 +3028,5 @@ msgstr "nieznany" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:66 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 #, java-format msgid "" @@ -3016,25 +3037,25 @@ "potrzebna." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 #, java-format msgid "Plugin requires JOSM update: {0}." msgstr "Plugin wymaga aktualizacji JOSM: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "Nie znaleziono wtyczki {0} wymaganej przez wtyczkę {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 #, java-format msgid "Plugin not found: {0}." msgstr "Nie znaleziono wtyczki: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Wtyczkę ostanio zaktualizowano przed {0} dniami." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 msgid "" "(You can change the number of days after which this warning appears
            by " @@ -3044,17 +3065,17 @@ "ustawienie opcji konfiguracyjnej 'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 msgid "Disable plugin" msgstr "Zablokuj wtyczkę" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Nie można załadować wtyczki {0}. Czy usunąć ją z preferencji?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -3064,18 +3085,18 @@ "uprawnienia aby nadpisać istniejące pliki." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 #, java-format msgid "" "An unexpected exception occurred that may have come from the ''{0}'' plugin." msgstr "" -"Wystąpił niespodziewany błąd, który mógł być spowodowany przez wtyczkę \"{0}" -"\"." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:259 +"Wystąpił niespodziewany błąd, który mógł być spowodowany przez wtyczkę " +"\"{0}\"." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Zgodnie z informacją zawartą w tej wtyczce jej autorem jest {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:262 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -3084,9 +3105,9 @@ "błędu." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 msgid "Should the plugin be disabled?" msgstr "Czy ta wtyczka ma zostać zablokowana?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:278 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -3096,5 +3117,5 @@ "wyładować wtyczkę." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -3104,6 +3125,6 @@ "autorom JOSM." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:322 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:181 msgid "no description available" msgstr "brak opisu" @@ -3115,5 +3136,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 msgid "Update Plugins" msgstr "Aktualizacja wtyczek" @@ -3133,6 +3154,8 @@ msgid "{0} Plugin successfully updated. Please restart JOSM." msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -msgstr[0] "{0} wtyczka została zaktualizowana. Proszę ponownie uruchomić JOSM." -msgstr[1] "{0} wtyczki zostały zaktualizowane. Proszę ponownie uruchomić JOSM." +msgstr[0] "" +"{0} wtyczka została zaktualizowana. Proszę ponownie uruchomić JOSM." +msgstr[1] "" +"{0} wtyczki zostały zaktualizowane. Proszę ponownie uruchomić JOSM." msgstr[2] "" "{0} wtyczek zostało zaktualizowanych. Proszę ponownie uruchomić JOSM." @@ -3151,5 +3174,5 @@ "automatycznie." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 #, java-format msgid "Downloaded plugin information from {0} site" @@ -3159,13 +3182,13 @@ msgstr[2] "Pobrano informacje o wtyczce z {0} serwerów" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 msgid "No plugin information found." msgstr "Nie znaleziono informacji o wtyczce." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:76 msgid "All installed plugins are up to date." msgstr "Wszystkie zainstalowane wtyczki są aktualne." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 #, java-format msgid "" @@ -3178,9 +3201,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:105 msgid "Download missing plugins" msgstr "Pobierz brakujące wtyczki" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:106 #, java-format msgid "" @@ -3193,22 +3216,22 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 msgid "Download Plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:170 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:168 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Wersja {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:176 msgid "Plugin bundled with JOSM" msgstr "Wtyczka dostarczana wraz z JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208 msgid "Plugin already exists" msgstr "Wtyczka już istnieje" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:211 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:209 #, java-format msgid "" @@ -3223,15 +3246,15 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 msgid "Delete and Download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:222 #, java-format msgid "Error deleting plugin file: {0}" msgstr "Błąd podczas usuwania wtyczki: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:281 #, java-format msgid "Error reading plugin information file: {0}" @@ -3299,10 +3322,10 @@ msgstr "Usuń {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:165 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 msgid "Conflicting relation" msgstr "Sprzeczne relacje" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 #, java-format msgid "" @@ -3311,5 +3334,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:166 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 #, java-format msgid "" @@ -3324,7 +3347,7 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:349 msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
            This can cause problems because other objects (that you don't see) might " -"use them.
            Do you really want to delete?" +"You are about to delete nodes outside of the area you have " +"downloaded.
            This can cause problems because other objects (that you don't " +"see) might use them.
            Do you really want to delete?" msgstr "" @@ -3447,124 +3470,135 @@ msgstr "Pobranie preferencji z serwera nie powiodło się." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:232 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:426 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:428 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:527 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:765 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:776 msgid "Empty member in relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:767 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:531 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:547 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:552 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:549 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:558 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:561 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 +msgid "More than one \"via\" found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 #, java-format msgid "Unknown role ''{0}''." msgstr "Nieznana rola \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 #, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 msgid "No \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 msgid "No \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -msgid "No \"via\" node found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +msgid "No \"via\" node or way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:636 -#, java-format -msgid "The \"{0}\" way must contain at least 2 nodes." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:731 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +msgid "The \"to\" way doesn't start or end at a \"via\" node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:620 +msgid "The \"from\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:624 +msgid "The \"to\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:742 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:847 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:858 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:949 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:987 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:998 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1012 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1023 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1195 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1206 msgid "untagged" msgstr "nieotagowany" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1196 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207 msgid "text" msgstr "tekst" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" msgstr "nieaktywne" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:94 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:181 @@ -3572,13 +3606,13 @@ msgstr "zaznaczony" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" msgstr "nieotagowana droga" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 msgid "incomplete way" msgstr "niekompletna droga" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 msgid "highlight" msgstr "" @@ -3600,5 +3634,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:113 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:89 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:77 msgid "incomplete" @@ -3629,14 +3663,14 @@ msgstr[2] "{0} elementów" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 msgid "Duplicate" msgstr "Powiel" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 msgid "Duplicate selection by copy and immediate paste." msgstr "Powiela zaznaczone obiekty." -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 @@ -3645,5 +3679,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -3714,7 +3748,9 @@ msgstr "Wyświetla historyczne informacje na temat dróg i węzłów OSM." -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:57 -msgid "Please select at least one node, way or relation." -msgstr "Proszę wybierz przynajmniej jeden węzeł, drogę lub relację." +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:60 +msgid "" +"Please select at least one node, way or relation. Only already uploaded " +"elements have a history." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 @@ -3736,7 +3772,7 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/TerracerAction.java:47 @@ -3873,5 +3909,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:123 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:314 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:315 msgid "Enter values for all conflicts." msgstr "" @@ -3879,5 +3915,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 msgid "Solve Conflicts" msgstr "" @@ -4011,5 +4047,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #, java-format @@ -4037,15 +4073,19 @@ msgstr[2] "Wybrane węzły nie są w środku żadnej drogi." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125 -msgid "" -"There is more than one way using the node(s) you selected. Please select the " +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 +msgid "" +"There is more than one way using the node you selected. Please select the " "way also." -msgstr "Więcej niż jedna droga używa wybranych węzłów. Wybierz także tą drogę." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133 +msgid_plural "" +"There is more than one way using the nodes you selected. Please select the " +"way also." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137 msgid "The selected nodes do not share the same way." msgstr "Wybrane węzły nie współdzielą tej samej trasy." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -4054,10 +4094,10 @@ msgstr[2] "Wybrana droga nie zawiera wszystkich wybranych węzłów." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229 msgid "You must select two or more nodes to split a circular way." msgstr "Musisz wybrać dwa lub więcej węzłów aby rozdzielić drogę okrężną." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -4067,5 +4107,5 @@ "węzły w środku drogi.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 msgid "" "A role based relation membership was copied to all new ways.\n" @@ -4073,5 +4113,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:296 #, java-format msgid "Split way {0} into {1} parts" @@ -4325,5 +4365,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "\"Baker Street\" - 'Baker Street' w dowolnym kluczu lub nazwie." +msgstr "" +"\"Baker Street\" - 'Baker Street' w dowolnym kluczu lub nazwie." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 @@ -4460,5 +4501,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 msgid "Align Nodes in Circle" msgstr "Wyrównaj węzły na kole" @@ -4472,5 +4513,5 @@ msgstr "Niektóre z węzłów są (prawie) w jednej linii" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 msgid "Please select at least four nodes." msgstr "Wybierz co najmniej cztery węzły." @@ -4535,4 +4576,32 @@ msgstr "Wystąpił błąd podczas przywracania pliku kopii zapasowej." +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "" +"Show status report with useful information that can be attached to bugs" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92 +msgid "Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +msgid "Copy to clipboard and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 +msgid "Close" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 @@ -4544,13 +4613,13 @@ msgstr "Powtarza ostatnio wycofaną czynność." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:44 msgid "Delete Mode" msgstr "Tryb kasowania" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:46 msgid "Delete nodes or ways." msgstr "Usuwanie węzłów lub dróg." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:84 @@ -4561,5 +4630,5 @@ msgstr "Tryb: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:130 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -4571,6 +4640,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:87 msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." +"Drag play head and release near track to play audio from there; " +"SHIFT+release to synchronize audio at that point." msgstr "" @@ -4584,23 +4653,23 @@ msgstr "Tworzenie obszarów." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 msgid "Extrude Way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:252 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:416 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:430 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 msgid "Draw a rectangle of the desired size, then release the mouse button." msgstr "Narysuj prostokąt pożądanych rozmiarów i zwolnij przycisk myszy." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:420 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:434 msgid "Release the mouse button to stop rotating." msgstr "Zwolnij przycisk myszy aby zakończyć obracanie." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 msgid "Drag a way segment to make a rectangle." msgstr "Narysuj odcinek aby utworzyć prostokąt." @@ -4668,14 +4737,14 @@ msgstr "Wybieranie, przesuwanie i obracanie obiektów" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:191 msgid "Add and move a virtual new node to way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:220 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:223 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 msgid "Cannot move objects outside of the world." msgstr "Nie można przenieść zaznaczonych obiektów poza świat." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:418 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:432 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -4684,5 +4753,5 @@ "najbliższym węzłem." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:422 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:436 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to remove); Shift-" @@ -4706,6 +4775,6 @@ "move zoom with right button" msgstr "" -"Powiększaj przeciągając lub przez Ctrl+. lub Ctrl+,; przesuwanie - Ctrl" -"+góra, lewo, dół, prawo; przesuń powiększenie prawym przyciskiem" +"Powiększaj przeciągając lub przez Ctrl+. lub Ctrl+,; przesuwanie - " +"Ctrl+góra, lewo, dół, prawo; przesuń powiększenie prawym przyciskiem" #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22 @@ -4740,5 +4809,6 @@ "The selected nodes have differing relation memberships. Do you still want " "to merge them?" -msgstr "Wybrane węzły są częścią różnych relacji. Czy nadal chcesz je scalić." +msgstr "" +"Wybrane węzły są częścią różnych relacji. Czy nadal chcesz je scalić." #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 @@ -4757,22 +4827,22 @@ msgstr "Scal {0} węzłów" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Orthogonalize Shape" msgstr "Korekta prostopadłości" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 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:60 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 msgid "Only two nodes allowed" msgstr "Dozwolone są tylko dwa węzły" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 msgid "Selection must consist only of ways." msgstr "Zaznaczenie musi składać się wyłącznie z dróg." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 msgid "Please select one or more closed ways of at least four nodes." msgstr "" @@ -4780,10 +4850,10 @@ "czterech węzłach." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 msgid "Please select ways with almost right angles to orthogonalize." msgstr "" "Wybierz drogi o kątach prawie prostych aby skorygować ich prostopadłość." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 msgid "" "You are using the EPSG:4326 projection which might lead
            to " @@ -4792,9 +4862,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "Only one node selected" msgstr "Wybrano tylko jeden węzeł" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 msgid "Orthogonalize" msgstr "Korekta prostopadłości" @@ -4845,5 +4915,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101 -msgid "Please select exactly three nodes or one way with exactly three nodes." +msgid "" +"Please select exactly three nodes or one way with exactly three nodes." msgstr "" "Wybierz proszę dokładnie trzy węzły lub jedną drogę z dokładnie trzema " @@ -4854,52 +4925,69 @@ msgstr "Wybrane węzły nie tworzą okręgu." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../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:71 +msgid "Update Data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:72 +#, java-format +msgid "" +"This action will require {0} individual download requests. Do you wish to " +"continue?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 msgid "Open Location..." msgstr "Otwórz adres..." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 msgid "Open an URL." msgstr "Otwórz plik." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 msgid "Separate Layer" msgstr "Osobna wartwa" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 msgid "Enter URL to download:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 msgid "Download Location" msgstr "Pobierz dane." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 msgid "Download URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 msgid "Add Node..." msgstr "Dodaj węzeł..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 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:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 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:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 msgid "Use decimal degrees." msgstr "Użyj stopni dziesiętnych." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 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:62 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 #: ../plugins/livegps/livegps/LiveGpsDialog.java:54 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93 @@ -4908,5 +4996,5 @@ msgstr "Szerokość" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 #: ../plugins/livegps/livegps/LiveGpsDialog.java:56 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96 @@ -4949,14 +5037,14 @@ msgstr "Przesuwa obiekty {0}" +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "Overwrite" msgstr "Zastąp" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "File exists. Overwrite?" msgstr "Plik istnieje. Nadpisać?" @@ -4975,44 +5063,49 @@ msgstr "Proszę wybrać coś do skopiowania." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Rozdziel drogi" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "Powiela węzły które używane są przez różne drogi." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 msgid "This node is not glued to anything else." msgstr "Ten węzeł nie jest przyklejony do niczego więcej." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 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:90 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 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:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 msgid "The current selection cannot be used for unglueing." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "Select either:" msgstr "Wybierz przynajmniej:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +msgid "* One tagged node, or" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 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:103 -msgid "* One node that is used by more than one way and one of those ways, or" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +msgid "" +"* One node that is used by more than one way and one of those ways, or" msgstr "" "* Jeden węzeł, który jest użyty przez więcej niż jedną drogę oraz jedną z " "tych dróg lub" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -5021,5 +5114,5 @@ "drogę, lub" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -5028,5 +5121,5 @@ "niż jedną drogę." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -5036,10 +5129,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:160 +msgid "Unglued Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:373 #, java-format msgid "Dupe into {0} nodes" msgstr "Rozmnóż w {0} węzłów" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:320 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:397 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -5140,5 +5237,5 @@ msgstr "Cofa ostatnią czynność." -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 msgid "No Shortcut" msgstr "Brak skrótu" @@ -5160,13 +5257,13 @@ msgstr "dane OpenSteetMap" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:29 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:28 msgid "Downloading GPS data" msgstr "Pobieranie danych GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:41 msgid "Downloaded GPX Data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:71 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:69 msgid "Raw GPS data" msgstr "czyste dane GPS" @@ -5389,5 +5486,6 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169 -msgid "Header contains several values and cannot be mapped to a single string" +msgid "" +"Header contains several values and cannot be mapped to a single string" msgstr "" @@ -5443,5 +5541,6 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96 msgid "Open the OpenStreetBugs window and activate the automatic download" -msgstr "Otwiera okno OpenStreetBugs i aktywuje automatyczne pobieranie danych" +msgstr "" +"Otwiera okno OpenStreetBugs i aktywuje automatyczne pobieranie danych" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114 @@ -5739,5 +5838,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69 -msgid "Maximum number of segments allowed in each generated way. Default 250." +msgid "" +"Maximum number of segments allowed in each generated way. Default 250." msgstr "" @@ -5756,6 +5856,7 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72 msgid "" -"Accuracy of Douglas-Peucker line simplification, measured in degrees." -"
            Lower values give more nodes, and more accurate lines. Default 0.0003." +"Accuracy of Douglas-Peucker line simplification, measured in " +"degrees.
            Lower values give more nodes, and more accurate lines. Default " +"0.0003." msgstr "" @@ -6386,6 +6487,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:509 msgid "" -"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." -"org/index.php/User:JLS/speller) or tag checking data files." +"The sources (URL or filename) of spell check (see " +"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking " +"data files." msgstr "" @@ -6841,6 +6943,6 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:40 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:43 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 #, java-format @@ -6848,18 +6950,29 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:51 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:55 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 msgid "Contacting WMS Server..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157 msgid "Create buildings" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 msgid "CadastreGrabber: Illegal url." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +msgid "" +"To avoid cadastre WMS overload,\n" +"building import size is limited to 1 km2 max." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" @@ -6882,16 +6995,25 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:128 +msgid "Cadastre" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:139 +msgid "Auto sourcing" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164 +msgid "Invalid projection" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 +#, java-format +msgid "Change the projection to {0} first." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:169 msgid "" "To enable the cadastre WMS plugin, change\n" "the JOSM projection to Lambert and restart" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132 -msgid "Cadastre" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 -msgid "Auto sourcing" msgstr "" @@ -6964,6 +7086,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:43 msgid "" -"More than one WMS layer present.\n" -"Select one of them first, then retry." +"More than one WMS layer present\n" +"Select one of them first, then retry" msgstr "" @@ -6972,5 +7094,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136 #, java-format @@ -6981,13 +7103,13 @@ msgstr[2] "Uprość drogę (usuń {0} węzly)" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61 msgid "Extract SVG ViewBox..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65 msgid "Extract best fitting boundary..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:120 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126 msgid "Create boundary" msgstr "" @@ -7023,15 +7145,15 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 msgid "Save WMS layer to file" msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "Load WMS layer from file" msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -7039,5 +7161,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 msgid "File Format Error" msgstr "Błędny format pliku" @@ -7045,5 +7167,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 msgid "Error loading file" msgstr "Błąd podczas ładowania pliku" @@ -7069,52 +7191,53 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 msgid "Replace original background by JOSM background color." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30 msgid "Reverse grey colors (for black backgrounds)." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 msgid "Set background transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34 msgid "Draw boundaries of downloaded data." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Enable automatic caching." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:53 -msgid "" -"A special handler of the french cadastre wms at www.cadastre.gouv." -"fr

            Please read the Terms and Conditions of Use here (in french): " -"
            http://www.cadastre.gouv.fr/scpc/html/" -"CU_01_ConditionsGenerales_fr.html
            before any upload of data created " -"by this plugin." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:58 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:55 +msgid "" +"A special handler of the french cadastre wms at " +"www.cadastre.gouv.fr

            Please read the Terms and Conditions of Use here " +"(in french):
            " +"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " +"
            before any upload of data created by this plugin." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -7122,26 +7245,40 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 -msgid "" -"Invert the original texts from black to white (and all intermediate greys)." +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +msgid "" +"Invert the original black and white colors (and all intermediate greys). " +"Useful for texts on dark backgrounds." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 +msgid "Allows multiple layers stacking" msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 -msgid "Allows multiple layers stacking" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:99 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:113 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 msgid "Image grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:162 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:125 +msgid "Grab smaller images (higher quality but use more memory)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +msgid "Fixed size square (default is 100m)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +msgid "Fixed size (from 25 to 1000 meters)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -7250,5 +7387,5 @@ msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:254 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:255 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -7393,7 +7530,7 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:203 msgid "" -"Take a photo of your GPS receiver while it displays the time." -"
            Display that photo here.
            And then, simply capture the time you read " -"on the photo and select a timezone
            " +"Take a photo of your GPS receiver while it displays the " +"time.
            Display that photo here.
            And then, simply capture the time you " +"read on the photo and select a timezone
            " msgstr "" @@ -7460,5 +7597,6 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:484 -msgid "I can take a picture of my GPS receiver.
            Can this help?" +msgid "" +"I can take a picture of my GPS receiver.
            Can this help?" msgstr "" @@ -7502,5 +7640,5 @@ msgstr "Nieprawidłowa strefa czasowa" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #, java-format msgid "" @@ -7509,14 +7647,14 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:579 msgid "Invalid offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:641 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:643 #, java-format msgid "Found {0} matchs of {1} in GPX track {2}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:642 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:644 msgid "GPX Track loaded" msgstr "Ślad GPX wczytany" @@ -7524,5 +7662,5 @@ #: ../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/UploadDataGui.java:79 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 msgid "Upload Traces" msgstr "Wyślij ślady" @@ -7532,58 +7670,72 @@ msgstr "Wysyła ślady do openstreetmap.org" +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71 +msgid "Upload Trace" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +msgid "Public" +msgstr "" + #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 -msgid "Upload GPX track" -msgstr "Wyślij ślad GPX" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -msgid "Public" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 msgid "Selected makes your trace public in openstreetmap.org" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Description" msgstr "Opis" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:123 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 msgid "Tags" msgstr "Etykiety" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:182 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:153 +#, java-format +msgid "Selected track: {0}" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:176 msgid "Connecting..." msgstr "Łączenie..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 -msgid "Uploading GPX track..." -msgstr "Wysyłanie śladu GPX..." - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:214 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:199 +msgid "Upload cancelled" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:209 +msgid "Error while uploading" +msgstr "Błąd podczas wysyłania" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "Wysyłanie GPX zakończone sukcesem" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:227 -msgid "Error while uploading" -msgstr "Błąd podczas wysyłania" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:235 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +msgid "Upload failed. Server returned the following message: " +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 +#, java-format +msgid "Uploading GPX track: {0}% ({1} of {2})" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "Nie podano opisu. Proszę podać jakiś opis." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:252 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "Nie wybrano żadnej warstwy GPX. Nie można wysłać sladu." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:241 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "Nie podano nazwy użytkownika." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:244 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "Nie podano hasła." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "Wysyłanie śladu GPX" @@ -7806,32 +7958,32 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:232 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241 msgid "Change resolution" msgstr "Zmiana rozdzielczości" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:253 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:264 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:271 msgid "Alpha channel" msgstr "" @@ -12698,10 +12850,23 @@ msgstr "do drogi" +#~ msgid "Please select something from the conflict list." +#~ msgstr "Wybierz coś z listy konfliktów." + #~ msgid "Please select objects for which you want to change properties." #~ msgstr "Zaznacz obiekty, dla których chcesz zmienić właściwości." +#~ msgid "Description:" +#~ msgstr "Opis:" + +#~ msgid "Tags:" +#~ msgstr "Etykiety:" + +#~ msgid "Choose the hue for the track color by the velocity at that point." +#~ msgstr "Wybierz kolor ścieżki na podstawie prędkości w punkcie." + #~ msgid "Unknown type" #~ msgstr "Nieznany typ" +#, java-format #~ msgid "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..." #~ msgstr "Przesyłane: {0} {1} (id: {2}) {3}% {4}/{5} (pozostało {6})..." @@ -12728,4 +12893,5 @@ #~ msgstr "Obiekty naturalne" +#, java-format #~ msgid "Version {0} - Last change at {1}" #~ msgstr "Wersja {0} - ostatnia zmiana {1}" @@ -12733,2 +12899,5 @@ #~ msgid "Download \"Message of the day\"" #~ msgstr "Pobieranie \"wiadomości dnia\"" + +#~ msgid "Upload GPX track" +#~ msgstr "Wyślij ślad GPX" Index: /applications/editors/josm/i18n/po/ro.po =================================================================== --- /applications/editors/josm/i18n/po/ro.po (revision 13832) +++ /applications/editors/josm/i18n/po/ro.po (revision 13833) @@ -8,6 +8,6 @@ "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-15 22:03+0100\n" -"PO-Revision-Date: 2009-02-14 15:23+0000\n" +"POT-Creation-Date: 2009-02-21 16:35+0100\n" +"PO-Revision-Date: 2009-02-21 16:10+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Romanian \n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 " "== 0) && (n != 0))) ? 2: 1));\n" -"X-Launchpad-Export-Date: 2009-02-15 20:40+0000\n" +"X-Launchpad-Export-Date: 2009-02-22 20:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: ROMANIA\n" @@ -23,5 +23,5 @@ "X-Poedit-SourceCharset: utf-8\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 #, java-format msgid "" @@ -31,5 +31,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 msgid "" "This action will have no shortcut.\n" @@ -37,5 +37,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -44,5 +44,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "" @@ -53,17 +53,17 @@ #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 msgid "Information" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Do nothing" msgstr "Nu fă nimic" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Report Bug" msgstr "Raportează eroarea" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 msgid "" "An unexpected exception occurred.\n" @@ -73,18 +73,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Unexpected Exception" msgstr "Excepţie netratată" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 #, java-format msgid "Please report a ticket at {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:78 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -92,9 +92,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Be sure to include the following information:" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75 msgid "(The text has already been copied to your clipboard.)" msgstr "" @@ -108,5 +108,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:94 @@ -114,5 +114,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:48 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:32 @@ -120,10 +120,10 @@ msgstr "Descarc datele OSM..." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 msgid "NullPointerException, possibly some missing tags." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83 msgid "Preparing data..." msgstr "Pregătesc datele..." @@ -149,48 +149,48 @@ msgstr "Descarc punctele {0} până la {1}..." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:164 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:168 msgid "Unknown version" msgstr "Versiune necunoscută" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 msgid "Found element in non-way." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 msgid " has zero ref" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 msgid "Found element in non-relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:252 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250 msgid "Incomplete specification with ref=0" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294 msgid "Illegal object with id=0" msgstr "Obiect ilegal cu id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 #, java-format msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:502 msgid "Prepare OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:518 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:516 msgid "Ill-formed node id" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:280 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:287 msgid "Parse error: invalid document structure for gpx document" msgstr "" @@ -200,18 +200,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 msgid "Provide a brief comment for the changes you are uploading:" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 msgid "Commit comment" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64 @@ -221,34 +221,32 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:192 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190 msgid "Opening changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:226 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224 msgid "Server does not support changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:246 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:428 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:609 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:184 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607 msgid "Unknown host" msgstr "Gazdă necunoscută" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282 msgid "Preparing..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:294 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292 msgid "Uploading..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375 msgid "Closing changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:652 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650 msgid "Transfer aborted due to error (will wait for 5 seconds):" msgstr "" @@ -286,17 +284,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95 #: ../core/src/org/openstreetmap/josm/Main.java:348 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:29 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 @@ -309,11 +310,11 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:110 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -328,11 +329,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:186 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 msgid "Creating main GUI" msgstr "" #: ../core/src/org/openstreetmap/josm/Main.java:195 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:271 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:278 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:56 msgid "Help" @@ -376,21 +377,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109 msgid "min lat" msgstr "min lat" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111 msgid "min lon" msgstr "min lon" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:117 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "max lat" msgstr "max lat" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 msgid "max lon" msgstr "max lon" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:122 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -398,5 +399,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:134 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130 msgid "Bounding Box" msgstr "" @@ -432,6 +433,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:96 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:894 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:956 msgid "name" msgstr "" @@ -464,5 +465,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:107 msgid "" "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -470,5 +471,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:109 msgid "Slippy map" msgstr "" @@ -479,7 +480,7 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:605 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:602 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:89 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -499,5 +500,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380 msgid "Remove" msgstr "Elimină" @@ -632,20 +633,20 @@ msgstr "Dacă este specificat, resetează configuraţia în loc de a o citi." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:109 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:186 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:198 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:108 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:191 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:203 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 msgid "Java OpenStreetMap Editor" msgstr "Java OpenStreetMap Editor" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:111 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:110 msgid "Message of the day not available" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:200 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:205 msgid "Downloading \"Message of the day\"" msgstr "" @@ -685,33 +686,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:234 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:474 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:512 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:383 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:380 msgid "More information about this feature" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:393 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:390 msgid "Optional Attributes:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:437 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:438 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:435 #, java-format msgid "Use preset ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 msgid "way" @@ -721,11 +722,11 @@ msgstr[2] "de căi" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:214 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 msgid "node" msgid_plural "nodes" @@ -734,6 +735,6 @@ msgstr[2] "de noduri" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:81 @@ -743,30 +744,30 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:475 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 #, java-format msgid "Unknown type: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:549 +#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 +#, java-format +msgid "Could not read tagging preset source: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 -#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 -#, java-format -msgid "Could not read tagging preset source: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:555 #, java-format msgid "Error parsing {0}: " msgstr "Eroare la prelucrarea {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:572 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:569 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595 #, java-format msgid "Change {0} object" @@ -776,9 +777,17 @@ msgstr[2] "Schimb {0} de obiecte" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 msgid "Nothing selected!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 +msgid "Selection unsuitable!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +msgid "Apply Preset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 msgid "Change Properties" msgstr "Modificare proprietăţi" @@ -789,14 +798,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:107 msgid "File" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:135 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:107 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:86 @@ -808,22 +817,22 @@ msgstr "Editare" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 msgid "View" msgstr "Vizualizare" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:26 msgid "Tools" msgstr "Unelte" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:141 msgid "Audio" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:142 msgid "Presets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:40 @@ -835,18 +844,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:210 msgid "Wireframe View" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212 msgid "Toggle Wireframe view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:28 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 msgid "Contacting the OSM server..." msgstr "Contactez serverul OSM..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 #, java-format msgid "This will change up to {0} object." @@ -855,11 +864,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 msgid "An empty value deletes the key." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66 @@ -869,7 +878,7 @@ msgstr "Cheie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 @@ -878,10 +887,10 @@ msgstr "Valoare" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333 msgid "Change values?" msgstr "Schimb valorile?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:257 #, java-format msgid "Change properties of up to {0} object" @@ -890,34 +899,34 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 msgid "Please select a key" msgstr "Vă rog selectaţi o cheie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321 msgid "Please select a value" msgstr "Vă rog selectaţi o valoare" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:445 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:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 msgid "Properties/Memberships" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 msgid "Properties for selected objects." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97 @@ -929,58 +938,58 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 msgid "Member Of" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:559 msgid "Change relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560 #, java-format msgid "Really delete selection from relation {0}?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 msgid "Delete from relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:600 +msgid "Add Properties" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 -msgid "Add Properties" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 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:606 +msgid "Edit Properties" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609 -msgid "Edit Properties" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 msgid "Edit the value of the selected key for all objects" msgstr "Editează valoarea cheii selectata pentru toate obiectele" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 msgid "Delete Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:77 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:293 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 @@ -989,98 +998,115 @@ msgstr "Şterge" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 msgid "Delete the selected key in all objects" msgstr "Şterge cheia selectată din toate obiectele" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:763 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:769 msgid "Properties / Memberships" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178 +msgid "Apply Changes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 msgid "Create new relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208 msgid "Edit new relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209 #, java-format msgid "Edit relation #{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230 +msgid "Basic" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Occupied By" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311 msgid "Tags (empty value deletes tag)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313 msgid "Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 +msgid "Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 msgid "Move the currently selected members up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358 +msgid "Add Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359 +msgid "Add all currently selected objects as members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365 +msgid "Remove Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366 +msgid "Remove all currently selected objects from relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 +msgid "Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 msgid "Move the currently selected members down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356 -msgid "Add Selected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:357 -msgid "Add all currently selected objects as members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:363 -msgid "Remove Selected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:364 -msgid "Remove all currently selected objects from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381 msgid "Remove the member in the current table row from this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394 msgid "Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:406 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395 msgid "Download all incomplete ways and nodes in relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:415 -msgid "Basic" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:453 #, java-format msgid "Members: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:587 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:461 +#, java-format +msgid "Relation Editor: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:585 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 msgid "There were conflicts during import." msgstr "Au existat conflicte în timpul importului." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593 msgid "Error parsing server response." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:600 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:594 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:598 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -1094,9 +1120,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:345 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 msgid "Error" msgstr "Eroare" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:599 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597 msgid "Cannot connect to server." msgstr "" @@ -1257,5 +1283,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:94 @@ -1265,5 +1291,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 msgid "" @@ -1331,16 +1357,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +msgid "Open an editor for the selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +msgid "Delete the selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 #: trans_presets.java:2904 msgid "Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 msgid "Open a list of all relations." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 @@ -1348,17 +1382,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 msgid "Create a new relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open an editor for the selected relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -msgid "Delete the selected relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:130 #, java-format msgid "Relations: {0}" @@ -1386,49 +1412,49 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +msgid "Resolve" +msgstr "Rezolvă" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +msgid "Open a merge dialog of all selected items in the list above." +msgstr "" +"Deschide un dialog de îmbinare a tuturor elementelor selectate din lista de " +"mai sus." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Conflict" msgstr "Conflict" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 msgid "Merging conflicts." msgstr "Îmbin conflictele." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67 -msgid "Resolve" -msgstr "Rezolvă" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:68 -msgid "Open a merge dialog of all selected items in the list above." -msgstr "" -"Deschide un dialog de îmbinare a tuturor elementelor selectate din lista de " -"mai sus." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:105 -msgid "Please select something from the conflict list." -msgstr "Vă rog selectaţi ceva din lista de conflicte." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Resolve Conflicts" msgstr "Rezolvare conflicte" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +msgid "Solve Conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 #, java-format msgid "Conflicts: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Conflicts" msgstr "Conflicte" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 msgid "conflict" msgstr "conflict" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 msgid "background" msgstr "fundal" @@ -1452,5 +1478,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 msgid "Customize Color" @@ -1458,5 +1484,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1466,5 +1492,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1473,5 +1499,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:326 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:152 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -1489,5 +1515,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:265 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 #, java-format msgid "Audio synchronized at point {0}." @@ -1495,5 +1521,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232 msgid "Unable to synchronize in layer being played." msgstr "" @@ -1514,5 +1540,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:958 msgid "desc" msgstr "" @@ -1534,5 +1560,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -1540,5 +1566,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -1546,81 +1572,39 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224 msgid "Unable to create new audio marker." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 msgid "Convert to data layer" msgstr "Converteşte la strat de date" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:725 -msgid "" -"Upload of unprocessed GPS data as map data is considered harmful." -"
            If you want to upload traces, look here:" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:645 +msgid "" +"Upload of unprocessed GPS data as map data is considered " +"harmful.
            If you want to upload traces, look here:" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:646 msgid "http://www.openstreetmap.org/traces" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:747 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:448 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:667 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "Converted from: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612 -msgid "Upload this trace..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:616 -msgid "" -"This functionality has been added only recently. Please
            use with " -"care and check if it works as expected." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:102 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:107 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:626 -msgid "Upload track filtered by JOSM" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:103 -#, java-format -msgid "Upload raw file: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:108 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:627 -msgid "Upload raw file: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640 -msgid "Description:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:123 -msgid "Tags:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:129 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:648 -msgid "GPX-Upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:229 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:217 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113 msgid "gps point" msgstr "punct gps" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 #: trans_presets.java:1795 trans_presets.java:1801 trans_presets.java:1807 #: trans_presets.java:1813 trans_presets.java:1819 trans_presets.java:1825 @@ -1641,5 +1625,5 @@ msgstr[2] "de urme" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 msgid "point" msgid_plural "points" @@ -1648,5 +1632,5 @@ msgstr[2] "de puncte" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 #, java-format msgid "a track with {0} point" @@ -1656,5 +1640,5 @@ msgstr[2] "o urmă cu {0} de puncte" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} consists of {1} track" @@ -1664,5 +1648,5 @@ msgstr[2] "{0} este format din {1} de urme" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} point" @@ -1672,25 +1656,25 @@ msgstr[2] "{0} de puncte" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117 msgid "Customize line drawing" msgstr "Personalizează trasarea liniilor" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:296 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 msgid "Use global settings." msgstr "Utilizează opţiunile globale." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 msgid "Draw lines between points for this layer." msgstr "Trasează linii între puncte pentru acest strat." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:298 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123 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/RawGpsLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:135 msgid "Select line drawing options" @@ -1724,5 +1708,5 @@ msgstr "Imagine JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290 #, java-format msgid "{0} track, " @@ -1731,5 +1715,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 #, java-format msgid "{0} route, " @@ -1738,5 +1722,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 #, java-format msgid "{0} waypoint" @@ -1745,55 +1729,51 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #, java-format msgid "Name: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 msgid "Timespan: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Length: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:642 -msgid "Tags (keywords in GPX):" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:655 msgid "time" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:780 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:679 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:700 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 msgid "Download from OSM along this track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:686 msgid "Download everything within:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 #, java-format msgid "{0} meters" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:692 msgid "Maximum area per request:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 #, java-format msgid "{0} sq km" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787 #, java-format msgid "" @@ -1802,14 +1782,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:844 #, java-format msgid "Audio markers from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "" "Some waypoints with timestamps from before the start of the track were " @@ -1817,5 +1797,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -1924,19 +1904,19 @@ msgstr "Timpul introdus nu a putut fi interpretat." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:140 msgid "outside downloaded area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 #, java-format msgid "{0} consists of:" msgstr "{0} constă în:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:353 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:347 #, java-format msgid " ({0} deleted.)" msgstr " ({0} şters.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:445 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 msgid "Convert to GPX layer" msgstr "" @@ -1964,37 +1944,37 @@ msgstr "Nu am putut scrie semnele de carte." +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +msgid "The geographic longitude at the mouse pointer." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 -msgid "The geographic longitude at the mouse pointer." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +msgid "The geographic latitude at the mouse pointer." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 -msgid "The geographic latitude at the mouse pointer." +msgid "The angle between the previous and the current way segment." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 -msgid "The angle between the previous and the current way segment." +msgid "The (compass) heading of the line segment being drawn." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 -msgid "The (compass) heading of the line segment being drawn." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:160 msgid "(no object)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:62 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:56 msgid "Color" msgstr "Culoare" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:57 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107 #: trans_presets.java:56 trans_presets.java:92 trans_presets.java:130 @@ -2095,27 +2075,36 @@ msgstr "Nume" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:118 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:112 #, java-format msgid "Paint style {0}: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 msgid "Choose" msgstr "Alegeţi" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 msgid "Please select a color." msgstr "Vă rog selectaţi o culoare." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 #, java-format msgid "Choose a color for {0}" msgstr "Alegeţi o culoare pentru {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +msgid "Set to default" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:172 +msgid "Set all to default" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:184 msgid "Colors used by different objects in JOSM." msgstr "Culori utilizate de diferite obiecte în JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:171 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:198 msgid "Colors" msgstr "Culori" @@ -2150,23 +2139,23 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45 msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
            The password is transfered in plain text to the server, encoded in the " -"URL.
            Do not use a valuable Password." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:45 +"WARNING: The password is stored in plain text in the preferences " +"file.
            The password is transfered in plain text to the server, encoded in " +"the URL.
            Do not use a valuable Password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44 msgid "Sort presets menu" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46 msgid "Enable built-in defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:58 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69 msgid "Tagging preset source" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:156 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 @@ -2174,5 +2163,5 @@ msgstr "Vă rog selectaţi rândul care va fi editat." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500 @@ -2181,24 +2170,24 @@ msgstr "Vă rog selectaţi rândul care va fi şters." +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88 +msgid "" +"The sources (URL or filename) of tagging preset definition files. See " +"http://josm.openstreetmap.de/wiki/TaggingPresets for help." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89 -msgid "" -"The sources (URL or filename) of tagging preset definition files. See http://" -"josm.openstreetmap.de/wiki/TaggingPresets for help." +msgid "Add a new tagging preset source to the list." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 -msgid "Add a new tagging preset source to the list." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 msgid "Delete the selected source from the list." msgstr "Şterge sursele selectate din listă." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:94 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93 msgid "Tagging Presets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97 msgid "Tagging preset sources" msgstr "" @@ -2212,6 +2201,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:141 @@ -2219,34 +2208,34 @@ msgstr "Module" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 msgid "Configure available plugins." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43 msgid "Download List" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:80 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51 msgid "Update" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:60 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 msgid "Configure Sites..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add either site-josm.xml or Wiki Pages." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99 msgid "Please select an entry." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 msgid "Configure Plugin Sites" msgstr "" @@ -2422,9 +2411,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "Display Settings" msgstr "Configurări afişare" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "" "Various settings that influence the visual representation of the whole " @@ -2434,55 +2423,63 @@ "program." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings" msgstr "Configurări conexiune" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings for the OSM server." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Map Settings" msgstr "Opţiuni hartă" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Settings for the map projection and data interpretation." msgstr "Opţiuni pentru proiecţia hărţii şi interpretarea datelor." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Audio Settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Settings for the audio player and audio markers." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97 msgid "You have to restart JOSM for some settings to take effect." msgstr "Trebui să reponiţi JOSM pentru ca anumite opţiuni să aibă efect." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:25 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 msgid "Draw lines between raw gps points." msgstr "Trasează linii între puncte gps neprelucrate" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:27 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 msgid "Force lines if no segments imported." msgstr "Forţează linii dacă nu a fost importat nici un segment." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:28 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 msgid "Draw large GPS points." msgstr "Desenează puncte GPS mari." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 -msgid "Color tracks by velocity." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34 +msgid "Velocity (red = slow, green = fast)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 +msgid "Dilution of Position (red = high, green = low, if available)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 +msgid "Single Color (can be customized for named layers)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:1346 msgid "Car" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:309 trans_presets.java:635 trans_presets.java:833 #: trans_presets.java:842 trans_presets.java:851 trans_presets.java:864 @@ -2494,5 +2491,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:310 trans_presets.java:637 trans_presets.java:832 #: trans_presets.java:841 trans_presets.java:850 trans_presets.java:863 @@ -2503,44 +2500,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 msgid "Draw Direction Arrows" msgstr "Desenează săgeţi direcţionale" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 msgid "Fast drawing (looks uglier)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180 msgid "Only interesting direction hints (e.g. with oneway tag)." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:186 msgid "Only on the head of a way." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44 msgid "Draw segment order numbers" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45 msgid "Draw boundaries of downloaded data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46 msgid "Draw virtual nodes in select mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47 msgid "Draw inactive layers in other color" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 msgid "Smooth map graphics (antialiasing)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 msgid "" "If your gps device draws too few lines, select this to draw lines along your " @@ -2548,14 +2545,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:71 msgid "" "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73 msgid "Maximum length (meters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:77 msgid "" "Force drawing of lines if the imported data contain no line information." @@ -2564,13 +2561,14 @@ "despre linii." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:84 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89 msgid "Draw direction arrows for lines, connecting GPS points." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90 -msgid "Draw the direction arrows using table lookups instead of complex math." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:96 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95 +msgid "" +"Draw the direction arrows using table lookups instead of complex math." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:101 msgid "" "Don't draw arrows if they are not at least this distance away from the last " @@ -2578,49 +2576,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104 msgid "Minimum distance (pixels)" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:109 -msgid "Choose the hue for the track color by the velocity at that point." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116 -msgid "Allows to tune the track coloring for different average speeds." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122 msgid "Draw larger dots for the GPS points." msgstr "Desenează puncte mai pari pentru punctele GPS." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136 +msgid "" +"All points and track segments will have the same color. Can be customized in " +"Layer Manager." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137 +msgid "Colors points and track segments by velocity." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:138 +msgid "" +"Colors points and track segments by dilution of position (HDOP). Your " +"capture device needs to logs that information." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143 +msgid "Allows to tune the track coloring for different average speeds." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148 +msgid "Track and Point Coloring" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 msgid "GPS Points" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175 msgid "Draw direction hints for way segments." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:163 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192 msgid "Draw the order numbers of all segments within their way." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:168 -msgid "Apply antialiasing to the map view resulting in a smoother appearance." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:197 +msgid "" +"Apply antialiasing to the map view resulting in a smoother appearance." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202 msgid "Draw the boundaries of data loaded from the server." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:178 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:207 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212 msgid "Draw the inactive data layers in a different color." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219 msgid "OSM Data" msgstr "" @@ -2728,6 +2743,6 @@ "a menu entry of button for the first time. So some of your changes may " "become active even without restart --- but also without collistion handling. " -"This is another reason to restart JOSM after making any changes here." -"

            " +"This is another reason to restart JOSM after making any changes " +"here.

            " msgstr "" @@ -2740,8 +2755,9 @@ "key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also " "there will be 'keys' listed that correspond to a shortcut on your keyboard " -"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/" -"Semicolon on US keyboards, '.'/Period on German keyboards, ...) instead. Not " -"doing so may result in conflicts, as there is no way for JOSM to know that " -"Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...

            " +"(e.g. ':'/Colon). Please also do not use them, use the base key " +"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) " +"instead. Not doing so may result in conflicts, as there is no way for JOSM " +"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US " +"keyboard...

            " msgstr "" @@ -2765,6 +2781,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183 msgid "" -"

            The pseudo-modifier 'disabled' will disable the shortcut when encountered." -"

            " +"

            The pseudo-modifier 'disabled' will disable the shortcut when " +"encountered.

            " msgstr "" @@ -2834,67 +2850,67 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:231 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:236 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:250 msgid "layer not in list." msgstr "stratul nu este în listă." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "usage" msgstr "utilizare" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 msgid "options" msgstr "opţiuni" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 msgid "Show this help" msgstr "Arată acest ajutor" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Standard unix geometry argument" msgstr "Argument geometrie unix standard" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 msgid "Download the bounding box" msgstr "Descarcă perimetrul selectat" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 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:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Open file (as raw gps, if .gpx)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 msgid "Download the bounding box as raw gps" msgstr "Descarcă perimetrul selectat ca date gps neprelucrate" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Select with the given search" msgstr "Selectează cu căutarea dată" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 msgid "Don't launch in fullscreen mode" msgstr "Nu porni pe întreg ecranul" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 msgid "Reset the preferences to default" msgstr "Restabileşte preferinţele implicite" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 msgid "Set the language." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 msgid "examples" msgstr "exemple" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -2905,21 +2921,21 @@ "că aţi încărcat date înainte de --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 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:161 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 msgid "Activating updated plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 msgid "Loading early plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Setting defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171 msgid "Loading plugins" msgstr "" @@ -2954,6 +2970,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:108 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:164 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:162 #: trans_presets.java:308 trans_presets.java:309 trans_presets.java:310 #: trans_presets.java:311 trans_presets.java:312 trans_presets.java:313 @@ -2970,5 +2986,5 @@ msgstr "necunoscut" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:66 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 #, java-format msgid "" @@ -2977,25 +2993,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 #, java-format msgid "Plugin requires JOSM update: {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 #, java-format msgid "Plugin not found: {0}." msgstr "Modulul nu a fost găsit: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 msgid "" "(You can change the number of days after which this warning appears
            by " @@ -3003,17 +3019,17 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +msgid "Disable plugin" +msgstr "" + #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 -msgid "Disable plugin" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -3021,5 +3037,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 #, java-format msgid "" @@ -3027,19 +3043,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:262 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 msgid "" "Try updating to the newest version of this plugin before reporting a bug." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 msgid "Should the plugin be disabled?" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:278 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -3047,5 +3063,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -3053,6 +3069,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:322 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:181 msgid "no description available" msgstr "" @@ -3064,5 +3080,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 msgid "Update Plugins" msgstr "" @@ -3094,5 +3110,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 #, java-format msgid "Downloaded plugin information from {0} site" @@ -3101,13 +3117,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 msgid "No plugin information found." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:76 msgid "All installed plugins are up to date." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 #, java-format msgid "" @@ -3117,9 +3133,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:105 msgid "Download missing plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:106 #, java-format msgid "" @@ -3129,22 +3145,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 msgid "Download Plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:170 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:168 #, java-format msgid "{0}: Version {1}{2}" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:176 msgid "Plugin bundled with JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208 msgid "Plugin already exists" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:211 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:209 #, java-format msgid "" @@ -3155,15 +3171,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 msgid "Delete and Download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:222 #, java-format msgid "Error deleting plugin file: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:281 #, java-format msgid "Error reading plugin information file: {0}" @@ -3231,10 +3247,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:165 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 msgid "Conflicting relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 #, java-format msgid "" @@ -3243,5 +3259,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:166 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 #, java-format msgid "" @@ -3256,7 +3272,7 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:349 msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
            This can cause problems because other objects (that you don't see) might " -"use them.
            Do you really want to delete?" +"You are about to delete nodes outside of the area you have " +"downloaded.
            This can cause problems because other objects (that you don't " +"see) might use them.
            Do you really want to delete?" msgstr "" @@ -3374,124 +3390,135 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:232 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:426 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:428 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:527 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:765 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:776 msgid "Empty member in relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:767 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:531 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:547 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:552 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:549 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:558 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:561 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 +msgid "More than one \"via\" found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 #, java-format msgid "Unknown role ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 #, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 msgid "No \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 msgid "No \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -msgid "No \"via\" node found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +msgid "No \"via\" node or way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:636 -#, java-format -msgid "The \"{0}\" way must contain at least 2 nodes." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:731 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +msgid "The \"to\" way doesn't start or end at a \"via\" node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:620 +msgid "The \"from\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:624 +msgid "The \"to\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:742 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:847 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:858 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:949 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:987 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:998 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1012 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1023 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1195 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1206 msgid "untagged" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1196 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207 msgid "text" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:94 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:181 @@ -3499,13 +3526,13 @@ msgstr "selectat" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 msgid "incomplete way" msgstr "cale incompletă" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 msgid "highlight" msgstr "" @@ -3527,5 +3554,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:113 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:89 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:77 msgid "incomplete" @@ -3555,14 +3582,14 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +msgid "Duplicate" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 -msgid "Duplicate" +msgid "Duplicate selection by copy and immediate paste." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 -msgid "Duplicate selection by copy and immediate paste." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 @@ -3571,5 +3598,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -3640,6 +3667,8 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:57 -msgid "Please select at least one node, way or relation." +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:60 +msgid "" +"Please select at least one node, way or relation. Only already uploaded " +"elements have a history." msgstr "" @@ -3662,7 +3691,7 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/TerracerAction.java:47 @@ -3796,5 +3825,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:123 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:314 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:315 msgid "Enter values for all conflicts." msgstr "" @@ -3802,5 +3831,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 msgid "Solve Conflicts" msgstr "" @@ -3930,5 +3959,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #, java-format @@ -3955,15 +3984,19 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125 -msgid "" -"There is more than one way using the node(s) you selected. Please select the " +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 +msgid "" +"There is more than one way using the node you selected. Please select the " "way also." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133 +msgid_plural "" +"There is more than one way using the nodes you selected. Please select the " +"way also." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137 msgid "The selected nodes do not share the same way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -3971,10 +4004,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229 msgid "You must select two or more nodes to split a circular way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -3982,5 +4015,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 msgid "" "A role based relation membership was copied to all new ways.\n" @@ -3988,5 +4021,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:296 #, java-format msgid "Split way {0} into {1} parts" @@ -4373,5 +4406,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 msgid "Align Nodes in Circle" msgstr "Aliniază noduri în cerc" @@ -4385,5 +4418,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 msgid "Please select at least four nodes." msgstr "Vă rog selectaţi cel puţin petru noduri." @@ -4450,4 +4483,32 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "" +"Show status report with useful information that can be attached to bugs" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92 +msgid "Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +msgid "Copy to clipboard and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 +msgid "Close" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 @@ -4459,13 +4520,13 @@ msgstr "Refă ultima acţiune anulată." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:44 msgid "Delete Mode" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:46 +msgid "Delete nodes or ways." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 -msgid "Delete nodes or ways." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:84 @@ -4476,5 +4537,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:130 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -4484,6 +4545,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:87 msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." +"Drag play head and release near track to play audio from there; " +"SHIFT+release to synchronize audio at that point." msgstr "" @@ -4497,23 +4558,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 msgid "Extrude Way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:252 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:416 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:430 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 msgid "Draw a rectangle of the desired size, then release the mouse button." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:420 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:434 msgid "Release the mouse button to stop rotating." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 msgid "Drag a way segment to make a rectangle." msgstr "" @@ -4581,19 +4642,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:191 msgid "Add and move a virtual new node to way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:220 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:223 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 msgid "Cannot move objects outside of the world." msgstr "Nu pot muta obiecte în afara lumii." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:418 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:432 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:422 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:436 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to remove); Shift-" @@ -4662,30 +4723,30 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Orthogonalize Shape" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -msgid "Orthogonalize Shape" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 msgid "Only two nodes allowed" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 msgid "Selection must consist only of ways." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 msgid "Please select one or more closed ways of at least four nodes." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 msgid "Please select ways with almost right angles to orthogonalize." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 msgid "" "You are using the EPSG:4326 projection which might lead
            to " @@ -4694,9 +4755,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "Only one node selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 msgid "Orthogonalize" msgstr "" @@ -4747,5 +4808,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101 -msgid "Please select exactly three nodes or one way with exactly three nodes." +msgid "" +"Please select exactly three nodes or one way with exactly three nodes." msgstr "" @@ -4754,52 +4816,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../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:71 +msgid "Update Data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:72 +#, java-format +msgid "" +"This action will require {0} individual download requests. Do you wish to " +"continue?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 msgid "Open Location..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 msgid "Open an URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 msgid "Separate Layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 msgid "Enter URL to download:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 msgid "Download Location" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 msgid "Download URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 msgid "Add Node..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 msgid "Add a node by entering latitude and longitude." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 msgid "Enter the coordinates for the new node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 msgid "Use decimal degrees." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 msgid "Negative values denote Western/Southern hemisphere." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 #: ../plugins/livegps/livegps/LiveGpsDialog.java:54 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93 @@ -4808,5 +4887,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 #: ../plugins/livegps/livegps/LiveGpsDialog.java:56 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96 @@ -4849,14 +4928,14 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "Overwrite" msgstr "Suprascrie" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "File exists. Overwrite?" msgstr "Fişierul există. Îl suprascriu?" @@ -4875,52 +4954,57 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 msgid "This node is not glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 msgid "None of these nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of this way's nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 msgid "The current selection cannot be used for unglueing." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "Select either:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +msgid "* One tagged node, or" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "* One node that is used by more than one way, or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 -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:104 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +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:117 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:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 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:107 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -4930,10 +5014,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:160 +msgid "Unglued Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:373 #, java-format msgid "Dupe into {0} nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:320 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:397 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -5034,5 +5122,5 @@ msgstr "Anulează ultima acţiune." -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 msgid "No Shortcut" msgstr "" @@ -5054,13 +5142,13 @@ msgstr "Date OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:29 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:28 msgid "Downloading GPS data" msgstr "Descarc date GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:41 msgid "Downloaded GPX Data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:71 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:69 msgid "Raw GPS data" msgstr "Date GPS neprelucrate" @@ -5281,5 +5369,6 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169 -msgid "Header contains several values and cannot be mapped to a single string" +msgid "" +"Header contains several values and cannot be mapped to a single string" msgstr "" @@ -5627,5 +5716,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69 -msgid "Maximum number of segments allowed in each generated way. Default 250." +msgid "" +"Maximum number of segments allowed in each generated way. Default 250." msgstr "" @@ -5644,6 +5734,7 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72 msgid "" -"Accuracy of Douglas-Peucker line simplification, measured in degrees." -"
            Lower values give more nodes, and more accurate lines. Default 0.0003." +"Accuracy of Douglas-Peucker line simplification, measured in " +"degrees.
            Lower values give more nodes, and more accurate lines. Default " +"0.0003." msgstr "" @@ -6269,6 +6360,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:509 msgid "" -"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." -"org/index.php/User:JLS/speller) or tag checking data files." +"The sources (URL or filename) of spell check (see " +"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking " +"data files." msgstr "" @@ -6724,6 +6816,6 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:40 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:43 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 #, java-format @@ -6731,18 +6823,29 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:51 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:55 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 msgid "Contacting WMS Server..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157 msgid "Create buildings" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 msgid "CadastreGrabber: Illegal url." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +msgid "" +"To avoid cadastre WMS overload,\n" +"building import size is limited to 1 km2 max." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" @@ -6765,16 +6868,25 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:128 +msgid "Cadastre" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:139 +msgid "Auto sourcing" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164 +msgid "Invalid projection" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 +#, java-format +msgid "Change the projection to {0} first." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:169 msgid "" "To enable the cadastre WMS plugin, change\n" "the JOSM projection to Lambert and restart" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132 -msgid "Cadastre" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 -msgid "Auto sourcing" msgstr "" @@ -6847,6 +6959,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:43 msgid "" -"More than one WMS layer present.\n" -"Select one of them first, then retry." +"More than one WMS layer present\n" +"Select one of them first, then retry" msgstr "" @@ -6855,5 +6967,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136 #, java-format @@ -6863,13 +6975,13 @@ msgstr[1] "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61 msgid "Extract SVG ViewBox..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65 msgid "Extract best fitting boundary..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:120 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126 msgid "Create boundary" msgstr "" @@ -6905,15 +7017,15 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 msgid "Save WMS layer to file" msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "Load WMS layer from file" msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -6921,5 +7033,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 msgid "File Format Error" msgstr "" @@ -6927,5 +7039,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 msgid "Error loading file" msgstr "" @@ -6951,52 +7063,53 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 msgid "Replace original background by JOSM background color." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30 msgid "Reverse grey colors (for black backgrounds)." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 msgid "Set background transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34 msgid "Draw boundaries of downloaded data." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Enable automatic caching." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:53 -msgid "" -"A special handler of the french cadastre wms at www.cadastre.gouv." -"fr

            Please read the Terms and Conditions of Use here (in french): " -"
            http://www.cadastre.gouv.fr/scpc/html/" -"CU_01_ConditionsGenerales_fr.html
            before any upload of data created " -"by this plugin." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:58 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:55 +msgid "" +"A special handler of the french cadastre wms at " +"www.cadastre.gouv.fr

            Please read the Terms and Conditions of Use here " +"(in french):
            " +"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " +"
            before any upload of data created by this plugin." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -7004,26 +7117,40 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 -msgid "" -"Invert the original texts from black to white (and all intermediate greys)." +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +msgid "" +"Invert the original black and white colors (and all intermediate greys). " +"Useful for texts on dark backgrounds." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 +msgid "Allows multiple layers stacking" msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 -msgid "Allows multiple layers stacking" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:99 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:113 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 msgid "Image grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:162 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:125 +msgid "Grab smaller images (higher quality but use more memory)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +msgid "Fixed size square (default is 100m)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +msgid "Fixed size (from 25 to 1000 meters)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -7132,5 +7259,5 @@ msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:254 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:255 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -7271,7 +7398,7 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:203 msgid "" -"Take a photo of your GPS receiver while it displays the time." -"
            Display that photo here.
            And then, simply capture the time you read " -"on the photo and select a timezone
            " +"Take a photo of your GPS receiver while it displays the " +"time.
            Display that photo here.
            And then, simply capture the time you " +"read on the photo and select a timezone
            " msgstr "" @@ -7336,5 +7463,6 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:484 -msgid "I can take a picture of my GPS receiver.
            Can this help?" +msgid "" +"I can take a picture of my GPS receiver.
            Can this help?" msgstr "" @@ -7378,5 +7506,5 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #, java-format msgid "" @@ -7385,14 +7513,14 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:579 msgid "Invalid offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:641 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:643 #, java-format msgid "Found {0} matchs of {1} in GPX track {2}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:642 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:644 msgid "GPX Track loaded" msgstr "" @@ -7400,5 +7528,5 @@ #: ../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/UploadDataGui.java:79 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 msgid "Upload Traces" msgstr "" @@ -7408,58 +7536,72 @@ msgstr "" +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71 +msgid "Upload Trace" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +msgid "Public" +msgstr "" + #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 -msgid "Upload GPX track" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -msgid "Public" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 msgid "Selected makes your trace public in openstreetmap.org" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Description" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:123 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 msgid "Tags" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:182 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:153 +#, java-format +msgid "Selected track: {0}" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:176 msgid "Connecting..." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 -msgid "Uploading GPX track..." -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:214 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:199 +msgid "Upload cancelled" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:209 +msgid "Error while uploading" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:227 -msgid "Error while uploading" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:235 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +msgid "Upload failed. Server returned the following message: " +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 +#, java-format +msgid "Uploading GPX track: {0}% ({1} of {2})" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:252 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:241 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:244 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "" @@ -7678,32 +7820,32 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:232 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241 msgid "Change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:253 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:264 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:271 msgid "Alpha channel" msgstr "" @@ -12570,7 +12712,12 @@ msgstr "" +#, java-format #~ msgid "Java OpenStreetMap Editor Version {0}" #~ msgstr "Java OpenStreetMap Editor Versiunea {0}" +#~ msgid "Please select something from the conflict list." +#~ msgstr "Vă rog selectaţi ceva din lista de conflicte." + +#, java-format #~ msgid "Remove \"{0}\" for" #~ msgstr "Elimină \"{0}\" pentru" @@ -12580,7 +12727,9 @@ #~ "Vă rog selectaţi obiectele pentru care doriţi să schimbaţi proprietăţile." +#, java-format #~ msgid "Data error: lat value \"{0}\" is out of bounds." #~ msgstr "Eroare date: valoarea lat \"{0}\" este în afara limitelor." +#, java-format #~ msgid "Data error: lon value \"{0}\" is out of bounds." #~ msgstr "Eroare date: valoarea lon \"{0}\" este în afara limitelor." Index: /applications/editors/josm/i18n/po/ru.po =================================================================== --- /applications/editors/josm/i18n/po/ru.po (revision 13832) +++ /applications/editors/josm/i18n/po/ru.po (revision 13833) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-15 22:03+0100\n" -"PO-Revision-Date: 2009-02-14 15:24+0000\n" +"POT-Creation-Date: 2009-02-21 16:35+0100\n" +"PO-Revision-Date: 2009-02-21 16:09+0000\n" "Last-Translator: JekaDer \n" "Language-Team: Koptev Oleg \n" @@ -15,12 +15,12 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"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-02-15 20:40+0000\n" +"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-02-22 20:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: RUSSIAN FEDERATION\n" "X-Poedit-Language: Russian\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 #, java-format msgid "" @@ -33,5 +33,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 msgid "" "This action will have no shortcut.\n" @@ -41,5 +41,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -50,5 +50,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Подсказка: Горячие клавиши можно назначить в настройках программы)" @@ -59,17 +59,17 @@ #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 msgid "Information" msgstr "Информация" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Do nothing" msgstr "Ничего не делать" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Report Bug" msgstr "Сообщить об ошибке" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 msgid "" "An unexpected exception occurred.\n" @@ -83,14 +83,14 @@ "последней версией JOSM, будьте добры, отправьте отчёт об ошибке." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Unexpected Exception" msgstr "Неожиданная ошибка" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 #, java-format msgid "Please report a ticket at {0}" msgstr "Пожалуйста, создайте отчёт об ошибке по адресу {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" @@ -98,5 +98,5 @@ "подробнее!)" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:78 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -106,9 +106,9 @@ "ошибке." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Be sure to include the following information:" msgstr "Прикрепите следующую информацию к отчёту:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75 msgid "(The text has already been copied to your clipboard.)" msgstr "(Текст уже скопирован в буфер обмена)" @@ -122,5 +122,5 @@ msgstr "Ошибка при воспроизведении звука" -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:94 @@ -128,5 +128,5 @@ msgstr "Подключение к серверу OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:48 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:32 @@ -134,10 +134,10 @@ msgstr "Скачивание данных OSM..." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 msgid "NullPointerException, possibly some missing tags." msgstr "Ошибка! Возможно отсутствуют тэги." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83 msgid "Preparing data..." msgstr "Подготовка данных..." @@ -167,48 +167,48 @@ msgstr "Загрузка точек с {0} до {1}..." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:164 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:168 msgid "Unknown version" msgstr "Неизвестная версия" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 msgid "Found element in non-way." msgstr "Найден элемент вне пути." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 msgid " has zero ref" msgstr "у нет ссылок ref" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 msgid "Found element in non-relation." msgstr "Найден тэг вне отношения." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:252 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250 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:294 msgid "Illegal object with id=0" msgstr "Недопустимый объект с id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Отсутствует необходимый атрибут \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 #, java-format msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:502 msgid "Prepare OSM data..." msgstr "Подготовка данных..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:518 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:516 msgid "Ill-formed node id" msgstr "Неверный номер точки" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:280 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:287 msgid "Parse error: invalid document structure for gpx document" msgstr "Ошибка разбора: неправильная структура документа gpx" @@ -218,18 +218,18 @@ msgstr "Соединение с сервером..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Опишите изменения для закачиваемых данных:" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 msgid "Commit comment" msgstr "Комментарий правки" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64 @@ -239,34 +239,32 @@ msgstr "Произошла ошибка: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:192 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190 msgid "Opening changeset..." msgstr "Открывается список правок..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:226 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224 msgid "Server does not support changesets" msgstr "Сервер не поддерживает управление версиями" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:246 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:428 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:609 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:184 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607 msgid "Unknown host" msgstr "Неизвестный хост" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282 msgid "Preparing..." msgstr "Подготовка..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:294 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292 msgid "Uploading..." msgstr "Закачка..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375 msgid "Closing changeset..." msgstr "Закрывается список правок..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:652 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650 msgid "Transfer aborted due to error (will wait for 5 seconds):" msgstr "Передача прервана из-за ошибки (повторная попытка через 5 с):" @@ -300,21 +298,24 @@ #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95 msgid "Login" -msgstr "" +msgstr "Идентификатор пользователя" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95 #: ../core/src/org/openstreetmap/josm/Main.java:348 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:29 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 @@ -327,11 +328,11 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:110 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -346,11 +347,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:186 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 msgid "Creating main GUI" msgstr "Создание интерфейса" #: ../core/src/org/openstreetmap/josm/Main.java:195 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:271 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:278 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:56 msgid "Help" @@ -363,5 +364,6 @@ #: ../core/src/org/openstreetmap/josm/Main.java:345 msgid "Hint: Some changes came from uploading new data to the server." -msgstr "Прим.: Некоторые изменения произошли из-за загрузки данных на сервер." +msgstr "" +"Прим.: Некоторые изменения произошли из-за загрузки данных на сервер." #: ../core/src/org/openstreetmap/josm/Main.java:346 @@ -372,13 +374,14 @@ #: ../core/src/org/openstreetmap/josm/Main.java:347 msgid "There are unsaved changes. Discard the changes and continue?" -msgstr "Присутствуют несохранённые изменения. Сбросить изменения и продолжить?" +msgstr "" +"Присутствуют несохранённые изменения. Сбросить изменения и продолжить?" #: ../core/src/org/openstreetmap/josm/Main.java:348 msgid "Save and Exit" -msgstr "" +msgstr "Сохранить и выйти" #: ../core/src/org/openstreetmap/josm/Main.java:348 msgid "Discard and Exit" -msgstr "" +msgstr "Отменить и выйти" #: ../core/src/org/openstreetmap/josm/Main.java:374 @@ -392,21 +395,21 @@ msgstr "Игнорируется неверный адрес файла: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109 msgid "min lat" msgstr "мин. широта" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111 msgid "min lon" msgstr "мин. долгота" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:117 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "max lat" msgstr "макс. широта" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 msgid "max lon" msgstr "макс. долгота" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:122 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -416,5 +419,5 @@ "область)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:134 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130 msgid "Bounding Box" msgstr "Рамка" @@ -428,5 +431,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 msgid "Null pointer exception, possibly some missing tags." -msgstr "" +msgstr "Нулевой исключение, возможно есть отсутствующие тэги" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 @@ -450,6 +453,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:96 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:894 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:956 msgid "name" msgstr "название" @@ -482,5 +485,5 @@ msgstr "масштаб" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:107 msgid "" "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -490,5 +493,5 @@ "Нажмите правую кнопку мыши и двигайте карту мышью. Выбор: щелчок." -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:109 msgid "Slippy map" msgstr "Интерактивная карта" @@ -499,7 +502,7 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:605 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:602 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:89 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -519,5 +522,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380 msgid "Remove" msgstr "Удалить" @@ -660,20 +663,20 @@ msgstr "Если выбрано - установить настройки по умолчанию." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:109 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:186 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:198 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:108 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:191 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:203 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 msgid "Java OpenStreetMap Editor" msgstr "Редактор OpenStreetMap на Java" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:111 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:110 msgid "Message of the day not available" msgstr "Сообщение дня недоступно" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:200 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:205 msgid "Downloading \"Message of the day\"" msgstr "Загружается \"Сообщение дня\"" @@ -713,33 +716,33 @@ msgstr "Уменьшить масштаб" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:234 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:474 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:512 msgid "" msgstr "<различные>" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:383 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:380 msgid "More information about this feature" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:393 +msgstr "Ещё информации о этой возможности" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:390 msgid "Optional Attributes:" msgstr "Дополнительные атрибуты:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:437 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Использовать шаблон ''{0}'' из группы ''{1}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:438 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:435 #, java-format msgid "Use preset ''{0}''" msgstr "Использовать шаблон ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 msgid "way" @@ -749,11 +752,11 @@ msgstr[2] "линий" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:214 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 msgid "node" msgid_plural "nodes" @@ -762,6 +765,6 @@ msgstr[2] "узлов" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:81 @@ -772,30 +775,30 @@ msgstr[2] "отношений" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:475 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 #, java-format msgid "Unknown type: {0}" msgstr "Неизвестный тип: {0}" +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:549 +#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 +#, java-format +msgid "Could not read tagging preset source: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 -#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 -#, java-format -msgid "Could not read tagging preset source: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:555 #, java-format msgid "Error parsing {0}: " msgstr "Ошибка при разборе {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:572 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:569 #, java-format msgid "Elements of type {0} are supported." msgstr "Элемент типа {0} не поддерживается." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595 #, java-format msgid "Change {0} object" @@ -805,9 +808,17 @@ msgstr[2] "Изменить {0} объектов" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 msgid "Nothing selected!" msgstr "Ничего не выбрано!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 +msgid "Selection unsuitable!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +msgid "Apply Preset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 msgid "Change Properties" msgstr "Изменить параметры" @@ -818,14 +829,14 @@ msgstr "Группа настроек ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:107 msgid "File" msgstr "Файл" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:135 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:107 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:86 @@ -837,22 +848,22 @@ msgstr "Правка" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 msgid "View" msgstr "Вид" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:26 msgid "Tools" msgstr "Инструменты" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:141 msgid "Audio" msgstr "Аудио" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:142 msgid "Presets" msgstr "Шаблоны" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:40 @@ -864,18 +875,18 @@ msgstr "Меню: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:210 msgid "Wireframe View" msgstr "Каркас" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212 msgid "Toggle Wireframe view" msgstr "Показать/скрыть каркас" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:28 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 msgid "Contacting the OSM server..." msgstr "Соединение с OSM сервером..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 #, java-format msgid "This will change up to {0} object." @@ -885,11 +896,11 @@ msgstr[2] "Это изменит до {0} объектов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 msgid "An empty value deletes the key." msgstr "Пустое значение удаляет ключ." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66 @@ -899,7 +910,7 @@ msgstr "Ключ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 @@ -908,10 +919,10 @@ msgstr "Значение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333 msgid "Change values?" msgstr "Изменить значения?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:257 #, java-format msgid "Change properties of up to {0} object" @@ -921,33 +932,33 @@ msgstr[2] "Изменить параметры {0} объектов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 msgid "Please select a key" msgstr "Пожалуйста, выберите ключ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321 msgid "Please select a value" msgstr "Выберите значение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:445 msgid "Please select the objects you want to change properties for." msgstr "Выберите объекты, для которых вы желаете изменить свойства." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 msgid "Properties/Memberships" msgstr "Параметры/отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 msgid "Properties for selected objects." msgstr "Параметры выделенных объектов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97 @@ -959,58 +970,58 @@ msgstr "Переключить: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 msgid "Member Of" msgstr "Член группы" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Role" msgstr "Роль" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:559 msgid "Change relation" msgstr "Изменить отношение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Удалить выделение из отношения {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 msgid "Delete from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 +msgstr "Удалить из связи" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:600 msgid "Add Properties" msgstr "Добавить параметры" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 msgid "Add a new key/value pair to all objects" msgstr "Добавить новую пару ключ/значение для всех объектов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 msgid "Edit Properties" msgstr "Редактировать параметры" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609 msgid "Edit the value of the selected key for all objects" msgstr "Изменить значение выбранного ключа для всех объектов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 msgid "Delete Properties" msgstr "Удалить параметры" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:77 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:293 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 @@ -1019,98 +1030,115 @@ msgstr "Удалить" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 msgid "Delete the selected key in all objects" msgstr "Удалить выбранный ключ из всех объектов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:763 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Свойств: {0} / Входит в отношения: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:769 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 msgid "Properties / Memberships" msgstr "Параметры / отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178 +msgid "Apply Changes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 msgid "Create new relation" msgstr "Создать новое отношение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208 msgid "Edit new relation" msgstr "Править новое отношение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209 #, java-format msgid "Edit relation #{0}" msgstr "Править отношение #{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230 +msgid "Basic" +msgstr "Основной" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Occupied By" msgstr "Объект" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311 msgid "Tags (empty value deletes tag)" msgstr "Тэги (пустое значение удаляет тэг)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313 msgid "Members" msgstr "Участники" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 +msgid "Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 msgid "Move the currently selected members up" msgstr "Переместить выбранных членов отношения вверх" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358 +msgid "Add Selected" +msgstr "Добавить выбранное" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359 +msgid "Add all currently selected objects as members" +msgstr "Сделать все выбранные объекты участниками отношения" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365 +msgid "Remove Selected" +msgstr "Удалить выбранные" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366 +msgid "Remove all currently selected objects from relation" +msgstr "Удалить все выделенные объекты из связей" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 +msgid "Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 msgid "Move the currently selected members down" msgstr "Переместить выбранных членов отношения вниз" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356 -msgid "Add Selected" -msgstr "Добавить выбранное" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:357 -msgid "Add all currently selected objects as members" -msgstr "Сделать все выбранные объекты участниками отношения" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:363 -msgid "Remove Selected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:364 -msgid "Remove all currently selected objects from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381 msgid "Remove the member in the current table row from this relation" msgstr "Удалить текущего участника из отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394 msgid "Download Members" msgstr "Скачать участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:406 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395 msgid "Download all incomplete ways and nodes in relation" msgstr "Скачать недостающие части линий и узлов, участвующих в отношении" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:415 -msgid "Basic" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:453 #, java-format msgid "Members: {0}" msgstr "Участники: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:587 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:461 +#, java-format +msgid "Relation Editor: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:585 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 msgid "There were conflicts during import." msgstr "При импортировании возникли конфликтные ситуации." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593 msgid "Error parsing server response." msgstr "Ошибка при разборе ответа от сервера." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:600 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:594 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:598 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -1124,9 +1152,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:345 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 msgid "Error" msgstr "Ошибка" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:599 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597 msgid "Cannot connect to server." msgstr "Невозможно связаться с сервером." @@ -1217,5 +1245,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220 msgid "Click to minimize/maximize the panel content" -msgstr "" +msgstr "Щёлкните для уменьшения/увеличения содержимого панели" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 @@ -1229,5 +1257,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 msgid "Delete Layer" -msgstr "" +msgstr "Удалить слой" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 @@ -1288,5 +1316,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:94 @@ -1296,5 +1324,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 msgid "" @@ -1363,16 +1391,24 @@ msgstr "Выбор: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +msgid "Open an editor for the selected relation" +msgstr "Открыть редактор для выбранного отношения" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +msgid "Delete the selected relation" +msgstr "Удалить выбранное отношение" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 #: trans_presets.java:2904 msgid "Relations" msgstr "Отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 msgid "Open a list of all relations." msgstr "Показать список всех отношений." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 @@ -1380,17 +1416,9 @@ msgstr "Создать" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 msgid "Create a new relation" msgstr "Создать новое отношение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open an editor for the selected relation" -msgstr "Открыть редактор для выбранного отношения" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -msgid "Delete the selected relation" -msgstr "Удалить выбранное отношение" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:130 #, java-format msgid "Relations: {0}" @@ -1418,47 +1446,47 @@ msgstr "Стек команд: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +msgid "Resolve" +msgstr "Разрешить" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +msgid "Open a merge dialog of all selected items in the list above." +msgstr "Открыть диалоговое окно для слияния выбранных объектов." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Conflict" msgstr "Конфликт" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 msgid "Merging conflicts." msgstr "Разрешение конфликтов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67 -msgid "Resolve" -msgstr "Разрешить" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:68 -msgid "Open a merge dialog of all selected items in the list above." -msgstr "Открыть диалоговое окно для слияния выбранных объектов." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:105 -msgid "Please select something from the conflict list." -msgstr "Пожалуйста, выберите что-либо из списка конфликтов." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Resolve Conflicts" msgstr "Разрешить конфликты" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +msgid "Solve Conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 #, java-format msgid "Conflicts: {0}" msgstr "Конфликты: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Conflicts" msgstr "Конфликты" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 msgid "conflict" msgstr "конфликт" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 msgid "background" msgstr "фон" @@ -1484,5 +1512,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 msgid "Customize Color" @@ -1490,5 +1518,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1498,5 +1526,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1505,5 +1533,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:326 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:152 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -1521,5 +1549,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:265 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 #, java-format msgid "Audio synchronized at point {0}." @@ -1527,5 +1555,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232 msgid "Unable to synchronize in layer being played." msgstr "" @@ -1548,5 +1576,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:958 msgid "desc" msgstr "описание" @@ -1568,5 +1596,5 @@ msgstr "Невозможно отобразить URL" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -1574,5 +1602,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -1580,86 +1608,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224 msgid "Unable to create new audio marker." msgstr "Невозможно создать новый аудио-маркер." #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 msgid "Convert to data layer" msgstr "Преобразовать в слой данных" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:725 -msgid "" -"Upload of unprocessed GPS data as map data is considered harmful." -"
            If you want to upload traces, look here:" -msgstr "" -"Загрузка на карту необработанных данных GPS считается вредоносной." -"
            Если хотите загрузить трэк, сделайте это по ссылке:" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:645 +msgid "" +"Upload of unprocessed GPS data as map data is considered " +"harmful.
            If you want to upload traces, look here:" +msgstr "" +"Загрузка на карту необработанных данных GPS считается " +"вредоносной.
            Если хотите загрузить трэк, сделайте это по ссылке:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:646 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:747 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:448 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:667 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "Converted from: {0}" msgstr "Преобразовано из: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612 -msgid "Upload this trace..." -msgstr "Загрузить этот маршрут" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:616 -msgid "" -"This functionality has been added only recently. Please
            use with " -"care and check if it works as expected." -msgstr "" -"Данная функциональность добавлена совсем недавно. Пожалуйста," -"
            пользуйтесь с осторожностью, и проверяйте, чтоб всё работало, как надо." - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:102 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:107 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:626 -msgid "Upload track filtered by JOSM" -msgstr "Загрузить маршрут, отфильтрованный в JOSM" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:103 -#, java-format -msgid "Upload raw file: {0}" -msgstr "Загрузить необработанный файл: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:108 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:627 -msgid "Upload raw file: " -msgstr "Загрузить необработанный файл: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640 -msgid "Description:" -msgstr "Описание:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:123 -msgid "Tags:" -msgstr "Тэги:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:129 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:648 -msgid "GPX-Upload" -msgstr "Загрузка GPX" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:229 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:217 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113 msgid "gps point" msgstr "точка GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 #: trans_presets.java:1795 trans_presets.java:1801 trans_presets.java:1807 #: trans_presets.java:1813 trans_presets.java:1819 trans_presets.java:1825 @@ -1680,5 +1663,5 @@ msgstr[2] "треков" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 msgid "point" msgid_plural "points" @@ -1687,5 +1670,5 @@ msgstr[2] "точек" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 #, java-format msgid "a track with {0} point" @@ -1695,5 +1678,5 @@ msgstr[2] "трек с {0} точками" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} consists of {1} track" @@ -1703,5 +1686,5 @@ msgstr[2] "{0} состоит из {1} треков" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} point" @@ -1711,25 +1694,25 @@ msgstr[2] "{0} точек" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117 msgid "Customize line drawing" msgstr "Настроить отрисовку линий" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:296 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 msgid "Use global settings." msgstr "Использовать глобальные настройки." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 msgid "Draw lines between points for this layer." msgstr "Отображать линии между точками для этого слоя." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:298 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123 msgid "Do not draw lines between points for this layer." msgstr "Не отображать линии между точками для этого слоя." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:135 msgid "Select line drawing options" @@ -1763,5 +1746,5 @@ msgstr "Изображения JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290 #, java-format msgid "{0} track, " @@ -1771,5 +1754,5 @@ msgstr[2] "{0} дорожек, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 #, java-format msgid "{0} route, " @@ -1779,5 +1762,5 @@ msgstr[2] "{0} маршрутов, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 #, java-format msgid "{0} waypoint" @@ -1787,55 +1770,51 @@ msgstr[2] "{0} путевых точек" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #, java-format msgid "Name: {0}" msgstr "Название: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "Description: {0}" msgstr "Описание: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 msgid "Timespan: " msgstr "Временной интервал: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Length: " msgstr "Длина: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:642 -msgid "Tags (keywords in GPX):" -msgstr "Тэги (ключевые слова в GPX)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:655 msgid "time" msgstr "время" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:780 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:679 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:700 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 msgid "Download from OSM along this track" msgstr "Скачать с JSM данные вдоль трэка" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:686 msgid "Download everything within:" msgstr "Скачать всё в пределах:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 #, java-format msgid "{0} meters" msgstr "{0} метров" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:692 msgid "Maximum area per request:" msgstr "Максимальная область для одного запроса:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 #, java-format msgid "{0} sq km" msgstr "{0} кв. км." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787 #, java-format msgid "" @@ -1846,14 +1825,14 @@ "Продолжить?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:844 #, java-format msgid "Audio markers from {0}" msgstr "Аудиомаркеры из {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 msgid "No GPX track available in layer to associate audio with." msgstr "На слое отсутствует трек GPX, чтобы наложить звук." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "" "Some waypoints with timestamps from before the start of the track were " @@ -1863,5 +1842,5 @@ "трека, были проигнорированы." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -1972,19 +1951,19 @@ msgstr "Введённое время невозможно использовать" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:140 msgid "outside downloaded area" msgstr "вне области для скачивания" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 #, java-format msgid "{0} consists of:" msgstr "{0} состоит из:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:353 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:347 #, java-format msgid " ({0} deleted.)" msgstr " ({0} удалено)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:445 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 msgid "Convert to GPX layer" msgstr "Преобразовать в слой GPX" @@ -2012,37 +1991,37 @@ msgstr "Невозможно записать закладки" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 msgid "The geographic longitude at the mouse pointer." msgstr "Географическая долгота положения курсора" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The name of the object at the mouse pointer." msgstr "Название объекта, на который наведён курсор" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 msgid "The geographic latitude at the mouse pointer." msgstr "Географическая широта положения курсора" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The angle between the previous and the current way segment." msgstr "Угол между предыдущим и текущим сегментом линии" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The (compass) heading of the line segment being drawn." msgstr "Путевой угол создаваемого сегмента" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The length of the new way segment being drawn." msgstr "Длина создаваемого сегмента линии" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:160 msgid "(no object)" msgstr "(нет объекта)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:62 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:56 msgid "Color" msgstr "Цвет" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:57 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107 #: trans_presets.java:56 trans_presets.java:92 trans_presets.java:130 @@ -2143,27 +2122,36 @@ msgstr "Название" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:118 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:112 #, java-format msgid "Paint style {0}: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 msgid "Choose" msgstr "Выбрать" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 msgid "Please select a color." msgstr "Пожалуйста, выберите цвет" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 #, java-format msgid "Choose a color for {0}" msgstr "Выберите цвет для {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +msgid "Set to default" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:172 +msgid "Set all to default" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:184 msgid "Colors used by different objects in JOSM." msgstr "Цвета, используемые разными объектами в JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:171 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:198 msgid "Colors" msgstr "Цвета" @@ -2180,5 +2168,6 @@ msgid "" "Login password to the OSM account. Leave blank to not store any password." -msgstr "Пароль учётной записи OSM. Оставьте пустым, чтобы не сохранять пароль." +msgstr "" +"Пароль учётной записи OSM. Оставьте пустым, чтобы не сохранять пароль." #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39 @@ -2196,7 +2185,7 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45 msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
            The password is transfered in plain text to the server, encoded in the " -"URL.
            Do not use a valuable Password." +"WARNING: The password is stored in plain text in the preferences " +"file.
            The password is transfered in plain text to the server, encoded in " +"the URL.
            Do not use a valuable Password." msgstr "" "Внимание! Пароль хранится в открытом виде в файле настроек.
            Пароль " @@ -2204,18 +2193,18 @@ "используйте ценный пароль.            " -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44 msgid "Sort presets menu" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46 msgid "Enable built-in defaults" msgstr "Использовать настройки по умолчанию" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:58 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69 msgid "Tagging preset source" msgstr "Источник предустановок тегов" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:156 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 @@ -2223,5 +2212,5 @@ msgstr "Пожалуйста, выберите ряд для редактирования." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500 @@ -2230,26 +2219,26 @@ msgstr "Пожалуйста, выберите ряд для удаления." +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88 +msgid "" +"The sources (URL or filename) of tagging preset definition files. See " +"http://josm.openstreetmap.de/wiki/TaggingPresets for help." +msgstr "" +"Источник (URL или имя файла) файла с предустановками тегов. См. " +"http://josm.openstreetmap.de/wiki/TaggingPresets для большей информации." + #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89 -msgid "" -"The sources (URL or filename) of tagging preset definition files. See http://" -"josm.openstreetmap.de/wiki/TaggingPresets for help." -msgstr "" -"Источник (URL или имя файла) файла с предустановками тегов. См. http://josm." -"openstreetmap.de/wiki/TaggingPresets для большей информации." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 msgid "Add a new tagging preset source to the list." msgstr "Добавить новый источник предустановки тегов в список." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 msgid "Delete the selected source from the list." msgstr "Удалить источник из списка." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:94 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93 msgid "Tagging Presets" msgstr "Предустановки тегов" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97 msgid "Tagging preset sources" msgstr "Источники предустановок тегов" @@ -2265,6 +2254,6 @@ "~)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:141 @@ -2272,34 +2261,34 @@ msgstr "Модули" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 msgid "Configure available plugins." msgstr "Настроить доступные модули." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43 msgid "Download List" msgstr "Скачать список" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:80 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51 msgid "Update" msgstr "Обновить" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:60 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 msgid "Configure Sites..." msgstr "Настроить сайты..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add either site-josm.xml or Wiki Pages." msgstr "Добавьте site-josm.xml, либо страницы Wiki" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99 msgid "Please select an entry." msgstr "Пожалуйста, выберите запись." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 msgid "Configure Plugin Sites" msgstr "Настроить сайты с модулями" @@ -2478,9 +2467,9 @@ msgstr "Калибровка звукозаписи" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "Display Settings" msgstr "Настройки экрана" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "" "Various settings that influence the visual representation of the whole " @@ -2488,55 +2477,63 @@ msgstr "Различные настройки, влияющие на внешний вид программы." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings" msgstr "Параметры соединения" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings for the OSM server." msgstr "Параметры соединения с сервером OSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Map Settings" msgstr "Настройки карты" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Settings for the map projection and data interpretation." msgstr "Параметры проекции карты и отображения данных" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Audio Settings" msgstr "Параметры Аудио" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Settings for the audio player and audio markers." msgstr "Параметры звукового проигрывателя, и звуковых маркеров." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97 msgid "You have to restart JOSM for some settings to take effect." msgstr "Необходимо перезапустить JOSM, чтобы изменения вступили в силу." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:25 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 msgid "Draw lines between raw gps points." msgstr "Отображать линии между точками трэков GPS" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:27 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 msgid "Force lines if no segments imported." msgstr "Отображать линии, даже если не импортировано сегментов." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:28 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 msgid "Draw large GPS points." msgstr "Отображать крупные точки GPS" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 -msgid "Color tracks by velocity." -msgstr "Цвет линий зависит от скорости." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34 +msgid "Velocity (red = slow, green = fast)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 +msgid "Dilution of Position (red = high, green = low, if available)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 +msgid "Single Color (can be customized for named layers)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:1346 msgid "Car" msgstr "Авто" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:309 trans_presets.java:635 trans_presets.java:833 #: trans_presets.java:842 trans_presets.java:851 trans_presets.java:864 @@ -2548,5 +2545,5 @@ msgstr "Вело" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:310 trans_presets.java:637 trans_presets.java:832 #: trans_presets.java:841 trans_presets.java:850 trans_presets.java:863 @@ -2557,15 +2554,15 @@ msgstr "Пешком" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 msgid "Draw Direction Arrows" msgstr "Отображать стрелки направления" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 msgid "Fast drawing (looks uglier)" msgstr "Быстрая отрисовка (выглядит хуже)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180 msgid "Only interesting direction hints (e.g. with oneway tag)." msgstr "" @@ -2573,30 +2570,30 @@ "односторонних дорог)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:186 msgid "Only on the head of a way." msgstr "Только в начале пути" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44 msgid "Draw segment order numbers" msgstr "Отображать порядковые номера сегментов" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45 msgid "Draw boundaries of downloaded data" msgstr "Отображать границы скачанных данных" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46 msgid "Draw virtual nodes in select mode" msgstr "Отображать виртуальные точки в режиме выделения" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47 msgid "Draw inactive layers in other color" msgstr "Отображать неактивные слои другим цветом" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 msgid "Smooth map graphics (antialiasing)" msgstr "Сглаженные линии (антиалиасинг)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 msgid "" "If your gps device draws too few lines, select this to draw lines along your " @@ -2606,5 +2603,5 @@ "соединить точки линиями." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:71 msgid "" "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines." @@ -2613,24 +2610,25 @@ "чтобы отображать все линии." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73 msgid "Maximum length (meters)" msgstr "Максимальная длина (в метрах)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:77 msgid "" "Force drawing of lines if the imported data contain no line information." msgstr "Отображать линии, даже если не импортировано информации о линиях." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:84 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89 msgid "Draw direction arrows for lines, connecting GPS points." msgstr "Отображать стрелки на линиях, соединяющих точки GPS." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90 -msgid "Draw the direction arrows using table lookups instead of complex math." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95 +msgid "" +"Draw the direction arrows using table lookups instead of complex math." msgstr "" "Отображать стрелки направления, используя таблицы, вместо математических " "вычислений." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:96 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:101 msgid "" "Don't draw arrows if they are not at least this distance away from the last " @@ -2638,49 +2636,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104 msgid "Minimum distance (pixels)" msgstr "Минимальное расстояние (в пикселях)" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:109 -msgid "Choose the hue for the track color by the velocity at that point." -msgstr "Выбрать цвет линии в зависимости от скорости в точке." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116 -msgid "Allows to tune the track coloring for different average speeds." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122 msgid "Draw larger dots for the GPS points." msgstr "Отображать точки GPS более жирно" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136 +msgid "" +"All points and track segments will have the same color. Can be customized in " +"Layer Manager." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137 +msgid "Colors points and track segments by velocity." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:138 +msgid "" +"Colors points and track segments by dilution of position (HDOP). Your " +"capture device needs to logs that information." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143 +msgid "Allows to tune the track coloring for different average speeds." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148 +msgid "Track and Point Coloring" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 msgid "GPS Points" msgstr "Точки GPS" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175 msgid "Draw direction hints for way segments." msgstr "Показывать направление на сегментах путей." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:163 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192 msgid "Draw the order numbers of all segments within their way." msgstr "Показывать порядковые номера на всех сегментах пути." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:168 -msgid "Apply antialiasing to the map view resulting in a smoother appearance." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:197 +msgid "" +"Apply antialiasing to the map view resulting in a smoother appearance." msgstr "Применить сглаживание карты." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202 msgid "Draw the boundaries of data loaded from the server." msgstr "Отображать границы области, скачанной с сервера." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:178 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:207 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "Отображать виртуальные точки в режиме выбора, для удобства правки." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212 msgid "Draw the inactive data layers in a different color." msgstr "Отображать неактивные слои данных другим цветом." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219 msgid "OSM Data" msgstr "Данные OSM" @@ -2790,6 +2805,6 @@ "a menu entry of button for the first time. So some of your changes may " "become active even without restart --- but also without collistion handling. " -"This is another reason to restart JOSM after making any changes here." -"

            " +"This is another reason to restart JOSM after making any changes " +"here.

            " msgstr "" "

            Кроме того, горячие клавиши активируются, если назначаются для какого-" @@ -2806,8 +2821,9 @@ "key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also " "there will be 'keys' listed that correspond to a shortcut on your keyboard " -"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/" -"Semicolon on US keyboards, '.'/Period on German keyboards, ...) instead. Not " -"doing so may result in conflicts, as there is no way for JOSM to know that " -"Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...

            " +"(e.g. ':'/Colon). Please also do not use them, use the base key " +"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) " +"instead. Not doing so may result in conflicts, as there is no way for JOSM " +"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US " +"keyboard...

            " msgstr "" "

            Вы можете заметить, что в списке выбора клавиш на следующей вкладке есть " @@ -2847,6 +2863,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183 msgid "" -"

            The pseudo-modifier 'disabled' will disable the shortcut when encountered." -"

            " +"

            The pseudo-modifier 'disabled' will disable the shortcut when " +"encountered.

            " msgstr "

            Псевдо-модификатор 'отключено' отключает горячую клавишу.

            " @@ -2916,67 +2932,67 @@ msgstr "Группы модификаторов" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:231 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:236 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:250 msgid "layer not in list." msgstr "слоя нет в списке." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "usage" msgstr "использование" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 msgid "options" msgstr "опции" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 msgid "Show this help" msgstr "Показать эту справку" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Standard unix geometry argument" msgstr "Стандартный параметр геометрии unix" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 msgid "Download the bounding box" msgstr "Скачать область в пределах рамки" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 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:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Open file (as raw gps, if .gpx)" msgstr "Открыть файл (как данные GPS, если .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 msgid "Download the bounding box as raw gps" msgstr "Скачать область в пределах рамки, как данные GPS" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Select with the given search" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 msgid "Don't launch in fullscreen mode" msgstr "Не запускать в полноэкранном режиме" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 msgid "Reset the preferences to default" msgstr "Восстановить параметры по умолчанию" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 msgid "Set the language." msgstr "Установить язык." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 msgid "examples" msgstr "примеры" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -2986,21 +3002,21 @@ "убедитесь, что загружаете данные перед --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 msgid "Instead of --download= you may specify osm://\n" msgstr "Вместо --download= можно указать osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 msgid "Activating updated plugins" msgstr "Включение обновлённых модулей" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 msgid "Loading early plugins" msgstr "Загрузка ранних модулей" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Setting defaults" msgstr "Настройки по умолчанию" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171 msgid "Loading plugins" msgstr "Загрузка модулей" @@ -3035,6 +3051,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:108 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:164 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:162 #: trans_presets.java:308 trans_presets.java:309 trans_presets.java:310 #: trans_presets.java:311 trans_presets.java:312 trans_presets.java:313 @@ -3051,5 +3067,5 @@ msgstr "неизвестный" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:66 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 #, java-format msgid "" @@ -3060,25 +3076,25 @@ "требуется." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 #, java-format msgid "Plugin requires JOSM update: {0}." msgstr "Для работы модуля нужна более новая версия JOSM: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "Модуль {0} требуется модулю {1}, но не найден." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 #, java-format msgid "Plugin not found: {0}." msgstr "Модуль не найден : {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Последнее обновление модулей более {0} дней назад" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 msgid "" "(You can change the number of days after which this warning appears
            by " @@ -3088,17 +3104,17 @@ "предупреждение, установив параметр настроек 'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 msgid "Disable plugin" msgstr "Отключить модуль" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Невозможно загрузить модуль {0}. Удалить из настроек?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -3108,5 +3124,5 @@ "разрешение переписывать существующие модули." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 #, java-format msgid "" @@ -3114,10 +3130,10 @@ msgstr "Произошла неожиданная ошибка. Возможно, она вызвана модулем ''{0}''." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Согласно информации в модуле, автором является {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:262 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -3126,9 +3142,9 @@ "ошибке." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 msgid "Should the plugin be disabled?" msgstr "Отключить модуль?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:278 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -3138,5 +3154,5 @@ "модуль." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -3145,6 +3161,6 @@ "Невозможно удалить модуль. Сообщите разработчикам JOSM об этой проблеме." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:322 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:181 msgid "no description available" msgstr "описание отсутствует" @@ -3156,5 +3172,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 msgid "Update Plugins" msgstr "Обновить модули" @@ -3190,5 +3206,5 @@ msgstr "Модуль {0} поврежден, либо не скачался автоматически" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 #, java-format msgid "Downloaded plugin information from {0} site" @@ -3198,13 +3214,13 @@ msgstr[2] "Скачать информацию о модуле с {0} сайтов" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 msgid "No plugin information found." msgstr "Информации о модулях не найдено." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:76 msgid "All installed plugins are up to date." msgstr "Все установленные модули имеют последнюю версию." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 #, java-format msgid "" @@ -3217,9 +3233,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:105 msgid "Download missing plugins" msgstr "Скачивание недостающих модулей" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:106 #, java-format msgid "" @@ -3232,22 +3248,22 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 msgid "Download Plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:170 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:168 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Версия {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:176 msgid "Plugin bundled with JOSM" msgstr "Модуль из поставки JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208 msgid "Plugin already exists" msgstr "Модуль уже существует" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:211 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:209 #, java-format msgid "" @@ -3262,15 +3278,15 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 msgid "Delete and Download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:222 #, java-format msgid "Error deleting plugin file: {0}" msgstr "Ошибка при скачивании модуля: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:281 #, java-format msgid "Error reading plugin information file: {0}" @@ -3338,10 +3354,10 @@ msgstr "Удалить {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:165 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 msgid "Conflicting relation" msgstr "Конфликтующее отношение" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 #, java-format msgid "" @@ -3352,5 +3368,5 @@ "Удалить из отношения?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:166 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 #, java-format msgid "" @@ -3367,7 +3383,7 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:349 msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
            This can cause problems because other objects (that you don't see) might " -"use them.
            Do you really want to delete?" +"You are about to delete nodes outside of the area you have " +"downloaded.
            This can cause problems because other objects (that you don't " +"see) might use them.
            Do you really want to delete?" msgstr "" "Вы собираетесь удалить точки, выходящие за скачанную зону.
            Это может " @@ -3493,124 +3509,135 @@ msgstr "Невозможно скачать параметры с сервера." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:232 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "Путь, обозначающий границу области, не закрыт." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:426 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:428 #, java-format msgid "multipolygon way ''{0}'' is not closed." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:527 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:765 +msgstr "многополигональная линия ''{0}'' не замкнута" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:776 msgid "Empty member in relation." msgstr "В отношении имеется пустой член." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:767 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:531 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "В отношении «{0}» имеется член, который был удален." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:547 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Путь «{0}» имеет меньше двух точек." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:552 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:549 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:558 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:561 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 +msgid "More than one \"via\" found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 #, java-format msgid "Unknown role ''{0}''." msgstr "Неизвестная роль «{0}»." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Неизвестный тип членства для «{0}»." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 msgid "No \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 msgid "No \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -msgid "No \"via\" node found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +msgid "No \"via\" node or way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:636 -#, java-format -msgid "The \"{0}\" way must contain at least 2 nodes." -msgstr "Путь «{0}» должен иметь как минимум 2 точки." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:731 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +msgid "The \"to\" way doesn't start or end at a \"via\" node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:620 +msgid "The \"from\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:624 +msgid "The \"to\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:742 #, java-format msgid "Style for restriction {0} not found." msgstr "Стиль для ограничения {0} не найден." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 #, java-format msgid "Non-Way ''{0}'' in multipolygon." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:847 +msgstr "не-линия ''{0}'' в мультиполигональном отношении" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:858 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Для мультиполигона «{0}» отсутствует внешний путь." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Перекрёсток между линиями ''{0}'' и ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:949 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Внутренний путь «{0}» находится снаружи." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:987 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:998 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1012 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1023 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1195 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1206 msgid "untagged" msgstr "без тэга" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1196 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207 msgid "text" msgstr "текст" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" msgstr "неактивный" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:94 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:181 @@ -3618,13 +3645,13 @@ msgstr "выбранные" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" msgstr "линия без тэгов" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 msgid "incomplete way" msgstr "незаконченная линия" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 msgid "highlight" msgstr "" @@ -3646,5 +3673,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:113 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:89 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:77 msgid "incomplete" @@ -3675,14 +3702,14 @@ msgstr[2] "{0} участников" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 msgid "Duplicate" msgstr "Дублировать" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 msgid "Duplicate selection by copy and immediate paste." msgstr "Создать копию выделения копированием и вставкой." -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 @@ -3691,5 +3718,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -3760,7 +3787,9 @@ msgstr "Открыть в браузере историю изменений выделенного объекта." -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:57 -msgid "Please select at least one node, way or relation." -msgstr "Пожалуйста, выберите хотя бы одну точку, путь или отношение." +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:60 +msgid "" +"Please select at least one node, way or relation. Only already uploaded " +"elements have a history." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 @@ -3783,7 +3812,7 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/TerracerAction.java:47 @@ -3810,9 +3839,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:124 msgid "Distribute Nodes" -msgstr "" +msgstr "Распределить точки" #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 msgid "Distribute the selected nodes to equal distances along a line." -msgstr "" +msgstr "Расположить точки на равных расстояниях вдоль линии." #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68 @@ -3920,5 +3949,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:123 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:314 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:315 msgid "Enter values for all conflicts." msgstr "Введите значения для всех конфликтов." @@ -3926,5 +3955,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 msgid "Solve Conflicts" msgstr "" @@ -4060,5 +4089,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #, java-format @@ -4085,16 +4114,19 @@ msgstr[1] "Выбранные точки не являются частью пути." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125 -msgid "" -"There is more than one way using the node(s) you selected. Please select the " +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 +msgid "" +"There is more than one way using the node you selected. Please select the " "way also." -msgstr "" -"Выделенная точка входит в несколько линий. Пожалуйста, выделите и линию тоже." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133 +msgid_plural "" +"There is more than one way using the nodes you selected. Please select the " +"way also." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137 msgid "The selected nodes do not share the same way." msgstr "Выбранные точки не являются частью одной линии." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -4103,10 +4135,10 @@ msgstr[2] "Выбранная линия не содержит выбранных точек" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229 msgid "You must select two or more nodes to split a circular way." msgstr "Чтобы разделить замкнутую линию, выберите две или более точки." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -4116,5 +4148,5 @@ "линии)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 msgid "" "A role based relation membership was copied to all new ways.\n" @@ -4124,5 +4156,5 @@ "Проверьте, и при необходимости внесите корректировки." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:296 #, java-format msgid "Split way {0} into {1} parts" @@ -4216,5 +4248,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Upload Changes" -msgstr "" +msgstr "Загрузить изменения" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 @@ -4396,5 +4428,6 @@ msgid "" "type: - type of the object (node, way, relation)" -msgstr "type: - тип объекта (node, way, relation)" +msgstr "" +"type: - тип объекта (node, way, relation)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 @@ -4516,5 +4549,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 msgid "Align Nodes in Circle" msgstr "Выстроить точки окружностью" @@ -4528,5 +4561,5 @@ msgstr "Некоторые точки - (почти) на одной линии" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 msgid "Please select at least four nodes." msgstr "Выделите не менее четырёх точек." @@ -4595,4 +4628,32 @@ msgstr "При восстановлении из резервной копии возникла ошибка." +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "" +"Show status report with useful information that can be attached to bugs" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92 +msgid "Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +msgid "Copy to clipboard and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 +msgid "Close" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 @@ -4604,13 +4665,13 @@ msgstr "Вернуть последнее отменённое действие." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:44 msgid "Delete Mode" msgstr "Режим удаления" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:46 msgid "Delete nodes or ways." msgstr "Удалить точки или линии." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:84 @@ -4621,5 +4682,5 @@ msgstr "Режим: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:130 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -4632,6 +4693,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:87 msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." +"Drag play head and release near track to play audio from there; " +"SHIFT+release to synchronize audio at that point." msgstr "" @@ -4645,23 +4706,23 @@ msgstr "Создание областей" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 msgid "Extrude Way" msgstr "Выдавливание линии" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:252 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:416 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:430 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Отпустите кнопку мыши, чтобы выделить объекты в прямоугольнике." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 msgid "Draw a rectangle of the desired size, then release the mouse button." msgstr "Нарисуйте прямоугольник желаемых размеров, и отпустите кнопку мыши." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:420 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:434 msgid "Release the mouse button to stop rotating." msgstr "Отпустите кнопку мыши, чтобы прекратить вращение." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 msgid "Drag a way segment to make a rectangle." msgstr "Перемещайте сегмент линии, чтобы образовать прямоугольник" @@ -4729,14 +4790,14 @@ msgstr "Выбирать, двигать и вращать объекты" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:191 msgid "Add and move a virtual new node to way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:220 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:223 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 msgid "Cannot move objects outside of the world." msgstr "Невозможно переместить объекты за пределы мира." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:418 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:432 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -4745,5 +4806,5 @@ "объединения с ближайшей точкой." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:422 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:436 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to remove); Shift-" @@ -4820,10 +4881,10 @@ msgstr "Объединить {0} точек" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Orthogonalize Shape" msgstr "Сделать углы прямыми" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "" @@ -4831,13 +4892,13 @@ "градусов" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 msgid "Only two nodes allowed" msgstr "Возможно выбрать только две точки" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 msgid "Selection must consist only of ways." msgstr "Возможно выбирать только линии." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 msgid "Please select one or more closed ways of at least four nodes." msgstr "" @@ -4845,5 +4906,5 @@ "точек." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 msgid "Please select ways with almost right angles to orthogonalize." msgstr "" @@ -4851,5 +4912,5 @@ "функции." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 msgid "" "You are using the EPSG:4326 projection which might lead
            to " @@ -4861,9 +4922,9 @@ "предупреждение больше не появлялось.
            Всё равно продолжить?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "Only one node selected" msgstr "Выбрана только одна точка" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 msgid "Orthogonalize" msgstr "Сделать углы прямыми" @@ -4914,5 +4975,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101 -msgid "Please select exactly three nodes or one way with exactly three nodes." +msgid "" +"Please select exactly three nodes or one way with exactly three nodes." msgstr "" "Пожалуйста, выберите ровно три точки, или линию, состоящую ровно из трёх " @@ -4923,52 +4985,69 @@ msgstr "Точки не расположены по кругу" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../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:71 +msgid "Update Data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:72 +#, java-format +msgid "" +"This action will require {0} individual download requests. Do you wish to " +"continue?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 msgid "Open Location..." msgstr "Открыть адрес..." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 msgid "Open an URL." msgstr "Открыть ссылку." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 msgid "Separate Layer" msgstr "На отдельный слой" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 msgid "Enter URL to download:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 msgid "Download Location" msgstr "Путь загрузки" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 msgid "Download URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 msgid "Add Node..." msgstr "Добавить точку..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 msgid "Add a node by entering latitude and longitude." msgstr "Добавить точку, указав её широту и долготу" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 msgid "Enter the coordinates for the new node." msgstr "Введите координаты новой точки" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 msgid "Use decimal degrees." msgstr "Использовать десятичные градусы" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 msgid "Negative values denote Western/Southern hemisphere." msgstr "Отрицательные значения обозначают западное/южное полушарие" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 #: ../plugins/livegps/livegps/LiveGpsDialog.java:54 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93 @@ -4977,5 +5056,5 @@ msgstr "Широта" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 #: ../plugins/livegps/livegps/LiveGpsDialog.java:56 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96 @@ -5018,14 +5097,14 @@ msgstr "Перемещает объекты {0}" +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "Overwrite" msgstr "Перезаписать" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "File exists. Overwrite?" msgstr "Файл уже существует. Перезаписать?" @@ -5044,48 +5123,53 @@ msgstr "Выделите что-нибудь для копирования." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Разъединить линии" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "Дублировать точки, используемые несколькими линиями." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 msgid "This node is not glued to anything else." msgstr "Данная точка не связана с чем-либо еще." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 msgid "None of these nodes are glued to anything else." msgstr "Ни одна из этих точек не притянута к другим." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of this way's nodes are glued to anything else." msgstr "Ни одна из этих линий не притянута к другим." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 msgid "The current selection cannot be used for unglueing." msgstr "Выделенные объекты невозможно разъединить" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "Select either:" msgstr "Выберите один из вариантов:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +msgid "* One tagged node, or" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "* One node that is used by more than one way, or" msgstr "* Одна точка, используемая несколькими линиями, либо" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 -msgid "* One node that is used by more than one way and one of those ways, or" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +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:104 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 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:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -5094,5 +5178,5 @@ "несколькими линиями." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -5105,10 +5189,14 @@ "дубликаты точек, и все точки будут выбраны" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:160 +msgid "Unglued Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:373 #, java-format msgid "Dupe into {0} nodes" msgstr "Дублировать в {0} точек" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:320 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:397 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -5209,5 +5297,5 @@ msgstr "Отменить последнее действие." -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 msgid "No Shortcut" msgstr "Нет ярлыка" @@ -5229,13 +5317,13 @@ msgstr "Данные OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:29 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:28 msgid "Downloading GPS data" msgstr "Скачивание данных GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:41 msgid "Downloaded GPX Data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:71 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:69 msgid "Raw GPS data" msgstr "Данные GPS" @@ -5458,5 +5546,6 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169 -msgid "Header contains several values and cannot be mapped to a single string" +msgid "" +"Header contains several values and cannot be mapped to a single string" msgstr "" "Заголовок содержит несколько значений, и не может быть представлен одной " @@ -5815,5 +5904,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69 -msgid "Maximum number of segments allowed in each generated way. Default 250." +msgid "" +"Maximum number of segments allowed in each generated way. Default 250." msgstr "" "Максимальное количество сегментов в создаваемых линиях. По умолчанию - 250." @@ -5833,10 +5923,11 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72 msgid "" -"Accuracy of Douglas-Peucker line simplification, measured in degrees." -"
            Lower values give more nodes, and more accurate lines. Default 0.0003." -msgstr "" -"Точность алгоритма упрощения линий Douglas-Peucker, измеряемая в градусах." -"
            Меньшие значения дают больше точек, большие — более точные линии. По " -"умолчанию 0.0003." +"Accuracy of Douglas-Peucker line simplification, measured in " +"degrees.
            Lower values give more nodes, and more accurate lines. Default " +"0.0003." +msgstr "" +"Точность алгоритма упрощения линий Douglas-Peucker, измеряемая в " +"градусах.
            Меньшие значения дают больше точек, большие — более точные " +"линии. По умолчанию 0.0003." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73 @@ -6378,5 +6469,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 msgid "This test checks for untagged nodes that are not part of any way." -msgstr "Этот тест ищет точки, не имеющие тегов, и не являющиеся частью линий." +msgstr "" +"Этот тест ищет точки, не имеющие тегов, и не являющиеся частью линий." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:140 @@ -6477,6 +6569,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:509 msgid "" -"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." -"org/index.php/User:JLS/speller) or tag checking data files." +"The sources (URL or filename) of spell check (see " +"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking " +"data files." msgstr "" @@ -6933,6 +7026,6 @@ msgstr "Добавить новый слой" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:40 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:43 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 #, java-format @@ -6940,18 +7033,29 @@ msgstr "Загружается {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:51 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:55 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 msgid "Contacting WMS Server..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157 msgid "Create buildings" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 msgid "CadastreGrabber: Illegal url." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +msgid "" +"To avoid cadastre WMS overload,\n" +"building import size is limited to 1 km2 max." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" @@ -6974,16 +7078,25 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:128 +msgid "Cadastre" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:139 +msgid "Auto sourcing" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164 +msgid "Invalid projection" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 +#, java-format +msgid "Change the projection to {0} first." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:169 msgid "" "To enable the cadastre WMS plugin, change\n" "the JOSM projection to Lambert and restart" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132 -msgid "Cadastre" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 -msgid "Auto sourcing" msgstr "" @@ -7056,6 +7169,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:43 msgid "" -"More than one WMS layer present.\n" -"Select one of them first, then retry." +"More than one WMS layer present\n" +"Select one of them first, then retry" msgstr "" @@ -7064,5 +7177,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136 #, java-format @@ -7072,13 +7185,13 @@ msgstr[1] "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61 msgid "Extract SVG ViewBox..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65 msgid "Extract best fitting boundary..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:120 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126 msgid "Create boundary" msgstr "" @@ -7114,15 +7227,15 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 msgid "Save WMS layer to file" msgstr "Сохранить слой WMS в файл" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "Load WMS layer from file" msgstr "Загрузить слой WMS из файла" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -7130,5 +7243,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 msgid "File Format Error" msgstr "Ошибка формата файла" @@ -7136,5 +7249,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 msgid "Error loading file" msgstr "Ошибка при загрузке файла" @@ -7160,52 +7273,53 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 msgid "Replace original background by JOSM background color." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30 msgid "Reverse grey colors (for black backgrounds)." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 msgid "Set background transparent." msgstr "Установить прозрачный фон." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34 msgid "Draw boundaries of downloaded data." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Enable automatic caching." msgstr "Включить автоматическое кеширование." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 msgid "Max. cache size (in MB)" msgstr "Макс. размер кеша (МБ)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:53 -msgid "" -"A special handler of the french cadastre wms at www.cadastre.gouv." -"fr

            Please read the Terms and Conditions of Use here (in french): " -"
            http://www.cadastre.gouv.fr/scpc/html/" -"CU_01_ConditionsGenerales_fr.html
            before any upload of data created " -"by this plugin." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:58 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:55 +msgid "" +"A special handler of the french cadastre wms at " +"www.cadastre.gouv.fr

            Please read the Terms and Conditions of Use here " +"(in french):
            " +"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " +"
            before any upload of data created by this plugin." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 msgid "French cadastre WMS" msgstr "WMS французского кадастра" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65 msgid "Source" msgstr "Источник" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -7213,26 +7327,40 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 -msgid "" -"Invert the original texts from black to white (and all intermediate greys)." +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +msgid "" +"Invert the original black and white colors (and all intermediate greys). " +"Useful for texts on dark backgrounds." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 +msgid "Allows multiple layers stacking" msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 -msgid "Allows multiple layers stacking" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:99 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:113 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 msgid "Image grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:162 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:125 +msgid "Grab smaller images (higher quality but use more memory)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +msgid "Fixed size square (default is 100m)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +msgid "Fixed size (from 25 to 1000 meters)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -7344,5 +7472,5 @@ msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:254 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:255 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -7487,7 +7615,7 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:203 msgid "" -"Take a photo of your GPS receiver while it displays the time." -"
            Display that photo here.
            And then, simply capture the time you read " -"on the photo and select a timezone
            " +"Take a photo of your GPS receiver while it displays the " +"time.
            Display that photo here.
            And then, simply capture the time you " +"read on the photo and select a timezone
            " msgstr "" @@ -7554,5 +7682,6 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:484 -msgid "I can take a picture of my GPS receiver.
            Can this help?" +msgid "" +"I can take a picture of my GPS receiver.
            Can this help?" msgstr "" "Я могу сфотографировать экран GPS приёмника.
            Это поможет?" @@ -7597,5 +7726,5 @@ msgstr "Недопустимый часовой пояс" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #, java-format msgid "" @@ -7604,14 +7733,14 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:579 msgid "Invalid offset" msgstr "Недопустимое смещение" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:641 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:643 #, java-format msgid "Found {0} matchs of {1} in GPX track {2}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:642 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:644 msgid "GPX Track loaded" msgstr "Трек GPX загружен" @@ -7619,5 +7748,5 @@ #: ../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/UploadDataGui.java:79 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 msgid "Upload Traces" msgstr "" @@ -7627,58 +7756,72 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 -msgid "Upload GPX track" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71 +msgid "Upload Trace" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Public" msgstr "Публичный" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 msgid "Selected makes your trace public in openstreetmap.org" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Description" msgstr "Описание" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:123 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 msgid "Tags" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:182 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:153 +#, java-format +msgid "Selected track: {0}" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:176 msgid "Connecting..." msgstr "Подключение..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 -msgid "Uploading GPX track..." -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:214 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:199 +msgid "Upload cancelled" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:209 +msgid "Error while uploading" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:227 -msgid "Error while uploading" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:235 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +msgid "Upload failed. Server returned the following message: " +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 +#, java-format +msgid "Uploading GPX track: {0}% ({1} of {2})" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:252 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:241 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:244 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "" @@ -7899,15 +8042,15 @@ msgstr "Автоматическое скачивание" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "Автоматическое скачивание слоя WMS ({0}), в масштабе {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Скачивание слоя WMS ({0}), в масштабе {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -7916,17 +8059,17 @@ "измените разрешение" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:232 msgid "Download visible tiles" msgstr "Скачать видимые квадраты" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241 msgid "Change resolution" msgstr "Изменить разрешение" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:253 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:264 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:271 msgid "Alpha channel" msgstr "" @@ -9355,5 +9498,5 @@ #: trans_presets.java:754 msgid "Pedestrian crossing type" -msgstr "" +msgstr "Тип пешеходного перехода" #: trans_presets.java:754 trans_presets.java:769 trans_presets.java:1309 @@ -9419,5 +9562,5 @@ #: trans_presets.java:764 msgid "Pedestrian Crossing" -msgstr "" +msgstr "Пешеходный переход" #: trans_presets.java:767 @@ -9459,5 +9602,5 @@ #: trans_presets.java:795 msgid "Signpost" -msgstr "" +msgstr "Столб с указателями" #: trans_presets.java:798 @@ -12075,9 +12218,9 @@ #: trans_presets.java:2410 msgid "Furniture" -msgstr "" +msgstr "Мебельный" #: trans_presets.java:2411 msgid "Edit Furniture Shop" -msgstr "" +msgstr "Править мебельный магазин" #: trans_presets.java:2415 @@ -12179,9 +12322,9 @@ #: trans_presets.java:2481 msgid "optician" -msgstr "" +msgstr "оптика" #: trans_presets.java:2482 msgid "Edit Optician" -msgstr "" +msgstr "Править оптику" #: trans_presets.java:2488 @@ -12323,5 +12466,5 @@ #: trans_presets.java:2585 msgid "City" -msgstr "Город (до 100 000)" +msgstr "Город (более 100 000)" #: trans_presets.java:2586 @@ -12331,5 +12474,5 @@ #: trans_presets.java:2591 msgid "Town" -msgstr "Город (более 100 000)" +msgstr "Город (до 100 000)" #: trans_presets.java:2593 @@ -12731,9 +12874,9 @@ #: trans_presets.java:2905 msgid "Multipolygon" -msgstr "" +msgstr "Мультиполигональное" #: trans_presets.java:2909 msgid "Edit a Multipolygon" -msgstr "" +msgstr "Править мультиполигональное отношение" #: trans_presets.java:2915 @@ -12797,4 +12940,43 @@ msgstr "" +#~ msgid "Please select something from the conflict list." +#~ msgstr "Пожалуйста, выберите что-либо из списка конфликтов." + +#~ msgid "Upload this trace..." +#~ msgstr "Загрузить этот маршрут" + +#~ msgid "" +#~ "This functionality has been added only recently. Please
            use with " +#~ "care and check if it works as expected." +#~ msgstr "" +#~ "Данная функциональность добавлена совсем недавно. " +#~ "Пожалуйста,
            пользуйтесь с осторожностью, и проверяйте, чтоб всё работало, " +#~ "как надо." + +#~ msgid "Upload track filtered by JOSM" +#~ msgstr "Загрузить маршрут, отфильтрованный в JOSM" + +#~ msgid "Upload raw file: " +#~ msgstr "Загрузить необработанный файл: " + +#~ msgid "Description:" +#~ msgstr "Описание:" + +#~ msgid "Tags (keywords in GPX):" +#~ msgstr "Тэги (ключевые слова в GPX)" + +#~ msgid "GPX-Upload" +#~ msgstr "Загрузка GPX" + +#, java-format +#~ msgid "Upload raw file: {0}" +#~ msgstr "Загрузить необработанный файл: {0}" + +#~ msgid "Tags:" +#~ msgstr "Тэги:" + +#~ msgid "Choose the hue for the track color by the velocity at that point." +#~ msgstr "Выбрать цвет линии в зависимости от скорости в точке." + #~ msgid "Highway Exit" #~ msgstr "Съезд с дороги" Index: /applications/editors/josm/i18n/po/sk.po =================================================================== --- /applications/editors/josm/i18n/po/sk.po (revision 13832) +++ /applications/editors/josm/i18n/po/sk.po (revision 13833) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-15 22:03+0100\n" -"PO-Revision-Date: 2009-02-15 06:45+0000\n" +"POT-Creation-Date: 2009-02-21 16:35+0100\n" +"PO-Revision-Date: 2009-02-22 04:52+0000\n" "Last-Translator: Vlado \n" "Language-Team: Slovak \n" @@ -16,8 +16,8 @@ "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-02-15 20:41+0000\n" +"X-Launchpad-Export-Date: 2009-02-22 20:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 #, java-format msgid "" @@ -30,5 +30,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 msgid "" "This action will have no shortcut.\n" @@ -38,5 +38,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -47,5 +47,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Pomoc: Skratky môžeš modifikovať v nastaveniach)" @@ -56,17 +56,17 @@ #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 msgid "Information" msgstr "Informácia" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Do nothing" msgstr "Neurobiť nič" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Report Bug" msgstr "Nahlásiť chybu" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 msgid "" "An unexpected exception occurred.\n" @@ -77,21 +77,21 @@ "V programe sa vyskytla chyba.\n" "\n" -"Ak používaš najnovšiu verziu JOSM buďte taký dobrý a oznámte (vložte do " +"Ak používate najnovšiu verziu JOSM, buďte taký dobrý a odošlite (vložte do " "databázy chýb) správu." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Unexpected Exception" msgstr "Neočakávaná chyba programu." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 #, java-format msgid "Please report a ticket at {0}" msgstr "Prosíme napíšte chybovú správu v {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "Opíšte (detailne) kroky, ktoré vedú k chybe." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:78 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -101,9 +101,9 @@ "hlásením chyby." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Be sure to include the following information:" msgstr "Prosím pripojte nasledujúcu informáciu:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75 msgid "(The text has already been copied to your clipboard.)" msgstr "(Text už bol skopírovaný do schránky.)" @@ -117,5 +117,5 @@ msgstr "Chyba prehrávánia zvuku" -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:94 @@ -123,5 +123,5 @@ msgstr "Kontaktujem OSM Server..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:48 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:32 @@ -129,10 +129,10 @@ msgstr "Sťahujem OSM dáta..." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 msgid "NullPointerException, possibly some missing tags." msgstr "NullPointerException, pravdepodobne chýbajú niektoré značky (tagy)." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83 msgid "Preparing data..." msgstr "Pripravujem dáta..." @@ -162,48 +162,48 @@ msgstr "Sťahujem body {0} až {1}..." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:164 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:168 msgid "Unknown version" msgstr "Neznáma verzia" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 msgid "Found element in non-way." msgstr "Nájdený element mimo cesty." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 msgid " has zero ref" msgstr " má nulový ref" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 msgid "Found element in non-relation." msgstr "Nájdený element mimo relácie." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:252 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250 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:294 msgid "Illegal object with id=0" msgstr "Neplatný objekt s id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Chýba povinný atribút \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 #, java-format msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" msgstr "Vynecháva sa cesta pretože obsahuje body ktoré neexistujú: {0}\n" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:502 msgid "Prepare OSM data..." msgstr "Pripravujem OSM dáta..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:518 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:516 msgid "Ill-formed node id" msgstr "Zle formulované id bodu" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:280 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:287 msgid "Parse error: invalid document structure for gpx document" msgstr "Chyba parsovania: Chybná štruktúra GPX dokumentu" @@ -213,18 +213,18 @@ msgstr "Kontaktujem server..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 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/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 msgid "Commit comment" msgstr "Poslať komentár" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" msgstr "{0}% ({1}/{2}), {3} ostáva. Odosielam {4}: {5} (id: {6})" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64 @@ -234,34 +234,32 @@ msgstr "Nastala chyba : {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:192 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190 msgid "Opening changeset..." msgstr "Otváranie kontroly..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:226 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224 msgid "Server does not support changesets" msgstr "Server neobsahuje kontroly" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:246 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:428 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:609 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:184 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607 msgid "Unknown host" msgstr "Neznámy hostiteľ" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282 msgid "Preparing..." msgstr "Pripravujem..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:294 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292 msgid "Uploading..." msgstr "Nahrávam..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375 msgid "Closing changeset..." msgstr "Zatváranie kontroly..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:652 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650 msgid "Transfer aborted due to error (will wait for 5 seconds):" msgstr "Prenos pre chybu ukončený (budem čakať 5 sekúnd):" @@ -299,17 +297,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95 #: ../core/src/org/openstreetmap/josm/Main.java:348 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:29 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 @@ -322,11 +323,11 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:110 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -341,11 +342,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:186 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 msgid "Creating main GUI" msgstr "Vytváram hlavné grafické rozhranie ( GUI )" #: ../core/src/org/openstreetmap/josm/Main.java:195 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:271 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:278 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:56 msgid "Help" @@ -387,21 +388,21 @@ msgstr "Ignorujem poškodený súbor z URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109 msgid "min lat" msgstr "min šírka" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111 msgid "min lon" msgstr "min dĺžka" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:117 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "max lat" msgstr "max šírka" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 msgid "max lon" msgstr "max dĺžka" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:122 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -411,5 +412,5 @@ "oblasti)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:134 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130 msgid "Bounding Box" msgstr "Ohraničujúcí box" @@ -445,6 +446,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:96 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:894 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:956 msgid "name" msgstr "meno" @@ -477,5 +478,5 @@ msgstr "zväčšenie" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:107 msgid "" "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -485,5 +486,5 @@ "tlačítko myši a hýbte myšou. Výber: Kľuk." -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:109 msgid "Slippy map" msgstr "Slippy map" @@ -494,7 +495,7 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:605 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:602 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:89 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -514,5 +515,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380 msgid "Remove" msgstr "Odstrániť" @@ -656,20 +657,20 @@ "Ak je špecifikovaný(určený), reset konfigurácie namiesto jej načítania." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:109 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:186 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:198 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:108 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:191 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:203 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 msgid "Java OpenStreetMap Editor" msgstr "Java OpenStreetMap Editor" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:111 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:110 msgid "Message of the day not available" msgstr "Správu dňa nie je možné zobraziť" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:200 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:205 msgid "Downloading \"Message of the day\"" msgstr "Sťahujem \"Správu dňa\"" @@ -709,33 +710,33 @@ msgstr "Oddialiť" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:234 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:474 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:512 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:383 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:380 msgid "More information about this feature" msgstr "Viac informácii o tejto vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:393 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:390 msgid "Optional Attributes:" msgstr "Voliteľné atribúty:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:437 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Použiť prednastavenie \"{0}\" zo skupiny \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:438 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:435 #, java-format msgid "Use preset ''{0}''" msgstr "Použiť prednastavenie \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 msgid "way" @@ -745,11 +746,11 @@ msgstr[2] "ciest" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:214 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 msgid "node" msgid_plural "nodes" @@ -758,6 +759,6 @@ msgstr[2] "bodov" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:81 @@ -768,14 +769,14 @@ msgstr[2] "vzťahov (relations)" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 msgid "closedway" msgstr "uzavratá cesta" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:475 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 #, java-format msgid "Unknown type: {0}" msgstr "Neznány typ (druh): {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:549 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 #, java-format @@ -783,15 +784,15 @@ msgstr "Nemôžem načítať tagging preset source: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:555 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 #, java-format msgid "Error parsing {0}: " msgstr "Chyba rozkladania(parsovania) {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:572 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:569 #, 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:607 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595 #, java-format msgid "Change {0} object" @@ -801,9 +802,17 @@ msgstr[2] "Zmeniť {0} objektov" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 msgid "Nothing selected!" msgstr "Nič nie je vybraté!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 +msgid "Selection unsuitable!" +msgstr "Nevhodný výber!" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +msgid "Apply Preset" +msgstr "Použiť predvolené" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 msgid "Change Properties" msgstr "Zmeniť vlastnosti" @@ -814,14 +823,14 @@ msgstr "Predvolená skupina ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:107 msgid "File" msgstr "Súbor" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:135 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:107 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:86 @@ -833,22 +842,22 @@ msgstr "Upraviť" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 msgid "View" msgstr "Zobraziť" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:26 msgid "Tools" msgstr "Nástroje" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:141 msgid "Audio" msgstr "Zvuk" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:142 msgid "Presets" msgstr "Predvoľby" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:40 @@ -860,18 +869,18 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:210 msgid "Wireframe View" msgstr "Drôtový model" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212 msgid "Toggle Wireframe view" msgstr "Prepnúť drôtový model" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:28 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 msgid "Contacting the OSM server..." msgstr "Kontaktujem OSM server..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 #, java-format msgid "This will change up to {0} object." @@ -881,11 +890,11 @@ msgstr[2] "Toto zmení až {0} objekty." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 msgid "An empty value deletes the key." msgstr "Prázdna hodnota zmaže klúče" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66 @@ -895,7 +904,7 @@ msgstr "Kĺúč" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 @@ -904,10 +913,10 @@ msgstr "Hodnota" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333 msgid "Change values?" msgstr "Zmeniť hodnoty ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:257 #, java-format msgid "Change properties of up to {0} object" @@ -917,33 +926,33 @@ msgstr[2] "Zmeniť vlastnosti až {0} objektov." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 msgid "Please select a key" msgstr "Vyberte prosím kľúč" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321 msgid "Please select a value" msgstr "Vyberte prosím hodnotu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:445 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:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 msgid "Properties/Memberships" msgstr "Vlastnosti/Členstvo(memberships)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 msgid "Properties for selected objects." msgstr "Vlastnosti pre zvolené objekty" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97 @@ -955,58 +964,58 @@ msgstr "Prepnúť: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 msgid "Member Of" msgstr "Člen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Role" msgstr "Úloha" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:559 msgid "Change relation" msgstr "Zmeniť reláciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560 #, 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:564 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 msgid "Delete from relation" msgstr "Zmazať z relácie (zo vzťahu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:600 msgid "Add Properties" msgstr "Pridať vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 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:609 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 msgid "Edit Properties" msgstr "Upraviť vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609 msgid "Edit the value of the selected key for all objects" msgstr "Zmeniť hodnotu zvoleného klúča pre všetky objekty" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 msgid "Delete Properties" msgstr "Zmazať vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:77 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:293 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 @@ -1015,98 +1024,115 @@ msgstr "Odstrániť" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 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:766 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:763 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Vlastnosti: {0} / Memberships: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:769 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 msgid "Properties / Memberships" msgstr "Vlastnosti / Memberships" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178 +msgid "Apply Changes" +msgstr "Použiť zmeny" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 msgid "Create new relation" msgstr "Vytvoriť novú reláciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208 msgid "Edit new relation" msgstr "Upraviť novú reláciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209 #, java-format msgid "Edit relation #{0}" msgstr "Upraviť reláciu #{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230 +msgid "Basic" +msgstr "Základný" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Occupied By" msgstr "Zaneprázdnený" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311 msgid "Tags (empty value deletes tag)" msgstr "Značky (prázdne hodnoty zmazaných značiek)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313 msgid "Members" msgstr "Členovia" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 +msgid "Move Up" +msgstr "Posunút Hore" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 msgid "Move the currently selected members up" msgstr "Pridať všetky zvolené objekty medzi členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358 +msgid "Add Selected" +msgstr "Pridať vybrané" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359 +msgid "Add all currently selected objects as members" +msgstr "Pridať všetky zvolené objekty medzi členy" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365 +msgid "Remove Selected" +msgstr "Odstrániť označené" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366 +msgid "Remove all currently selected objects from relation" +msgstr "Odstrániť všetky vybrané objekty z relácie(zo vzťahu)" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 +msgid "Move Down" +msgstr "Posunúť dole" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 msgid "Move the currently selected members down" msgstr "Presunúť zvolenú vrstvu o riadok dolu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356 -msgid "Add Selected" -msgstr "Pridať vybrané" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:357 -msgid "Add all currently selected objects as members" -msgstr "Pridať všetky zvolené objekty medzi členy" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:363 -msgid "Remove Selected" -msgstr "Odstrániť označené" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:364 -msgid "Remove all currently selected objects from relation" -msgstr "Odstrániť všetky vybrané objekty z relácie(zo vzťahu)" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381 msgid "Remove the member in the current table row from this relation" msgstr "Odstrániť člena(member) v aktuálnom riadku tabuľky z tejto relácie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394 msgid "Download Members" msgstr "Stiahnuť členov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:406 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395 msgid "Download all incomplete ways and nodes in relation" msgstr "Stiahnuť všetky nekompletné cesty a uzly v relácii" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:415 -msgid "Basic" -msgstr "Základný" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:453 #, java-format msgid "Members: {0}" msgstr "Členov: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:587 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:461 +#, java-format +msgid "Relation Editor: {0}" +msgstr "Editor relácie: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:585 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 msgid "There were conflicts during import." msgstr "Vznikli konflikty počas importu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593 msgid "Error parsing server response." msgstr "Chyba parsovania odozvy servera" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:600 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:594 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:598 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -1120,9 +1146,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:345 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 msgid "Error" msgstr "Chyba" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:599 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597 msgid "Cannot connect to server." msgstr "Nemôžem sa pripojiť na server." @@ -1285,5 +1311,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:94 @@ -1293,5 +1319,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 msgid "" @@ -1362,16 +1388,24 @@ msgstr "Výber: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +msgid "Open an editor for the selected relation" +msgstr "Otvoriť editor pre zvolenú reláciu" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +msgid "Delete the selected relation" +msgstr "Zmazať vybraté relácie" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 #: trans_presets.java:2904 msgid "Relations" msgstr "Relácie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 msgid "Open a list of all relations." msgstr "Otvoríť zoznam všetkých relácií" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 @@ -1379,17 +1413,9 @@ msgstr "Nový" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 msgid "Create a new relation" msgstr "Vytvoriť novú reláciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open an editor for the selected relation" -msgstr "Otvoriť editor pre zvolenú reláciu" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -msgid "Delete the selected relation" -msgstr "Zmazať vybraté relácie" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:130 #, java-format msgid "Relations: {0}" @@ -1410,5 +1436,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 msgid "Open a list of all commands (undo buffer)." -msgstr "Otvorte prehľad všetkých príkazov (obnoviť vyrovnávaciu pamäť(buffer))" +msgstr "" +"Otvorte prehľad všetkých príkazov (obnoviť vyrovnávaciu pamäť(buffer))" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63 @@ -1417,49 +1444,49 @@ msgstr "Príkazový Stĺpik: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +msgid "Resolve" +msgstr "Vyriešiť" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +msgid "Open a merge dialog of all selected items in the list above." +msgstr "" +"Otvoriť dialógové okno pre spojenie(merge) všetkých vybraných bodov (items) " +"v obsahu na vrchu." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Conflict" msgstr "Konflikt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 msgid "Merging conflicts." msgstr "Spojenie konfliktov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67 -msgid "Resolve" -msgstr "Vyriešiť" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:68 -msgid "Open a merge dialog of all selected items in the list above." -msgstr "" -"Otvoriť dialógové okno pre spojenie(merge) všetkých vybraných bodov (items) " -"v obsahu na vrchu." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:105 -msgid "Please select something from the conflict list." -msgstr "Zvoľte niečo zo zoznamu konfliktov" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Resolve Conflicts" msgstr "Vyriešiť konflikty" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +msgid "Solve Conflict" +msgstr "Riešiť konflikt" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 #, java-format msgid "Conflicts: {0}" msgstr "Konflikty: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Conflicts" msgstr "Konflikty" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 msgid "conflict" msgstr "konflikt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 msgid "background" msgstr "pozadie" @@ -1485,5 +1512,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 msgid "Customize Color" @@ -1491,5 +1518,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1499,5 +1526,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1506,5 +1533,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:326 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:152 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -1524,5 +1551,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:265 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 #, java-format msgid "Audio synchronized at point {0}." @@ -1530,5 +1557,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232 msgid "Unable to synchronize in layer being played." msgstr "Nie je možné synchronizovať v už prehrávanej vrstve" @@ -1550,5 +1577,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:958 msgid "desc" msgstr "popis" @@ -1560,5 +1587,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 msgid "There was an error while trying to display the URL for this marker" -msgstr "Bola tam nejaká chyba zatiaľ čo skúšate zobraziť URL pre tieto značky" +msgstr "" +"Bola tam nejaká chyba zatiaľ čo skúšate zobraziť URL pre tieto značky" #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 @@ -1570,5 +1598,5 @@ msgstr "Chyba zobrazovania URL" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -1578,5 +1606,5 @@ "prehrávajúcu zvukovú stopu." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -1586,18 +1614,18 @@ "až na track point, ktorý chcete zosynchronizovať." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224 msgid "Unable to create new audio marker." msgstr "Nie je možné vytvoriť novú zvukovú značku" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 msgid "Convert to data layer" msgstr "Konvertovať do dátovej vrstvy" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:725 -msgid "" -"Upload of unprocessed GPS data as map data is considered harmful." -"
            If you want to upload traces, look here:" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:645 +msgid "" +"Upload of unprocessed GPS data as map data is considered " +"harmful.
            If you want to upload traces, look here:" msgstr "" "Nahrať nespracované GPS dáta, ako mapové dáta je nežiadúce.
            K " @@ -1605,66 +1633,22 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:646 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:747 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:448 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:667 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "Converted from: {0}" msgstr "Prevedené z: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612 -msgid "Upload this trace..." -msgstr "Nahrať túto stopu..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:616 -msgid "" -"This functionality has been added only recently. Please
            use with " -"care and check if it works as expected." -msgstr "" -"Táto funkcia bola pridaná nedávno. Prosíme,
            používajte opatrne a " -"presvedčte sa, že sa chová tak, ako to očakávate." - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:102 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:107 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:626 -msgid "Upload track filtered by JOSM" -msgstr "Nahrať trasu filtrovanú JOSM" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:103 -#, java-format -msgid "Upload raw file: {0}" -msgstr "Nahrať súbor {0} s nekomprimovanými (raw) dátami" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:108 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:627 -msgid "Upload raw file: " -msgstr "Nahrať súbor nekomprimovaných (raw) dát: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640 -msgid "Description:" -msgstr "Popis:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:123 -msgid "Tags:" -msgstr "Značky:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:129 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:648 -msgid "GPX-Upload" -msgstr "Nahrať GPX" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:229 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:217 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113 msgid "gps point" msgstr "gps poloha bodu" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 #: trans_presets.java:1795 trans_presets.java:1801 trans_presets.java:1807 #: trans_presets.java:1813 trans_presets.java:1819 trans_presets.java:1825 @@ -1685,5 +1669,5 @@ msgstr[2] "stopy" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 msgid "point" msgid_plural "points" @@ -1692,5 +1676,5 @@ msgstr[2] "bodov" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 #, java-format msgid "a track with {0} point" @@ -1700,5 +1684,5 @@ msgstr[2] "stopy s {0} bodmi" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} consists of {1} track" @@ -1708,5 +1692,5 @@ msgstr[2] "{0} skladá sa z {1} stôp" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} point" @@ -1716,25 +1700,25 @@ msgstr[2] "{0} bodov" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117 msgid "Customize line drawing" msgstr "Prispôsobiť kresliacu trasu" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:296 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 msgid "Use global settings." msgstr "Použíť globálne nastavenie." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 msgid "Draw lines between points for this layer." msgstr "Kresliť spojnice medzi bodmi v tejto vrstve" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:298 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123 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/RawGpsLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:135 msgid "Select line drawing options" @@ -1768,5 +1752,5 @@ msgstr "JPEG obrázky (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290 #, java-format msgid "{0} track, " @@ -1776,5 +1760,5 @@ msgstr[2] "{0} stôp(track), " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 #, java-format msgid "{0} route, " @@ -1784,5 +1768,5 @@ msgstr[2] "{0} trás, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 #, java-format msgid "{0} waypoint" @@ -1792,55 +1776,51 @@ msgstr[2] "{0} waypointy (body cesty)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #, java-format msgid "Name: {0}" msgstr "Meno: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "Description: {0}" msgstr "Popis: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 msgid "Timespan: " msgstr "Časové rozpätie: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Length: " msgstr "Dĺžka: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:642 -msgid "Tags (keywords in GPX):" -msgstr "Značky (kľúčové slová v GPX súbore)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:655 msgid "time" msgstr "čas" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:780 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:679 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:700 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 msgid "Download from OSM along this track" msgstr "Stiahnuť z OSM podľa tejto stopy (track)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:686 msgid "Download everything within:" msgstr "Stiahnuť všetko vo vnútry:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 #, java-format msgid "{0} meters" msgstr "{0} metrov" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:692 msgid "Maximum area per request:" msgstr "Maximálna plocha na požiadavku:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 #, java-format msgid "{0} sq km" msgstr "{0} štvorcových km" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787 #, java-format msgid "" @@ -1848,17 +1828,17 @@ "wish
            to continue?" msgstr "" -"Táto akcia bude potrebovať
            {0} samostatných stiahnutí dát." -"
            Chcete pokračovať?" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 +"Táto akcia bude potrebovať
            {0} samostatných stiahnutí " +"dát.
            Chcete pokračovať?" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:844 #, java-format msgid "Audio markers from {0}" msgstr "Audio značky z {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 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:1049 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "" "Some waypoints with timestamps from before the start of the track were " @@ -1868,5 +1848,5 @@ "vynechané." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -1977,19 +1957,19 @@ msgstr "Zadaný čas nemôže byť rozparsovaný" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:140 msgid "outside downloaded area" msgstr "mimo ukladanej oblasti" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 #, java-format msgid "{0} consists of:" msgstr "{0} se skladá z:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:353 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:347 #, java-format msgid " ({0} deleted.)" msgstr " ({0} zmazané.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:445 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 msgid "Convert to GPX layer" msgstr "Previesť do GPX vrstvy" @@ -2017,37 +1997,37 @@ msgstr "Nemôžem zapísať do záložiek." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 msgid "The geographic longitude at the mouse pointer." msgstr "Zemepisná dĺžka na mieste kurzoru myši." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The name of the object at the mouse pointer." msgstr "Meno objektu na mieste kurzoru myši." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 msgid "The geographic latitude at the mouse pointer." msgstr "Zemepisná šírka na mieste kurzoru myši." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The angle between the previous and the current way segment." msgstr "Uhol medzi predchádzajúcim a súčasným úsekom cesty." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The (compass) heading of the line segment being drawn." msgstr "Bude zobrazená smerová šípka v segmente línie." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The length of the new way segment being drawn." msgstr "Dĺžka nového nakresleného segmentu trasy bude zobrazená." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:160 msgid "(no object)" msgstr "(žiadny objekt)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:62 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:56 msgid "Color" msgstr "Farba" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:57 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107 #: trans_presets.java:56 trans_presets.java:92 trans_presets.java:130 @@ -2148,27 +2128,36 @@ msgstr "Názov" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:118 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:112 #, java-format msgid "Paint style {0}: {1}" msgstr "Farebný štýl {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 msgid "Choose" msgstr "Vybrať" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 msgid "Please select a color." msgstr "Prosím zvoľte farbu." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 #, java-format msgid "Choose a color for {0}" msgstr "Zvoľte farbu pre {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +msgid "Set to default" +msgstr "Zadať východzie (prednastavené)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:172 +msgid "Set all to default" +msgstr "Zadať všetko východzie (prednastavené)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:184 msgid "Colors used by different objects in JOSM." msgstr "Farby použité rôznymi objektami v JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:171 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:198 msgid "Colors" msgstr "Farby" @@ -2202,26 +2191,26 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45 msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
            The password is transfered in plain text to the server, encoded in the " -"URL.
            Do not use a valuable Password." +"WARNING: The password is stored in plain text in the preferences " +"file.
            The password is transfered in plain text to the server, encoded in " +"the URL.
            Do not use a valuable Password." msgstr "" "Upozornenie: Heslo je uložené v nešifrovanej podobe v konfiguračnom " -"súbore.
            Heslo sa prenáša v nešifrovanej podobe v URL na server." -"
            Nepoužívajte dôležité heslo." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:45 +"súbore.
            Heslo sa prenáša v nešifrovanej podobe v URL na " +"server.
            Nepoužívajte dôležité heslo." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44 msgid "Sort presets menu" msgstr "Menu Sort presets" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46 msgid "Enable built-in defaults" msgstr "Povoliť vstavané východzie hodnoty" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:58 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69 msgid "Tagging preset source" msgstr "Tagging preset source" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:156 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 @@ -2229,5 +2218,5 @@ msgstr "Prosím vyberte riadok na úpravu." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500 @@ -2236,26 +2225,26 @@ msgstr "Prosím vyberte riadok na odstránenie." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89 -msgid "" -"The sources (URL or filename) of tagging preset definition files. See http://" -"josm.openstreetmap.de/wiki/TaggingPresets for help." +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88 +msgid "" +"The sources (URL or filename) of tagging preset definition files. See " +"http://josm.openstreetmap.de/wiki/TaggingPresets for help." msgstr "" "Zdroje (URL alebo meno súboru) súborov s definíciou predvolieb značenia. " "Pozrite http://josm.openstreetmap.de/wiki/TaggingPresets for help." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89 msgid "Add a new tagging preset source to the list." msgstr "Pridať nový tagging preset source do obsahu." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 msgid "Delete the selected source from the list." msgstr "Zmazať vybratý zdroj zo zoznamu." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:94 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93 msgid "Tagging Presets" msgstr "Tagging Presets" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97 msgid "Tagging preset sources" msgstr "Tagging preset sources" @@ -2269,6 +2258,6 @@ msgstr "Pri ukladaní zanechávať záložné súbory končiace znakom ~" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:141 @@ -2276,34 +2265,34 @@ msgstr "Pluginy" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 msgid "Configure available plugins." msgstr "Nastavenie dostupných pluginov." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43 msgid "Download List" msgstr "Stiahnuť zoznam" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:80 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51 msgid "Update" msgstr "Aktualizovať" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:60 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 msgid "Configure Sites..." msgstr "Konfigurovať zariadenie..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add either site-josm.xml or Wiki Pages." msgstr "Vložte buď site-josm.xml alebo wiki stránku" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99 msgid "Please select an entry." msgstr "Vyber prosím nejakú položku." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 msgid "Configure Plugin Sites" msgstr "Konfigurovať umiestnenie pluginov" @@ -2490,9 +2479,9 @@ msgstr "Kalibrácia zvukového nahrávania" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "Display Settings" msgstr "Nastavenie zobrazenia" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "" "Various settings that influence the visual representation of the whole " @@ -2500,55 +2489,63 @@ msgstr "Rôzne nastavenia ovplyvňujúce vzhľad celého programu." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings" msgstr "Nastavenie pripojenia" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings for the OSM server." msgstr "Nastavenie pripojenia pre OSM server." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Map Settings" msgstr "Nastavenie mapy" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Settings for the map projection and data interpretation." msgstr "Nastavenie projekcie mapy a interpretácie dát." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Audio Settings" msgstr "Nastavenia zvuku" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Settings for the audio player and audio markers." msgstr "Nastavenia pre zvukový prehrávač a zvukové značky." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97 msgid "You have to restart JOSM for some settings to take effect." msgstr "Niektoré nastavenia sa prejavia až po reštartovaní JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:25 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 msgid "Draw lines between raw gps points." msgstr "Kresliť spojnice medzi GPS bodmi" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:27 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 msgid "Force lines if no segments imported." msgstr "Zosilniť líniu, ak žiadne segmenty nie su naimportované." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:28 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 msgid "Draw large GPS points." msgstr "Kresliť väčšie GPS body" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 -msgid "Color tracks by velocity." -msgstr "Ofarbiť trasy podľa rychlosti." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34 +msgid "Velocity (red = slow, green = fast)" +msgstr "Rýchlosť (červená = pomaly, zelená = rýchlo)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 +msgid "Dilution of Position (red = high, green = low, if available)" +msgstr "Hustota pozícií (červená = vysoká, zelená = nízka, ak je dostupná)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 +msgid "Single Color (can be customized for named layers)" +msgstr "Jedna farba (môže byť prispôsobená pre pomenované vrstvy)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:1346 msgid "Car" msgstr "Vozidlo" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:309 trans_presets.java:635 trans_presets.java:833 #: trans_presets.java:842 trans_presets.java:851 trans_presets.java:864 @@ -2560,5 +2557,5 @@ msgstr "Bicykel" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:310 trans_presets.java:637 trans_presets.java:832 #: trans_presets.java:841 trans_presets.java:850 trans_presets.java:863 @@ -2569,44 +2566,44 @@ msgstr "Pešo" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 msgid "Draw Direction Arrows" msgstr "Kresliť šípky v smere jazdy" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 msgid "Fast drawing (looks uglier)" msgstr "Rýchle vykresľovanie (vypadá nepekne)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180 msgid "Only interesting direction hints (e.g. with oneway tag)." msgstr "Iba zujímavé smery (napr. jednosmerka)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:186 msgid "Only on the head of a way." msgstr "Iba na začiatku cesty." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44 msgid "Draw segment order numbers" msgstr "Vykresliť segmenty s poradovými číslami" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45 msgid "Draw boundaries of downloaded data" msgstr "Vykresliť ohraničujúci box stiahnutých dát" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46 msgid "Draw virtual nodes in select mode" msgstr "Vykresľovať virtuálne body v mode výberu" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47 msgid "Draw inactive layers in other color" msgstr "Vykresľovať neaktívne vrstvy v iných farbách" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 msgid "Smooth map graphics (antialiasing)" msgstr "Vyhladené mapy (antialiasing)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 msgid "" "If your gps device draws too few lines, select this to draw lines along your " @@ -2616,5 +2613,5 @@ "pozdĺž vašej cesty." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:71 msgid "" "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines." @@ -2623,9 +2620,9 @@ "kreslenie všetkých línií." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73 msgid "Maximum length (meters)" msgstr "Maximálna dĺžka (metrov)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:77 msgid "" "Force drawing of lines if the imported data contain no line information." @@ -2634,15 +2631,16 @@ "čiarach." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:84 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89 msgid "Draw direction arrows for lines, connecting GPS points." msgstr "Kresliť smerové šípky pre línie, ktoré spájajú GPS body." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90 -msgid "Draw the direction arrows using table lookups instead of complex math." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95 +msgid "" +"Draw the direction arrows using table lookups instead of complex math." msgstr "" "Nakreslite smerové šípky použijúc vyhľadávajúcu tabuľku namiesto " "matematického súboru." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:96 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:101 msgid "" "Don't draw arrows if they are not at least this distance away from the last " @@ -2650,13 +2648,33 @@ msgstr "Nekreslite šípky ak sa nezmestí do tohoto rozmedzia." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104 msgid "Minimum distance (pixels)" msgstr "Minimálna vzdialenosť (pixelov)" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:109 -msgid "Choose the hue for the track color by the velocity at that point." -msgstr "Vyberte odtieň farby pre stopu(track), podľa rýchlosti na bode." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116 +msgid "Draw larger dots for the GPS points." +msgstr "Zobrazovať väčšie bodky pre GPS body." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136 +msgid "" +"All points and track segments will have the same color. Can be customized in " +"Layer Manager." +msgstr "" +"Všetky body a traťové segmenty budú mať tú istú farbu. Môžete ju prispôsobiť " +"v manažéri vrstiev." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137 +msgid "Colors points and track segments by velocity." +msgstr "Farby bodov traťových segmentov podľa rýchlosti." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:138 +msgid "" +"Colors points and track segments by dilution of position (HDOP). Your " +"capture device needs to logs that information." +msgstr "" +"Farby bodov traťových segmentov podľa hustoty pozícií (HDOP). Vaše " +"nahrávacie zariadenie potrebuje pre záznam túto informáciu." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143 msgid "Allows to tune the track coloring for different average speeds." msgstr "" @@ -2664,38 +2682,40 @@ "rýchlostí." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122 -msgid "Draw larger dots for the GPS points." -msgstr "Zobrazovať väčšie bodky pre GPS body." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148 +msgid "Track and Point Coloring" +msgstr "Farebná trať a body" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 msgid "GPS Points" msgstr "GPS body" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175 msgid "Draw direction hints for way segments." msgstr "Kresliť smer cestného segmentu" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:163 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192 msgid "Draw the order numbers of all segments within their way." msgstr "Kresliť poradové čísla všetkých segmentov v rámci cesty." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:168 -msgid "Apply antialiasing to the map view resulting in a smoother appearance." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:197 +msgid "" +"Apply antialiasing to the map view resulting in a smoother appearance." msgstr "" "Aplikovať vyhladzovanie (antialiasing) v mape pre jemnejšie zobrazenie." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202 msgid "Draw the boundaries of data loaded from the server." msgstr "Zobrazovať hranice dát stiahnutých zo servera." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:178 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:207 msgid "Draw virtual nodes in select mode for easy way modification." -msgstr "Kresliť virtuálne body v režme výberu, pre zjednodušenie modifikácie." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183 +msgstr "" +"Kresliť virtuálne body v režme výberu, pre zjednodušenie modifikácie." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212 msgid "Draw the inactive data layers in a different color." msgstr "Zobrazovať neaktívne vrstvy dát inou farbou." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219 msgid "OSM Data" msgstr "OSM Dáta" @@ -2806,6 +2826,6 @@ "a menu entry of button for the first time. So some of your changes may " "become active even without restart --- but also without collistion handling. " -"This is another reason to restart JOSM after making any changes here." -"

            " +"This is another reason to restart JOSM after making any changes " +"here.

            " msgstr "" "

            Okrem toho, skratky sú aktivované, keď sú prvýkrát priradené k tlačítku v " @@ -2822,8 +2842,9 @@ "key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also " "there will be 'keys' listed that correspond to a shortcut on your keyboard " -"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/" -"Semicolon on US keyboards, '.'/Period on German keyboards, ...) instead. Not " -"doing so may result in conflicts, as there is no way for JOSM to know that " -"Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...

            " +"(e.g. ':'/Colon). Please also do not use them, use the base key " +"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) " +"instead. Not doing so may result in conflicts, as there is no way for JOSM " +"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US " +"keyboard...

            " msgstr "" "

            Ako ste si mohli všimnúť, že výber kláves ktorý ponúka ďalšia strana sa " @@ -2862,6 +2883,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183 msgid "" -"

            The pseudo-modifier 'disabled' will disable the shortcut when encountered." -"

            " +"

            The pseudo-modifier 'disabled' will disable the shortcut when " +"encountered.

            " msgstr "

            Pseudo-modifikátor 'vypnutý' vypnúť skratku pri konflikte.

            " @@ -2931,67 +2952,67 @@ msgstr "Skupiny modifikátorov" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:231 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:236 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:250 msgid "layer not in list." msgstr "vrstva nie je v zozname" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." msgstr "Nemôžem nájsť preklad pre jazyk {0}. Vyberám {1}." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "usage" msgstr "použitie" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 msgid "options" msgstr "Možnosti" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 msgid "Show this help" msgstr "Zobrazí túto nápovedu" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Standard unix geometry argument" msgstr "Štandardný unix geometry argument" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 msgid "Download the bounding box" msgstr "Stiahnuť ohraničujúcí box" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 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:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 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:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 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:144 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Select with the given search" msgstr "Výber s určeným hľadaním" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 msgid "Don't launch in fullscreen mode" msgstr "Nespúšťať v celoobrazovkovom režime" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 msgid "Reset the preferences to default" msgstr "Nastaviť východzie hodnoty" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 msgid "Set the language." msgstr "Nastaviť jazyk." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 msgid "examples" msgstr "príklady" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3002,21 +3023,21 @@ "nejaké dáta predtým--výber" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 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:161 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 msgid "Activating updated plugins" msgstr "Aktivujem aktualizované pluginy" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 msgid "Loading early plugins" msgstr "Načítavam skoršie pluginy" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Setting defaults" msgstr "Nastavujem východzie hodnoty" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171 msgid "Loading plugins" msgstr "Načítavam pluginy" @@ -3051,6 +3072,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:108 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:164 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:162 #: trans_presets.java:308 trans_presets.java:309 trans_presets.java:310 #: trans_presets.java:311 trans_presets.java:312 trans_presets.java:313 @@ -3067,5 +3088,5 @@ msgstr "neznámy" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:66 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 #, java-format msgid "" @@ -3076,25 +3097,25 @@ "potrebný." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 #, java-format msgid "Plugin requires JOSM update: {0}." msgstr "Uvedený plugin požaduje aktualizovať JOSM: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "Nebol nájdený plugin {0}, ktorý je vyžadovaný pluginom {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 #, java-format msgid "Plugin not found: {0}." msgstr "Plugin nenájdený: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Pluginy boli naposledy aktualizované pred {0} dňami." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 msgid "" "(You can change the number of days after which this warning appears
            by " @@ -3104,17 +3125,17 @@ "the config option 'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 msgid "Disable plugin" msgstr "Vypnúť doplnok" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Nemôžem nahrať plugin {0}. Zmazať z konfigurácie?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -3124,5 +3145,5 @@ "ich prepísaniu." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 #, java-format msgid "" @@ -3131,10 +3152,10 @@ "Vyskytla sa chyba pravdepodobne zapríčinená doplnkom (angl: plugin) ''{0}''." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Podľa informácie v doplnku jeho autorom je ''{0}''." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:262 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -3142,9 +3163,9 @@ "Vyskúšajte aktualizovať plugin na najnovšiu verziu pre nahláseným chyby." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 msgid "Should the plugin be disabled?" msgstr "Vypnúť doplnok?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:278 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -3154,5 +3175,5 @@ "sa prestal používať." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -3161,6 +3182,6 @@ "Doplnok sa nedal odstrániť. Prosím informuj o tomto probléme vývojárov JOSM." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:322 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:181 msgid "no description available" msgstr "Popis nedostupný" @@ -3172,5 +3193,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 msgid "Update Plugins" msgstr "Aktualizuj pluginy" @@ -3207,21 +3228,21 @@ "Plugin {0} sa zdá byť poškodený, alebo ho nie je možné automaticky stiahnuť." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 #, java-format msgid "Downloaded plugin information from {0} site" msgid_plural "Downloaded plugin information from {0} sites" -msgstr[0] "Informácie o pluginoch stiahnuté z {0} stránky" -msgstr[1] "Informácie o pluginoch stiahnuté z {0} stránok" +msgstr[0] "Informácie o pluginoch stiahnuté z {0} stránok" +msgstr[1] "Informácie o pluginoch stiahnuté z {0} stránky" msgstr[2] "Informácie o pluginoch stiahnuté z {0} stránok" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 msgid "No plugin information found." msgstr "Nenájdené informácie o plugine" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:76 msgid "All installed plugins are up to date." msgstr "Všetky nainštalované pluginy sú aktuálne." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 #, java-format msgid "" @@ -3234,9 +3255,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:105 msgid "Download missing plugins" msgstr "Stiahnuť chýbajúca pluginy" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:106 #, java-format msgid "" @@ -3249,22 +3270,22 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 msgid "Download Plugins" msgstr "Stiahnuť pluginy" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:170 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:168 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Verzie {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:176 msgid "Plugin bundled with JOSM" msgstr "Plugin je zahrnutý v JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208 msgid "Plugin already exists" msgstr "Plugin už existuje" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:211 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:209 #, java-format msgid "" @@ -3279,15 +3300,15 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 msgid "Delete and Download" msgstr "Vymazať a Nahrať" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:222 #, java-format msgid "Error deleting plugin file: {0}" msgstr "Chyba pri mazaní súboru pluginu: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:281 #, java-format msgid "Error reading plugin information file: {0}" @@ -3355,10 +3376,10 @@ msgstr "Zmazať {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:165 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 msgid "Conflicting relation" msgstr "Konfliktné vzťahy (relation)" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 #, java-format msgid "" @@ -3369,5 +3390,5 @@ "Zmazať zo vzťahu (relation)?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:166 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 #, java-format msgid "" @@ -3384,11 +3405,11 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:349 msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
            This can cause problems because other objects (that you don't see) might " -"use them.
            Do you really want to delete?" +"You are about to delete nodes outside of the area you have " +"downloaded.
            This can cause problems because other objects (that you don't " +"see) might use them.
            Do you really want to delete?" msgstr "" "Chystáte sa zmazať body mimo Vami stiahnutú oblasť.
            Toto môže spôsobiť " -"problém iným objektom (nevidíte ich), ktoré môžu používať tieto body." -"
            Naozaj ich chcete zmazať?" +"problém iným objektom (nevidíte ich), ktoré môžu používať tieto " +"body.
            Naozaj ich chcete zmazať?" #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 @@ -3515,124 +3536,135 @@ msgstr "Nemôžem nahrať predvoľby zo servera." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:232 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 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:426 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:428 #, 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:527 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:765 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:776 msgid "Empty member in relation." msgstr "Prázdny člen vo vzťahu (relation)." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:767 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:531 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 #, 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:547 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 #, 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:552 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:549 msgid "More than one \"from\" way found." msgstr "Najdená viac než jedna \"from\" cesta." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:558 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555 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:564 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:561 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 +msgid "More than one \"via\" found." +msgstr "Viac ako jedna \"via\" najdená." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 #, java-format msgid "Unknown role ''{0}''." msgstr "Neznáma funkcia ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 #, 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:584 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 msgid "No \"from\" way found." msgstr "Nenajdená cesta \"from\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 msgid "No \"to\" way found." msgstr "Nenajdená cesta \"to\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -msgid "No \"via\" node found." -msgstr "Nenajdený bod \"via\"" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +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:604 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:619 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:636 -#, java-format -msgid "The \"{0}\" way must contain at least 2 nodes." -msgstr "Cesta \"{0}\" musí obsahovať aspoň 2 body." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:731 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +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:620 +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:624 +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:742 #, 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:787 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 #, 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:798 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 #, 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:847 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:858 #, 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:927 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 #, 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:938 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:949 #, 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:987 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:998 #, 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:1012 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1023 #, 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:1195 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1206 msgid "untagged" msgstr "neoznačený" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1196 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207 msgid "text" msgstr "text" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" msgstr "neaktívny" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:94 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:181 @@ -3640,15 +3672,15 @@ msgstr "vybraté" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" msgstr "neoznačená cesta" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 msgid "incomplete way" msgstr "nekompletná cesta" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 msgid "highlight" -msgstr "" +msgstr "označiť (highlight)" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -3668,5 +3700,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:113 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:89 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:77 msgid "incomplete" @@ -3697,14 +3729,14 @@ msgstr[2] "{0} členov" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 msgid "Duplicate" msgstr "Duplikovať" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 msgid "Duplicate selection by copy and immediate paste." msgstr "Duplikovať výber kopírovaním a vložením." -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 @@ -3713,5 +3745,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -3782,7 +3814,11 @@ msgstr "Zobraz informáce o histórii ciest a bodov v OSM" -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:57 -msgid "Please select at least one node, way or relation." -msgstr "Prosím vyber aspoň jeden bod, cestu alebo reláciu." +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:60 +msgid "" +"Please select at least one node, way or relation. Only already uploaded " +"elements have a history." +msgstr "" +"Prosím vyberte aspoň jeden bod, cestu alebo reláciu(vzťah). Iba práve " +"nahraté elementy majú zaznamenaný priebeh(history)." #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 @@ -3804,7 +3840,7 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/TerracerAction.java:47 @@ -3941,5 +3977,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:123 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:314 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:315 msgid "Enter values for all conflicts." msgstr "Zadajte hodnoty pre všetky konflikty" @@ -3947,5 +3983,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 msgid "Solve Conflicts" msgstr "Riešenie konfliktov" @@ -4079,5 +4115,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #, java-format @@ -4105,16 +4141,26 @@ msgstr[2] "Vybraté body nie sú v strede cesty." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125 -msgid "" -"There is more than one way using the node(s) you selected. Please select the " +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 +msgid "" +"There is more than one way using the node you selected. Please select the " "way also." -msgstr "" -"Existuje viacej ciest využívajúcích tento bod(y). Vyberte preto jednu cestu." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133 +msgid_plural "" +"There is more than one way using the nodes you selected. Please select the " +"way also." +msgstr[0] "" +"Je tam viac ako jedna cesta používajúca bod, ktorý ste vybrali. Prosím " +"vyberte tiež cestu." +msgstr[1] "" +"Je tam viac ako jedna cesta používajúca body, ktoré ste vybrali. Prosím " +"vyberte tiež cestu." +msgstr[2] "" +"Je tam viac ako jedna cesta používajúca body, ktoré ste vybrali. Prosím " +"vyberte tiež cestu." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137 msgid "The selected nodes do not share the same way." msgstr "Zvolené body nezdieľajú zhodnú cestu." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -4123,10 +4169,10 @@ msgstr[2] "Označená cesta neobsahuje všetky vybraté body." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229 msgid "You must select two or more nodes to split a circular way." msgstr "Musíte zvoliť dva alebo viacej bodov pre rozdelenie kruhovej cesty." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -4136,5 +4182,5 @@ "cesty.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 msgid "" "A role based relation membership was copied to all new ways.\n" @@ -4145,5 +4191,5 @@ "Môžete preveriť správnosť, ak je to nevyhnutné." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:296 #, java-format msgid "Split way {0} into {1} parts" @@ -4420,6 +4466,6 @@ "type: - type of the object (node, way, relation)" msgstr "" -"type: - typy objektov (bod, cesta, vzťah(relácia))" +"type: - typy objektov (bod, cesta, " +"vzťah(relácia))" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 @@ -4457,5 +4503,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "Použite \" ako úvodzovky (napríklad ak kľúč obsahuje dvojbodku)" +msgstr "" +"Použite \" ako úvodzovky (napríklad ak kľúč obsahuje dvojbodku)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 @@ -4537,5 +4584,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 msgid "Align Nodes in Circle" msgstr "Zoradiť body do kruhu" @@ -4549,5 +4596,5 @@ msgstr "Najdené z bodov sú (skoro) v priamke" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 msgid "Please select at least four nodes." msgstr "Vyberte minimálne 4 body" @@ -4615,4 +4662,34 @@ msgstr "Behom obnovenia zálohy došlo k chybe." +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "Zobraziť správu o stave" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "" +"Show status report with useful information that can be attached to bugs" +msgstr "" +"Zobraziť správu o stave s užitočnými informáciami, ktoré sa môžu viazať ku " +"chybám" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "Pomoc: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92 +msgid "Status Report" +msgstr "Správa o stave" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +msgid "Copy to clipboard and close" +msgstr "Kopírovať do schránky a zavrieť" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 +msgid "Close" +msgstr "Zavrieť" + #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 @@ -4624,13 +4701,13 @@ msgstr "Zopakuje poslednú zrušenú akciu." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:44 msgid "Delete Mode" msgstr "Režim mazania" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:46 msgid "Delete nodes or ways." msgstr "Zmazať body alebo cesty" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:84 @@ -4641,5 +4718,5 @@ msgstr "Režim: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:130 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -4651,6 +4728,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:87 msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." +"Drag play head and release near track to play audio from there; " +"SHIFT+release to synchronize audio at that point." msgstr "" "Ťahajte \"play head\" a uvoľnite ho blízko miesta odkadiaľ chcete zvukový " @@ -4666,24 +4743,24 @@ msgstr "Vytvoriť plochy" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 msgid "Extrude Way" msgstr "Vytlačiť cestu" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:252 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:416 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:430 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/ExtrudeAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 msgid "Draw a rectangle of the desired size, then release the mouse button." msgstr "" "Nakreslite obdĺžnik požadovanej veľkosti a potom pustite tlačítko myši." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:420 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:434 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/ExtrudeAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 msgid "Drag a way segment to make a rectangle." msgstr "Ťahajte segment cesty na vytvorenie pravouholníka." @@ -4751,14 +4828,14 @@ msgstr "Zvoliť, posunúť a otáčať objekty" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:191 msgid "Add and move a virtual new node to way" msgstr "Pridať a posunúť nový virtuálny bod do cesty" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:220 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:223 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 msgid "Cannot move objects outside of the world." msgstr "Nemôžem presúvať objekty mimo svet." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:418 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:432 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -4766,11 +4843,11 @@ "Pustite tlačítko myši pre zastavenie pohybu. Ctrl spojí s najbližším bodom." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:422 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:436 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to remove); Shift-" "Ctrl to rotate selected; or change selection" msgstr "" -"Ťahaním pohybujte objektami; Shift pridáva do výberu (Ctrl odoberá); Shift" -"+Ctrl otáča objekty; alebo zmena výberu" +"Ťahaním pohybujte objektami; Shift pridáva do výberu (Ctrl odoberá); " +"Shift+Ctrl otáča objekty; alebo zmena výberu" #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 @@ -4840,31 +4917,31 @@ msgstr "Spojiť {0} body" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Orthogonalize Shape" msgstr "Pravouhlý tvar" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 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:60 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 msgid "Only two nodes allowed" msgstr "Povolené iba dva body" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 msgid "Selection must consist only of ways." msgstr "Výber sa musí skladať iba z ciest" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 msgid "Please select one or more closed ways of at least four nodes." msgstr "Prosím vyberte jednu alebo viac uzavretých ciest s najmenej 4 bodmi." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 msgid "Please select ways with almost right angles to orthogonalize." msgstr "" "Prosím vyberte cesty s takmer pravými uhlami pre vytvorenie pravouhlosti." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 msgid "" "You are using the EPSG:4326 projection which might lead
            to " @@ -4876,9 +4953,9 @@ "zbavili tohto upozornenia.
            Chcete pokračovať?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "Only one node selected" msgstr "Vybratý iba jeden bod" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 msgid "Orthogonalize" msgstr "Pravouhlosť" @@ -4929,5 +5006,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101 -msgid "Please select exactly three nodes or one way with exactly three nodes." +msgid "" +"Please select exactly three nodes or one way with exactly three nodes." msgstr "" "Prosím označte presne tri body, alebo cestu pozostávajúcu z troch bodov." @@ -4937,52 +5015,71 @@ msgstr "Tieto body nie sú v kruhu." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../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:71 +msgid "Update Data" +msgstr "Aktualizovať dáta" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "Aktualizácia zvolenej dátovej vrstvy zo servera (re-downloads data)" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:72 +#, java-format +msgid "" +"This action will require {0} individual download requests. Do you wish to " +"continue?" +msgstr "" +"Táto činnosť vyžaduje {0} individuálne požiadavky na stiahnutie. Prajete si " +"pokračovať?" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 msgid "Open Location..." msgstr "Otvoriť umiestnenie..." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 msgid "Open an URL." msgstr "Otvoriť najakú URL." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 msgid "Separate Layer" msgstr "Oddeliť vrstvu" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 msgid "Enter URL to download:" msgstr "Vložte URL pre sťahovanie:" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 msgid "Download Location" msgstr "Priečinok sťahovania" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 msgid "Download URL" msgstr "Sťahovacia URL" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 msgid "Add Node..." msgstr "Pridať bod..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 msgid "Add a node by entering latitude and longitude." msgstr "Pridať bod zadáním zemepisnej šírky a dĺžky." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 msgid "Enter the coordinates for the new node." msgstr "Zadejte súradnice nového bodu." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 msgid "Use decimal degrees." msgstr "Použite desatinné stupne." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 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:62 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 #: ../plugins/livegps/livegps/LiveGpsDialog.java:54 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93 @@ -4991,5 +5088,5 @@ msgstr "Zemepisná šírka" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 #: ../plugins/livegps/livegps/LiveGpsDialog.java:56 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96 @@ -5032,14 +5129,14 @@ msgstr "Presunutie objektov {0}" +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "Overwrite" msgstr "Prepísať" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "File exists. Overwrite?" msgstr "Súbor už existuje. prepísať?" @@ -5058,43 +5155,48 @@ msgstr "Prosím zvoľ niečo pre kopírovanie" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Rozpojiť cesty" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "Zduplikovať body používané viacerými cestami." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 msgid "This node is not glued to anything else." msgstr "Tento bod nie je prilepený k ničomu inému." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 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:90 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 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:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 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:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "Select either:" msgstr "Vyberte buď:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +msgid "* One tagged node, or" +msgstr "* Jeden označený bod, alebo" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 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:103 -msgid "* One node that is used by more than one way and one of those ways, or" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +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:104 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -5103,5 +5205,5 @@ "ceste, alebo" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -5110,5 +5212,5 @@ "ceste." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -5121,10 +5223,14 @@ "svoje vlastné kópie a všetky bodybudú vybraté." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:160 +msgid "Unglued Node" +msgstr "Nepripojený bod (Unglued Node)" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:373 #, java-format msgid "Dupe into {0} nodes" msgstr "Duplikovať do {0} bodov" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:320 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:397 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -5227,5 +5333,5 @@ msgstr "Vrátiť poslednú akciu." -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 msgid "No Shortcut" msgstr "Bez skratky" @@ -5247,13 +5353,13 @@ msgstr "OpenStreetMap dáta" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:29 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:28 msgid "Downloading GPS data" msgstr "Sťahujem GPS dáta" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:41 msgid "Downloaded GPX Data" msgstr "Stiahnuté GPX dáta" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:71 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:69 msgid "Raw GPS data" msgstr "Nekomprimované (Raw) GPS dáta" @@ -5263,5 +5369,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:58 msgid "Paste Tags" -msgstr "Vložiť značky" +msgstr "Vložiť vlastnosti" #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 @@ -5477,5 +5583,6 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169 -msgid "Header contains several values and cannot be mapped to a single string" +msgid "" +"Header contains several values and cannot be mapped to a single string" msgstr "" "Hlavička obsahuje niekoľko hodnôt a nemôže byť namapovaný jednotlivý reťazec" @@ -5831,5 +5938,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69 -msgid "Maximum number of segments allowed in each generated way. Default 250." +msgid "" +"Maximum number of segments allowed in each generated way. Default 250." msgstr "" "Maximálny počet úsekov v každej vygenerovanej ceste. Východzia hodnota 250." @@ -5853,10 +5961,11 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72 msgid "" -"Accuracy of Douglas-Peucker line simplification, measured in degrees." -"
            Lower values give more nodes, and more accurate lines. Default 0.0003." -msgstr "" -"Presnosť Douglas-Peucker zjednodušenia línií, je meraná v stupňoch." -"
            Nižšia hodnota dáva viac bodov, a väčšiu presnosť línií. Štandardne " +"Accuracy of Douglas-Peucker line simplification, measured in " +"degrees.
            Lower values give more nodes, and more accurate lines. Default " "0.0003." +msgstr "" +"Presnosť Douglas-Peucker zjednodušenia línií, je meraná v " +"stupňoch.
            Nižšia hodnota dáva viac bodov, a väčšiu presnosť línií. " +"Štandardne 0.0003." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73 @@ -6151,5 +6260,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:57 msgid "This test checks for untagged, empty and one node ways." -msgstr "Tento test hledá neotagované(neoznačené), prázdne a jednobodové cesty." +msgstr "" +"Tento test hledá neotagované(neoznačené), prázdne a jednobodové cesty." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82 @@ -6177,5 +6287,6 @@ msgid "" "This test checks for ways that contain some of their nodes more than once." -msgstr "Tento test kontroluje cesty, či neobsahujú niektorý bod viac ako raz." +msgstr "" +"Tento test kontroluje cesty, či neobsahujú niektorý bod viac ako raz." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45 @@ -6381,5 +6492,6 @@ msgid "" "This test checks for ways with similar names that may have been misspelled." -msgstr "Tento test kontroluje cesty na podobnosť mien, keď môže ísť o preklep." +msgstr "" +"Tento test kontroluje cesty na podobnosť mien, keď môže ísť o preklep." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21 @@ -6503,10 +6615,11 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:509 msgid "" -"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." -"org/index.php/User:JLS/speller) or tag checking data files." -msgstr "" -"Zdroje (URL alebo názov súboru) z predstavených kontrol (pozrite http://wiki." -"openstreetmap.org/index.php/User:JLS/speller) alebo súbory na kontrolu " -"značiek." +"The sources (URL or filename) of spell check (see " +"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking " +"data files." +msgstr "" +"Zdroje (URL alebo názov súboru) z predstavených kontrol (pozrite " +"http://wiki.openstreetmap.org/index.php/User:JLS/speller) alebo súbory na " +"kontrolu značiek." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:510 @@ -6968,6 +7081,6 @@ msgstr "Pridať novú vrstvu" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:40 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:43 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 #, java-format @@ -6975,19 +7088,32 @@ msgstr "Sťahujem {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:51 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:55 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 msgid "Contacting WMS Server..." msgstr "Kontaktujem WMS server..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157 msgid "Create buildings" msgstr "Vytvoriť budovy" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 msgid "CadastreGrabber: Illegal url." msgstr "CadastreGrabber: Nedovolená url." + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +msgid "" +"To avoid cadastre WMS overload,\n" +"building import size is limited to 1 km2 max." +msgstr "" +"Pre zabránenie preťaženia máp WMS katastra,\n" +"zvoľte pre import max. veľkosť 1 km2." + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +msgid "Please, enable auto-sourcing and check cadastre millesime." +msgstr "Prosím, zapnite automatický zdroj a kontrolu štvorcov máp katastra." #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78 @@ -7009,5 +7135,22 @@ msgstr "Cadastre: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:128 +msgid "Cadastre" +msgstr "Cadastre" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:139 +msgid "Auto sourcing" +msgstr "Automatické získavanie" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164 +msgid "Invalid projection" +msgstr "Chybná projekcia" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 +#, java-format +msgid "Change the projection to {0} first." +msgstr "Najskôr zmente projekciu na {0}." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:169 msgid "" "To enable the cadastre WMS plugin, change\n" @@ -7016,12 +7159,4 @@ "K zapnutiu cadastre WMS pluginu, zmeňte\n" "projekciu na Lambert a reštartujte JOSM" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132 -msgid "Cadastre" -msgstr "Cadastre" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 -msgid "Auto sourcing" -msgstr "Automatické získavanie" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20 @@ -7095,9 +7230,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:43 msgid "" -"More than one WMS layer present.\n" -"Select one of them first, then retry." -msgstr "" -"Je prítomná viac ako jedena WMS vrstva.\n" -"Pred opakovaním vyberte jednu z nich." +"More than one WMS layer present\n" +"Select one of them first, then retry" +msgstr "" +"Je prítomná viac ako jedna WMS vrstva\n" +"Najskôr vyberte jednu z nich a potom zopakujte" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:19 @@ -7105,5 +7240,5 @@ msgstr "Načítať polohu z cache (iba ak je cache zapnutá)" -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136 #, java-format @@ -7114,13 +7249,13 @@ msgstr[2] "Zjednodušenie cesty (odstránenie {0} bodov)" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61 msgid "Extract SVG ViewBox..." msgstr "Vyberte SVG ViewBox..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65 msgid "Extract best fitting boundary..." msgstr "Vyberte najvhodnejšie rozhranie(hranice)..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:120 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126 msgid "Create boundary" msgstr "Vytvorte rozhranie(hranice)" @@ -7156,15 +7291,15 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 msgid "Save WMS layer to file" msgstr "Uložiť WMS vrstvu do súboru" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "Load WMS layer from file" msgstr "Nahrať WMS vrstvu zo súboru" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -7172,5 +7307,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 msgid "File Format Error" msgstr "Chyba formátu súboru" @@ -7178,5 +7313,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 msgid "Error loading file" msgstr "Chyba pri nahrávaní súboru" @@ -7205,57 +7340,61 @@ msgstr "Cache chýb v Lambert Zóne" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 msgid "Replace original background by JOSM background color." msgstr "Nahradiť originálne pozadie s farbou JOSM pozadia." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30 msgid "Reverse grey colors (for black backgrounds)." msgstr "Opačná šedá farba (pre čierne pozadia)." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 msgid "Set background transparent." msgstr "Nastaviť priehľadné pozadie" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34 msgid "Draw boundaries of downloaded data." msgstr "Kresliť okraje okolo stiahnutých dát." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Enable automatic caching." msgstr "Povoliť automatické cachovanie." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 msgid "Max. cache size (in MB)" msgstr "Maximálna veľkost cache (v MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:53 -msgid "" -"A special handler of the french cadastre wms at www.cadastre.gouv." -"fr

            Please read the Terms and Conditions of Use here (in french): " -"
            http://www.cadastre.gouv.fr/scpc/html/" -"CU_01_ConditionsGenerales_fr.html
            before any upload of data created " -"by this plugin." -msgstr "" -"Špeciálny manipulant pre francúzsky kataster wms at www.cadastre.gouv." -"fr

            Prosím čítajte Podmienky pre využívanie (francúzsky):
            " +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:55 +msgid "" +"A special handler of the french cadastre wms at " +"www.cadastre.gouv.fr

            Please read the Terms and Conditions of Use here " +"(in french):
            " +"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " +"
            before any upload of data created by this plugin." +msgstr "" +"Špeciálny manipulant pre francúzsky kataster wms at " +"www.cadastre.gouv.fr

            Prosím čítajte Podmienky pre využívanie " +"(francúzsky):
            " "http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " "
            predtým, ako nahráte nejaké dáta vytvorené týmto pluginom." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:58 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 msgid "French cadastre WMS" msgstr "French cadastre WMS (Francúzsky kataster WMS)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64 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:63 +msgstr "" +"Hodnota kľúča \"zdroj\" keď je automatický zdroj zapnutý" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65 msgid "Source" msgstr "Zdroj" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -7265,27 +7404,43 @@ "JOSMu." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 -msgid "" -"Invert the original texts from black to white (and all intermediate greys)." -msgstr "" -"Prehodiť pôvodné texty z čiernej na bielu (a všetko do stredne tmavej šedej)" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +msgid "" +"Invert the original black and white colors (and all intermediate greys). " +"Useful for texts on dark backgrounds." +msgstr "" +"Zameňte originálnu čiernu a bielu farbu ( a všetky prechodné šedé). Použité " +"pre texty na tmavých pozadiach." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Allows multiple layers stacking" msgstr "Povoliť vyrovnanie viacnásobných vrstiev" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:99 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 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:109 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Kresliť obdĺžnik okolo sťahovaných dát z WMS servera." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:113 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 msgid "Image grab multiplier:" msgstr "Image grab multiplier:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:162 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:125 +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:129 +msgid "Fixed size square (default is 100m)" +msgstr "Pevná veľkosť štvorcov (východzia 100m)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +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:167 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á" @@ -7398,5 +7553,5 @@ msgstr "Priesečník nie je najdený. Nič nebolo zmenené." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:254 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:255 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -7544,11 +7699,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:203 msgid "" -"Take a photo of your GPS receiver while it displays the time." -"
            Display that photo here.
            And then, simply capture the time you read " -"on the photo and select a timezone
            " -msgstr "" -"Urobte fotku Vášho GPS zariadenia keď ukazuje čas.
            Zobrazte fotku." -"
            Potom len zapíšte čas ktorý vidíte na fotke a vyberte časovú zónu.
            " +"Take a photo of your GPS receiver while it displays the " +"time.
            Display that photo here.
            And then, simply capture the time you " +"read on the photo and select a timezone
            " +msgstr "" +"Urobte fotku Vášho GPS zariadenia keď ukazuje čas.
            Zobrazte " +"fotku.
            Potom len zapíšte čas ktorý vidíte na fotke a vyberte časovú zónu. " +"
            " #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:221 @@ -7614,5 +7769,6 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:484 -msgid "I can take a picture of my GPS receiver.
            Can this help?" +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ť?" @@ -7659,5 +7815,5 @@ msgstr "Neplatné časové pásmo" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #, java-format msgid "" @@ -7668,14 +7824,14 @@ "Čakám na formát: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:579 msgid "Invalid offset" msgstr "Neplatné vyrovnanie (offset)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:641 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:643 #, java-format msgid "Found {0} matchs of {1} in GPX track {2}" msgstr "Najdených {0} z existujúcich {1} v GPX stope(track) {2}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:642 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:644 msgid "GPX Track loaded" msgstr "Nahratá GPX stopa(trasa)" @@ -7683,5 +7839,5 @@ #: ../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/UploadDataGui.java:79 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 msgid "Upload Traces" msgstr "Nahrať Stopy (Traces)" @@ -7691,58 +7847,72 @@ msgstr "Nahrať Stopy (Traces) na openstreetmap.org" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 -msgid "Upload GPX track" -msgstr "Nahrať GPX stopu (track)" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71 +msgid "Upload Trace" +msgstr "Nahrať stopu" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Public" msgstr "Verejné" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 msgid "Selected makes your trace public in openstreetmap.org" msgstr "Vybratá verejne prístupná stopa (trace) v openstreetmap.org" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Description" msgstr "Popis" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:123 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 msgid "Tags" msgstr "Značky" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:182 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:153 +#, java-format +msgid "Selected track: {0}" +msgstr "Vybratá stopa: {0}" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:176 msgid "Connecting..." msgstr "Pripájam sa..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 -msgid "Uploading GPX track..." -msgstr "Nahrávam GPS stopu (track)..." - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:214 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:199 +msgid "Upload cancelled" +msgstr "Nahrávanie je zrušené" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:209 +msgid "Error while uploading" +msgstr "Chyba počas nahrávania" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "Nahratie GPS stopy bolo úspešné" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:227 -msgid "Error while uploading" -msgstr "Chyba počas nahrávania" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:235 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +msgid "Upload failed. Server returned the following message: " +msgstr "Chyba pri nahrávaní. Server napísal nasledujúcu správu: " + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 +#, java-format +msgid "Uploading GPX track: {0}% ({1} of {2})" +msgstr "Nahrávam GPS stopu(track): {0}% ({1} of {2})" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "Nie je poskytnutý žiaden popis. Prosím doplňte nejaký popis" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:252 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "Nie je vybratá GPX vrstva. Nemôžem nahrať stopu (trace)." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:241 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "Nie je doplnené užívateľské meno." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:244 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "Nie je doplnené heslo." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "Nahrávam GPX stopu (track)" @@ -7965,15 +8135,15 @@ msgstr "Automatické sťahovanie" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS vrstva ({0}), sa automaticky sťahuje vo zväčšení (zoom) {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS vrstva ({0}), sťahovaná vo zväčšení (zoom) {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -7981,17 +8151,17 @@ "Požadovaná oblasť je príliš veľká. Prosím priblížte ju, alebo zmente oblasť." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:232 msgid "Download visible tiles" msgstr "Stiahnuť viditeľné dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241 msgid "Change resolution" msgstr "Zmena rozlíšenia" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:253 msgid "Reload erroneous tiles" msgstr "Nahrať poškodené dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:264 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:271 msgid "Alpha channel" msgstr "Alfa kanál" @@ -8039,6 +8209,6 @@ "use." msgstr "" -"Môžete pridať, upravovať a zmazať WMS položky v nastaveniach pre WMS plugin " -"- zmeny sa prejavia aj vo WMS menu.\n" +"Môžete pridať, upravovať a zmazať WMS položky v nastaveniach pre WMS plugin -" +" zmeny sa prejavia aj vo WMS menu.\n" "\n" "Môžete zmeny urobiť aj ručne v hlavnom nastavení, použite nasledujúci " @@ -8052,6 +8222,6 @@ "format=image/jpeg\n" "\n" -"Pre Metacarta's Map Rectifier(prekresľovač http://labs.metacarta.com/" -"rectifier/ , potrebujete iba príslušný 'id'.\n" +"Pre Metacarta's Map Rectifier(prekresľovač " +"http://labs.metacarta.com/rectifier/ , potrebujete iba príslušný 'id'.\n" "Pridať Metacarta Map Rectifier položku v menu, ručne vytvoriť URL ako v " "tomto príklade,nahradiť 73 s vašim id obrázka:\n" @@ -8093,6 +8263,6 @@ msgid "Set start/end for routing. Middle mouse button to reset." msgstr "" -"Nastaviť začiatok/koniec pre trasu(routing). Stredné tlačítko myši vynuluje" -"(reset)." +"Nastaviť začiatok/koniec pre trasu(routing). Stredné tlačítko myši " +"vynuluje(reset)." #: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:40 @@ -8138,5 +8308,5 @@ #: trans_presets.java:617 trans_presets.java:618 trans_presets.java:619 msgid "permissive" -msgstr "voľný (permissive)" +msgstr "permissive (súhlas vlastníka pozemku)" #: trans_style.java:185 trans_presets.java:308 trans_presets.java:309 @@ -8151,5 +8321,5 @@ #: trans_presets.java:617 trans_presets.java:618 trans_presets.java:619 msgid "private" -msgstr "súkromný" +msgstr "private (len pre vlastníka)" #: trans_style.java:192 trans_presets.java:308 trans_presets.java:309 @@ -8226,5 +8396,5 @@ #: trans_style.java:714 msgid "turningcircle" -msgstr "turningcircle (polomer otáčania sa)" +msgstr "turningcircle (zaokrúhlený koniec cesty pre ľahšie otáčanie sa aut)" #: trans_style.java:722 trans_style.java:2822 trans_style.java:2823 @@ -8500,5 +8670,5 @@ #: trans_style.java:2956 msgid "scrub" -msgstr "oblasť nad hranicou lesa" +msgstr "oblasť pokrytá krovím" #: trans_style.java:2972 @@ -9105,9 +9275,9 @@ #: trans_presets.java:311 msgid "Goods" -msgstr "Tovar (Goods)" +msgstr "Malé nákladná autá a dodávky" #: trans_presets.java:312 msgid "Heavy Goods Vehicles (hgv)" -msgstr "Nákladné vozidlo" +msgstr "Nákladné vozidlá" #: trans_presets.java:313 trans_presets.java:634 trans_presets.java:852 @@ -9243,5 +9413,5 @@ #: trans_presets.java:420 msgid "Cycleway" -msgstr "Cyklistická cesta" +msgstr "Cesta pre cyklistov" #: trans_presets.java:424 @@ -9533,5 +9703,5 @@ #: trans_presets.java:782 msgid "Turning Circle" -msgstr "Turning Circle (polomer otáčania sa)" +msgstr "Turning Circle (zaokrúhlený koniec cesty pre ľahšie otáčanie sa aut)" #: trans_presets.java:787 @@ -9634,5 +9804,6 @@ #: trans_presets.java:880 msgid "Bus Trap" -msgstr "Bus trap (rohož cez cestu zabraňujúca vjazdu vozidiel okrem autobusov)" +msgstr "" +"Bus trap (rohož cez cestu zabraňujúca vjazdu vozidiel okrem autobusov)" #: trans_presets.java:883 @@ -9682,5 +9853,6 @@ #: trans_presets.java:942 msgid "Sally Port" -msgstr "Sally port (vstupný portál do pevnosti s vonkajšou a vnútornou bránou)" +msgstr "" +"Sally port (vstupný portál do pevnosti s vonkajšou a vnútornou bránou)" #: trans_presets.java:943 @@ -9964,5 +10136,5 @@ #: trans_presets.java:1196 msgid "Turning Point" -msgstr "Zlom (turning point)" +msgstr "Turning Point (koniec cesty)" #: trans_presets.java:1200 @@ -10149,5 +10321,5 @@ #: trans_presets.java:1339 trans_presets.java:1426 msgid "Station" -msgstr "Železničná stanica" +msgstr "Stanica" #: trans_presets.java:1340 @@ -11692,9 +11864,9 @@ #: trans_presets.java:2161 msgid "Gasometer" -msgstr "Plynomer (Gasometer)" +msgstr "Plynojem (Gasometer)" #: trans_presets.java:2162 msgid "Edit Gasometer" -msgstr "Upraviť plynomer (gasometer)" +msgstr "Upraviť plynojem (gasometer)" #: trans_presets.java:2166 @@ -12264,5 +12436,5 @@ #: trans_presets.java:2470 msgid "Outdoor" -msgstr "Vychádzkový (Outdoor)" +msgstr "Turistický (Outdoor)" #: trans_presets.java:2472 @@ -12816,13 +12988,10 @@ #: trans_presets.java:2890 msgid "Fell" -msgstr "" -"Fell (typ horskej krajiny nad pásmom stromov v Škandinávii, alebo v " -"Anglicku)" +msgstr "Fell (typ horskej krajiny nad pásmom stromov (horká pastvina))" #: trans_presets.java:2892 msgid "Edit Fell" msgstr "" -"Upraviť fell (typ horskej krajiny nad pásmom stromov v Škandinávii, alebo v " -"Anglicku)" +"Upraviť fell (typ horskej krajiny nad pásmom stromov (horká pastvina))" #: trans_presets.java:2896 @@ -12902,4 +13071,42 @@ msgstr "k ceste" +#~ msgid "Please select something from the conflict list." +#~ msgstr "Zvoľte niečo zo zoznamu konfliktov" + +#~ msgid "Upload this trace..." +#~ msgstr "Nahrať túto stopu..." + +#~ msgid "" +#~ "This functionality has been added only recently. Please
            use with " +#~ "care and check if it works as expected." +#~ msgstr "" +#~ "Táto funkcia bola pridaná nedávno. Prosíme,
            používajte opatrne a " +#~ "presvedčte sa, že sa chová tak, ako to očakávate." + +#~ msgid "Upload track filtered by JOSM" +#~ msgstr "Nahrať trasu filtrovanú JOSM" + +#~ msgid "Upload raw file: " +#~ msgstr "Nahrať súbor nekomprimovaných (raw) dát: " + +#~ msgid "Description:" +#~ msgstr "Popis:" + +#~ msgid "Tags (keywords in GPX):" +#~ msgstr "Značky (kľúčové slová v GPX súbore)" + +#~ msgid "GPX-Upload" +#~ msgstr "Nahrať GPX" + +#, java-format +#~ msgid "Upload raw file: {0}" +#~ msgstr "Nahrať súbor {0} s nekomprimovanými (raw) dátami" + +#~ msgid "Tags:" +#~ msgstr "Značky:" + +#~ msgid "Choose the hue for the track color by the velocity at that point." +#~ msgstr "Vyberte odtieň farby pre stopu(track), podľa rýchlosti na bode." + #~ msgid "Highway Exit" #~ msgstr "Výjazd z diaľnice" @@ -12919,2 +13126,9 @@ #~ msgid "Natural" #~ msgstr "Prírodný" + +#, java-format +#~ msgid "The \"{0}\" way must contain at least 2 nodes." +#~ msgstr "Cesta \"{0}\" musí obsahovať aspoň 2 body." + +#~ msgid "Upload GPX track" +#~ msgstr "Nahrať GPX stopu (track)" Index: /applications/editors/josm/i18n/po/sl.po =================================================================== --- /applications/editors/josm/i18n/po/sl.po (revision 13832) +++ /applications/editors/josm/i18n/po/sl.po (revision 13833) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-15 22:03+0100\n" -"PO-Revision-Date: 2009-02-14 15:42+0000\n" +"POT-Creation-Date: 2009-02-21 16:35+0100\n" +"PO-Revision-Date: 2009-02-21 16:11+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Slovenian \n" @@ -15,10 +15,10 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"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-02-15 20:41+0000\n" +"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-02-22 20:29+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 #, java-format msgid "" @@ -28,5 +28,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 msgid "" "This action will have no shortcut.\n" @@ -34,5 +34,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -41,5 +41,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Namig: Bližnjice lahko urejate v nastavitvah.)" @@ -50,17 +50,17 @@ #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 msgid "Information" msgstr "Informacije" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Do nothing" msgstr "Ne stori ničesar" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Report Bug" msgstr "Prijavi napako" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 msgid "" "An unexpected exception occurred.\n" @@ -74,18 +74,18 @@ "urejevalnika JOSM, vas prosimo, da prijavite napako (podrobno, v angleščini)." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Unexpected Exception" msgstr "Nepričakovana napaka" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 #, java-format msgid "Please report a ticket at {0}" msgstr "Prosimo, prijavite težavo na {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "Napišite (čim bolj) točne korake kako ponoviti napako!" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:78 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -94,9 +94,9 @@ "Preden prijavite napako poskusite posodobiti JOSM na najnovejšo različico." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Be sure to include the following information:" msgstr "Prijava napake naj vsebuje vsaj naslednje informacije:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75 msgid "(The text has already been copied to your clipboard.)" msgstr "(besedilo je že bilo prekopirano na odložišče.)" @@ -110,5 +110,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:94 @@ -116,5 +116,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:48 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:32 @@ -122,10 +122,10 @@ msgstr "Sprejemanje podatkov OSM..." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 msgid "NullPointerException, possibly some missing tags." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83 msgid "Preparing data..." msgstr "Pripravljam podatke..." @@ -153,48 +153,48 @@ msgstr "Sprejem točk od {0} do {1}..." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:164 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:168 msgid "Unknown version" msgstr "Neznana različica" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 msgid "Found element in non-way." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 msgid " has zero ref" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 msgid "Found element in non-relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:252 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250 msgid "Incomplete specification with ref=0" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294 msgid "Illegal object with id=0" msgstr "predmet z id=0 ni dovoljen" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 #, java-format msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:502 msgid "Prepare OSM data..." msgstr "Priprava podatkov OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:518 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:516 msgid "Ill-formed node id" msgstr "Neveljaven id točke" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:280 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:287 msgid "Parse error: invalid document structure for gpx document" msgstr "" @@ -204,18 +204,18 @@ msgstr "Vzpostavljanje povezave s strežnikom..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 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/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 msgid "Commit comment" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64 @@ -225,34 +225,32 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:192 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190 msgid "Opening changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:226 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224 msgid "Server does not support changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:246 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:428 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:609 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:184 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607 msgid "Unknown host" msgstr "Neznan gostitelj" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282 msgid "Preparing..." msgstr "Pripravljanje..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:294 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292 msgid "Uploading..." msgstr "Pošiljanje ..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375 msgid "Closing changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:652 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650 msgid "Transfer aborted due to error (will wait for 5 seconds):" msgstr "Prenos prekinjen zaradi napake (5 sekund premora):" @@ -290,17 +288,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95 #: ../core/src/org/openstreetmap/josm/Main.java:348 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:29 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 @@ -313,11 +314,11 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:110 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -332,11 +333,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:186 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 msgid "Creating main GUI" msgstr "Priprava grafičnega uporabniškega vmesnika" #: ../core/src/org/openstreetmap/josm/Main.java:195 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:271 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:278 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:56 msgid "Help" @@ -380,21 +381,21 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109 +msgid "min lat" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111 +msgid "min lon" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 -msgid "min lat" +msgid "max lat" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 -msgid "min lon" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:117 -msgid "max lat" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119 msgid "max lon" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:122 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -403,5 +404,5 @@ "Povezava na www.openstreetmap.org (za sprejem področja sem prilepite URL)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:134 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130 msgid "Bounding Box" msgstr "Pravokotno področje" @@ -437,6 +438,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:96 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:894 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:956 msgid "name" msgstr "" @@ -469,5 +470,5 @@ msgstr "povečava" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:107 msgid "" "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -477,5 +478,5 @@ "premik. Izbor: Kliknite z miško in povlecite" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:109 msgid "Slippy map" msgstr "" @@ -486,7 +487,7 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:605 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:602 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:89 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -506,5 +507,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380 msgid "Remove" msgstr "Odstrani" @@ -641,20 +642,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:109 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:186 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:198 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:108 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:191 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:203 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 msgid "Java OpenStreetMap Editor" msgstr "Javanski urejevalnik za OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:111 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:110 msgid "Message of the day not available" msgstr "Sporočilo dneva ni na voljo" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:200 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:205 msgid "Downloading \"Message of the day\"" msgstr "" @@ -694,33 +695,33 @@ msgstr "Pomanjšaj" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:234 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:474 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:512 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:383 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:380 msgid "More information about this feature" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:393 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:390 msgid "Optional Attributes:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:437 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:438 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:435 #, java-format msgid "Use preset ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 msgid "way" @@ -731,11 +732,11 @@ msgstr[3] "poti" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:214 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 msgid "node" msgid_plural "nodes" @@ -745,6 +746,6 @@ msgstr[3] "vozlišča" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:81 @@ -756,30 +757,30 @@ msgstr[3] "relacije" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:475 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 #, java-format msgid "Unknown type: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:549 +#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 +#, java-format +msgid "Could not read tagging preset source: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 -#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 -#, java-format -msgid "Could not read tagging preset source: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:555 #, java-format msgid "Error parsing {0}: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:572 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:569 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595 #, java-format msgid "Change {0} object" @@ -790,9 +791,17 @@ msgstr[3] "Spremeni {0} predmete" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 msgid "Nothing selected!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 +msgid "Selection unsuitable!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +msgid "Apply Preset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 msgid "Change Properties" msgstr "Spremeni lastnosti" @@ -803,14 +812,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:107 msgid "File" msgstr "Datoteka" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:135 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:107 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:86 @@ -822,22 +831,22 @@ msgstr "Uredi" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 msgid "View" msgstr "Pogled" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:26 msgid "Tools" msgstr "Orodja" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:141 msgid "Audio" msgstr "Zvok" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:142 msgid "Presets" msgstr "Prednastavitve" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:40 @@ -849,18 +858,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:210 msgid "Wireframe View" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212 msgid "Toggle Wireframe view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:28 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 msgid "Contacting the OSM server..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 #, java-format msgid "This will change up to {0} object." @@ -871,11 +880,11 @@ msgstr[3] "Spremenili boste do {0} predmete." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 msgid "An empty value deletes the key." msgstr "Prazna vrednost izbriše ključ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66 @@ -885,7 +894,7 @@ msgstr "Ključ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 @@ -894,10 +903,10 @@ msgstr "Vrednost" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333 msgid "Change values?" msgstr "Sprememba vrednosti?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:257 #, java-format msgid "Change properties of up to {0} object" @@ -908,33 +917,33 @@ msgstr[3] "Spremeni lastnosti do {0} predmetov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 msgid "Please select a key" msgstr "Izberite ključ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321 msgid "Please select a value" msgstr "Izberite vrednost" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:445 msgid "Please select the objects you want to change properties for." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 msgid "Properties/Memberships" msgstr "Lastnosti/Članstva" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 msgid "Properties for selected objects." msgstr "Lastnosti izbranih predmetov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97 @@ -946,58 +955,58 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 msgid "Member Of" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:559 msgid "Change relation" msgstr "Spremeni relacijo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560 #, 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:564 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 msgid "Delete from relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:600 +msgid "Add Properties" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 -msgid "Add Properties" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 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:606 +msgid "Edit Properties" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609 -msgid "Edit Properties" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 msgid "Edit the value of the selected key for all objects" msgstr "Spremeni vrednost izbranega ključa vsem predmetom." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 msgid "Delete Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:77 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:293 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 @@ -1006,98 +1015,115 @@ msgstr "Izbriši" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 msgid "Delete the selected key in all objects" msgstr "Izbriši izbrani ključ vsem predmetom." +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:763 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:769 msgid "Properties / Memberships" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178 +msgid "Apply Changes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 msgid "Create new relation" msgstr "Ustvari novo relacijo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208 msgid "Edit new relation" msgstr "Uredi novo relacijo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209 #, java-format msgid "Edit relation #{0}" msgstr "Uredi relacijo #{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230 +msgid "Basic" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Occupied By" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311 msgid "Tags (empty value deletes tag)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313 msgid "Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 +msgid "Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 msgid "Move the currently selected members up" msgstr "Pomakni izbrano plast vrstico višje." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358 +msgid "Add Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359 +msgid "Add all currently selected objects as members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365 +msgid "Remove Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366 +msgid "Remove all currently selected objects from relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 +msgid "Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 msgid "Move the currently selected members down" msgstr "Pomakni izbrano plast vrstico nižje." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356 -msgid "Add Selected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:357 -msgid "Add all currently selected objects as members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:363 -msgid "Remove Selected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:364 -msgid "Remove all currently selected objects from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381 msgid "Remove the member in the current table row from this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394 msgid "Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:406 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395 msgid "Download all incomplete ways and nodes in relation" msgstr "Sprejmi vse nepopolne poti in vozlišča v relaciji" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:415 -msgid "Basic" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:453 #, java-format msgid "Members: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:587 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:461 +#, java-format +msgid "Relation Editor: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:585 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 msgid "There were conflicts during import." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593 msgid "Error parsing server response." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:600 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:594 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:598 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -1111,9 +1137,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:345 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 msgid "Error" msgstr "Napaka" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:599 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597 msgid "Cannot connect to server." msgstr "" @@ -1272,5 +1298,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:94 @@ -1280,5 +1306,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 msgid "" @@ -1346,16 +1372,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +msgid "Open an editor for the selected relation" +msgstr "Odpri urejevalnik za izbrano relacijo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +msgid "Delete the selected relation" +msgstr "Izbriši izbrano relacijo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 #: trans_presets.java:2904 msgid "Relations" msgstr "Relacije" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 msgid "Open a list of all relations." msgstr "Odpri seznam vseh relacij." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 @@ -1363,17 +1397,9 @@ msgstr "Nova" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 msgid "Create a new relation" msgstr "Ustvari novo relacijo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open an editor for the selected relation" -msgstr "Odpri urejevalnik za izbrano relacijo" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -msgid "Delete the selected relation" -msgstr "Izbriši izbrano relacijo" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:130 #, java-format msgid "Relations: {0}" @@ -1401,47 +1427,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +msgid "Resolve" +msgstr "Razreši" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +msgid "Open a merge dialog of all selected items in the list above." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Conflict" msgstr "Spor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 msgid "Merging conflicts." msgstr "Spori pri zlivanju" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67 -msgid "Resolve" -msgstr "Razreši" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:68 -msgid "Open a merge dialog of all selected items in the list above." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:105 -msgid "Please select something from the conflict list." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Resolve Conflicts" msgstr "Razreši spore" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +msgid "Solve Conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 #, java-format msgid "Conflicts: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Conflicts" msgstr "V sporu z" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 msgid "conflict" msgstr "konflikt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 msgid "background" msgstr "ozadje" @@ -1465,5 +1491,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 msgid "Customize Color" @@ -1471,5 +1497,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1479,5 +1505,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1486,5 +1512,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:326 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:152 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -1502,5 +1528,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:265 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 #, java-format msgid "Audio synchronized at point {0}." @@ -1508,5 +1534,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232 msgid "Unable to synchronize in layer being played." msgstr "" @@ -1527,5 +1553,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:958 msgid "desc" msgstr "" @@ -1547,5 +1573,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -1553,5 +1579,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -1559,81 +1585,39 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224 msgid "Unable to create new audio marker." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 msgid "Convert to data layer" msgstr "Pretvori v podatkovno plast" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:725 -msgid "" -"Upload of unprocessed GPS data as map data is considered harmful." -"
            If you want to upload traces, look here:" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:645 +msgid "" +"Upload of unprocessed GPS data as map data is considered " +"harmful.
            If you want to upload traces, look here:" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:646 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:747 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:448 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:667 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "Converted from: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612 -msgid "Upload this trace..." -msgstr "Pošlji to sled..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:616 -msgid "" -"This functionality has been added only recently. Please
            use with " -"care and check if it works as expected." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:102 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:107 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:626 -msgid "Upload track filtered by JOSM" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:103 -#, java-format -msgid "Upload raw file: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:108 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:627 -msgid "Upload raw file: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640 -msgid "Description:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:123 -msgid "Tags:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:129 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:648 -msgid "GPX-Upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:229 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:217 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113 msgid "gps point" msgstr "točka GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 #: trans_presets.java:1795 trans_presets.java:1801 trans_presets.java:1807 #: trans_presets.java:1813 trans_presets.java:1819 trans_presets.java:1825 @@ -1655,5 +1639,5 @@ msgstr[3] "sledi" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 msgid "point" msgid_plural "points" @@ -1663,5 +1647,5 @@ msgstr[3] "točke" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 #, java-format msgid "a track with {0} point" @@ -1672,5 +1656,5 @@ msgstr[3] "sled z {0} točkami" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} consists of {1} track" @@ -1679,5 +1663,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} point" @@ -1688,25 +1672,25 @@ msgstr[3] "{0} točke" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117 msgid "Customize line drawing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:296 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 msgid "Use global settings." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 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/RawGpsLayer.java:298 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123 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/RawGpsLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:135 msgid "Select line drawing options" @@ -1740,5 +1724,5 @@ msgstr "Slike JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290 #, java-format msgid "{0} track, " @@ -1747,5 +1731,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 #, java-format msgid "{0} route, " @@ -1754,5 +1738,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 #, java-format msgid "{0} waypoint" @@ -1761,55 +1745,51 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #, java-format msgid "Name: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 msgid "Timespan: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Length: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:642 -msgid "Tags (keywords in GPX):" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:655 msgid "time" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:780 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:679 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:700 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 msgid "Download from OSM along this track" msgstr "Sprejmi iz OSM vzdolž te sledi" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:686 msgid "Download everything within:" msgstr "Sprejmi vse znotraj:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 #, java-format msgid "{0} meters" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:692 msgid "Maximum area per request:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 #, java-format msgid "{0} sq km" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787 #, java-format msgid "" @@ -1820,14 +1800,14 @@ "nadaljevati?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:844 #, java-format msgid "Audio markers from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "" "Some waypoints with timestamps from before the start of the track were " @@ -1835,5 +1815,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -1943,19 +1923,19 @@ msgstr "Vpisanega časa ni bilo mogoče razpoznati." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:140 msgid "outside downloaded area" msgstr "izven sprejetega področja" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 #, java-format msgid "{0} consists of:" msgstr "{0} je sestavljen iz:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:353 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:347 #, java-format msgid " ({0} deleted.)" msgstr " ({0} izbrisan.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:445 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 msgid "Convert to GPX layer" msgstr "Pretvori v plast GPX" @@ -1983,37 +1963,37 @@ msgstr "Zaznamka ni bilo mogoče zapisati." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 msgid "The geographic longitude at the mouse pointer." msgstr "Geografska dolžina pod kazalcem miške." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The name of the object at the mouse pointer." msgstr "Ime predmeta pod kazalcem miške." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 msgid "The geographic latitude at the mouse pointer." msgstr "Geografska širina pod kazalcem miške." +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +msgid "The angle between the previous and the current way segment." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 -msgid "The angle between the previous and the current way segment." +msgid "The (compass) heading of the line segment being drawn." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 -msgid "The (compass) heading of the line segment being drawn." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:160 msgid "(no object)" msgstr "(ni predmeta)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:62 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:56 msgid "Color" msgstr "Barva" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:57 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107 #: trans_presets.java:56 trans_presets.java:92 trans_presets.java:130 @@ -2114,27 +2094,36 @@ msgstr "Naziv" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:118 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:112 #, java-format msgid "Paint style {0}: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 msgid "Choose" msgstr "Izberite" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 msgid "Please select a color." msgstr "Prosim Izberite barvo." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 #, java-format msgid "Choose a color for {0}" msgstr "Izberite barvo za {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +msgid "Set to default" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:172 +msgid "Set all to default" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:184 msgid "Colors used by different objects in JOSM." msgstr "Barve različnih predmetov v JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:171 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:198 msgid "Colors" msgstr "Barve" @@ -2151,5 +2140,6 @@ 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." +msgstr "" +"Geslo vašega računa pri OSM. Pustite prazno da se geslo ne shranjuje." #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39 @@ -2167,23 +2157,23 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45 msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
            The password is transfered in plain text to the server, encoded in the " -"URL.
            Do not use a valuable Password." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:45 +"WARNING: The password is stored in plain text in the preferences " +"file.
            The password is transfered in plain text to the server, encoded in " +"the URL.
            Do not use a valuable Password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44 msgid "Sort presets menu" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46 msgid "Enable built-in defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:58 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69 msgid "Tagging preset source" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:156 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 @@ -2191,5 +2181,5 @@ msgstr "Prosim izberite vrstico za urejanje." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500 @@ -2198,24 +2188,24 @@ msgstr "Prosim izberite vrstico za izbris." +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88 +msgid "" +"The sources (URL or filename) of tagging preset definition files. See " +"http://josm.openstreetmap.de/wiki/TaggingPresets for help." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89 -msgid "" -"The sources (URL or filename) of tagging preset definition files. See http://" -"josm.openstreetmap.de/wiki/TaggingPresets for help." +msgid "Add a new tagging preset source to the list." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 -msgid "Add a new tagging preset source to the list." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 msgid "Delete the selected source from the list." msgstr "Izbriši izbrani vir iz seznama." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:94 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93 msgid "Tagging Presets" msgstr "Prednastavljene oznake" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97 msgid "Tagging preset sources" msgstr "" @@ -2229,6 +2219,6 @@ msgstr "Pri shranjevanju ohrani varnostne kopije s končnico \"~\"" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:141 @@ -2236,34 +2226,34 @@ msgstr "Vstavki" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 msgid "Configure available plugins." msgstr "Nastavi razpoložljive vstavke." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43 msgid "Download List" msgstr "Sprejmi seznam" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:80 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51 msgid "Update" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:60 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 msgid "Configure Sites..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add either site-josm.xml or Wiki Pages." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99 msgid "Please select an entry." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 msgid "Configure Plugin Sites" msgstr "Nastavi vire vstavkov" @@ -2439,9 +2429,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "Display Settings" msgstr "Nastavitve prikaza" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "" "Various settings that influence the visual representation of the whole " @@ -2449,55 +2439,63 @@ msgstr "Različne nastavitve, ki vplivajo na izgled celotne aplikacije." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings" msgstr "Nastavitve povezave" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings for the OSM server." msgstr "Nastavitve povezave do strežnika OSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Map Settings" msgstr "Nastavitve zemljevida" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Settings for the map projection and data interpretation." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Audio Settings" msgstr "Nastavitve zvoka" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Settings for the audio player and audio markers." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97 msgid "You have to restart JOSM for some settings to take effect." msgstr "Za upoštevanje nekaterih sprememb je potrebno ponovno zagnati JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:25 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 msgid "Draw lines between raw gps points." msgstr "Riši črte med točkami GPS sledi." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:27 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 msgid "Force lines if no segments imported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:28 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 msgid "Draw large GPS points." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 -msgid "Color tracks by velocity." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34 +msgid "Velocity (red = slow, green = fast)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 +msgid "Dilution of Position (red = high, green = low, if available)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 +msgid "Single Color (can be customized for named layers)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:1346 msgid "Car" msgstr "Avtomobil" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:309 trans_presets.java:635 trans_presets.java:833 #: trans_presets.java:842 trans_presets.java:851 trans_presets.java:864 @@ -2509,5 +2507,5 @@ msgstr "Kolo" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:310 trans_presets.java:637 trans_presets.java:832 #: trans_presets.java:841 trans_presets.java:850 trans_presets.java:863 @@ -2518,44 +2516,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 msgid "Draw Direction Arrows" msgstr "Riši smerne puščice" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 msgid "Fast drawing (looks uglier)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180 msgid "Only interesting direction hints (e.g. with oneway tag)." msgstr "Le zanimive smerne puščice (npr enosmerne ceste)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:186 msgid "Only on the head of a way." msgstr "Le na koncu poti." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44 msgid "Draw segment order numbers" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45 msgid "Draw boundaries of downloaded data" msgstr "Riši meje sprejetega področja" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46 msgid "Draw virtual nodes in select mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47 msgid "Draw inactive layers in other color" msgstr "Riši nedejavne plasti v drugi barvi" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 msgid "Smooth map graphics (antialiasing)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 msgid "" "If your gps device draws too few lines, select this to draw lines along your " @@ -2563,27 +2561,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:71 msgid "" "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73 msgid "Maximum length (meters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:77 msgid "" "Force drawing of lines if the imported data contain no line information." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:84 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89 msgid "Draw direction arrows for lines, connecting GPS points." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90 -msgid "Draw the direction arrows using table lookups instead of complex math." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:96 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95 +msgid "" +"Draw the direction arrows using table lookups instead of complex math." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:101 msgid "" "Don't draw arrows if they are not at least this distance away from the last " @@ -2591,49 +2590,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104 msgid "Minimum distance (pixels)" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:109 -msgid "Choose the hue for the track color by the velocity at that point." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116 +msgid "Draw larger dots for the GPS points." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136 +msgid "" +"All points and track segments will have the same color. Can be customized in " +"Layer Manager." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137 +msgid "Colors points and track segments by velocity." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:138 +msgid "" +"Colors points and track segments by dilution of position (HDOP). Your " +"capture device needs to logs that information." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143 msgid "Allows to tune the track coloring for different average speeds." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122 -msgid "Draw larger dots for the GPS points." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148 +msgid "Track and Point Coloring" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 msgid "GPS Points" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175 msgid "Draw direction hints for way segments." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:163 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192 msgid "Draw the order numbers of all segments within their way." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:168 -msgid "Apply antialiasing to the map view resulting in a smoother appearance." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:197 +msgid "" +"Apply antialiasing to the map view resulting in a smoother appearance." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202 msgid "Draw the boundaries of data loaded from the server." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:178 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:207 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212 msgid "Draw the inactive data layers in a different color." msgstr "Riši nedejavne podatkovne plasti v drugi barvi." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219 msgid "OSM Data" msgstr "" @@ -2741,6 +2757,6 @@ "a menu entry of button for the first time. So some of your changes may " "become active even without restart --- but also without collistion handling. " -"This is another reason to restart JOSM after making any changes here." -"

            " +"This is another reason to restart JOSM after making any changes " +"here.

            " msgstr "" @@ -2753,8 +2769,9 @@ "key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also " "there will be 'keys' listed that correspond to a shortcut on your keyboard " -"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/" -"Semicolon on US keyboards, '.'/Period on German keyboards, ...) instead. Not " -"doing so may result in conflicts, as there is no way for JOSM to know that " -"Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...

            " +"(e.g. ':'/Colon). Please also do not use them, use the base key " +"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) " +"instead. Not doing so may result in conflicts, as there is no way for JOSM " +"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US " +"keyboard...

            " msgstr "" @@ -2778,6 +2795,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183 msgid "" -"

            The pseudo-modifier 'disabled' will disable the shortcut when encountered." -"

            " +"

            The pseudo-modifier 'disabled' will disable the shortcut when " +"encountered.

            " msgstr "" @@ -2847,67 +2864,67 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:231 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:236 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:250 msgid "layer not in list." msgstr "plasti ni na seznamu." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +msgid "usage" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 -msgid "usage" +msgid "options" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +msgid "Show this help" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 -msgid "options" +msgid "Standard unix geometry argument" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 -msgid "Show this help" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 -msgid "Standard unix geometry argument" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Download the bounding box" msgstr "Sprejmi pravokotno področje" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +msgid "Open file (as raw gps, if .gpx)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 -msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 -msgid "Open file (as raw gps, if .gpx)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 msgid "Download the bounding box as raw gps" msgstr "Sprejmi pravokotno področje GPS podatkov" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +msgid "Select with the given search" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +msgid "Don't launch in fullscreen mode" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 -msgid "Select with the given search" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 -msgid "Don't launch in fullscreen mode" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 msgid "Reset the preferences to default" msgstr "Ponastavi nastavitve na privzete" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 msgid "Set the language." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 msgid "examples" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -2915,21 +2932,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 msgid "Instead of --download= you may specify osm://\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 msgid "Activating updated plugins" msgstr "Aktiviranje posodobljenih vstavkov" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 msgid "Loading early plugins" msgstr "Nalaganje zgodnjih vstavkov" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Setting defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171 msgid "Loading plugins" msgstr "Nalaganje vstavkov" @@ -2965,6 +2982,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:108 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:164 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:162 #: trans_presets.java:308 trans_presets.java:309 trans_presets.java:310 #: trans_presets.java:311 trans_presets.java:312 trans_presets.java:313 @@ -2981,5 +2998,5 @@ msgstr "neznan" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:66 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 #, java-format msgid "" @@ -2988,25 +3005,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 #, java-format msgid "Plugin requires JOSM update: {0}." msgstr "Vstavek zahteva posodobitev programa JOSM: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 #, java-format msgid "Plugin not found: {0}." msgstr "Vstavka {0} ni bilo mogoče najti." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Zadnja posodobitev vstavkov pred več kot {0} dnevi." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 msgid "" "(You can change the number of days after which this warning appears
            by " @@ -3016,17 +3033,17 @@ "možnosti 'pluginmanager.warntime' v nastavitvah.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 msgid "Disable plugin" msgstr "Onemogoči vstavek" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Vstavka {0} ni bilo mogoče naložiti. Ga izbrišem iz nastavitev?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -3036,5 +3053,5 @@ "prepisati obstoječe datoteke." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 #, java-format msgid "" @@ -3043,10 +3060,10 @@ "Prišlo je do nepričakovane napake, ki verjetno izvira iz vstavka ''{0}''." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Glede na podatke znotraj vstavka je avtor {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:262 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -3054,9 +3071,9 @@ "Preden prijavite napako poskusite posodobiti vstavek na najnovejšo različico." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 msgid "Should the plugin be disabled?" msgstr "Naj vstavek onemogočim?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:278 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -3066,5 +3083,5 @@ "njegovo odstranitev iz spomina." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -3074,6 +3091,6 @@ "dobili JOSM." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:322 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:181 msgid "no description available" msgstr "opis ni na voljo" @@ -3085,5 +3102,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 msgid "Update Plugins" msgstr "Posodobitev vstavkov" @@ -3121,5 +3138,5 @@ "Vstavek {0} izgleda pokvarjen, ali pa ga ni bilo mogoče samodejno sprejeti." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 #, java-format msgid "Downloaded plugin information from {0} site" @@ -3130,13 +3147,13 @@ msgstr[3] "Sprejeti podatki o vstavkih z {0} strežnikov" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 msgid "No plugin information found." msgstr "Informacij o vsavku ni bilo mogoče najti." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:76 msgid "All installed plugins are up to date." msgstr "Vsi nameščeni vstavki so posodobljeni." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 #, java-format msgid "" @@ -3149,9 +3166,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:105 msgid "Download missing plugins" msgstr "Sprejem manjkajočih vstavkov" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:106 #, java-format msgid "" @@ -3164,22 +3181,22 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 msgid "Download Plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:170 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:168 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Različica {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:176 msgid "Plugin bundled with JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208 msgid "Plugin already exists" msgstr "Vstavek že obstaja" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:211 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:209 #, java-format msgid "" @@ -3190,15 +3207,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 msgid "Delete and Download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:222 #, java-format msgid "Error deleting plugin file: {0}" msgstr "Napaka pri brisanju datoteke vstavka: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:281 #, java-format msgid "Error reading plugin information file: {0}" @@ -3267,10 +3284,10 @@ msgstr "Izbriši {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:165 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 msgid "Conflicting relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 #, java-format msgid "" @@ -3281,5 +3298,5 @@ "Izbrišem iz relacije?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:166 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 #, java-format msgid "" @@ -3294,7 +3311,7 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:349 msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
            This can cause problems because other objects (that you don't see) might " -"use them.
            Do you really want to delete?" +"You are about to delete nodes outside of the area you have " +"downloaded.
            This can cause problems because other objects (that you don't " +"see) might use them.
            Do you really want to delete?" msgstr "" @@ -3412,124 +3429,135 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:232 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:426 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:428 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:527 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:765 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:776 msgid "Empty member in relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:767 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:531 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:547 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:552 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:549 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:558 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:561 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 +msgid "More than one \"via\" found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 #, java-format msgid "Unknown role ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 #, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 msgid "No \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 msgid "No \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -msgid "No \"via\" node found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +msgid "No \"via\" node or way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:636 -#, java-format -msgid "The \"{0}\" way must contain at least 2 nodes." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:731 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +msgid "The \"to\" way doesn't start or end at a \"via\" node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:620 +msgid "The \"from\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:624 +msgid "The \"to\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:742 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:847 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:858 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:949 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:987 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:998 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1012 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1023 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1195 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1206 msgid "untagged" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1196 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207 msgid "text" msgstr "besedilo" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:94 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:181 @@ -3537,13 +3565,13 @@ msgstr "izbrano" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 msgid "incomplete way" msgstr "nepopolna pot" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 msgid "highlight" msgstr "" @@ -3565,5 +3593,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:113 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:89 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:77 msgid "incomplete" @@ -3595,14 +3623,14 @@ msgstr[3] "{0} člani" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 msgid "Duplicate" msgstr "Podvoji" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 msgid "Duplicate selection by copy and immediate paste." msgstr "Podvoji izbrano z zaporednima ukazoma kopiraj in prilepi." -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 @@ -3611,5 +3639,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -3680,6 +3708,8 @@ msgstr "Prikaže podatke o zgodovini vozlišč in poti OSM" -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:57 -msgid "Please select at least one node, way or relation." +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:60 +msgid "" +"Please select at least one node, way or relation. Only already uploaded " +"elements have a history." msgstr "" @@ -3702,7 +3732,7 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/TerracerAction.java:47 @@ -3836,5 +3866,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:123 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:314 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:315 msgid "Enter values for all conflicts." msgstr "" @@ -3842,5 +3872,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 msgid "Solve Conflicts" msgstr "" @@ -3972,5 +4002,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #, java-format @@ -3997,15 +4027,19 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125 -msgid "" -"There is more than one way using the node(s) you selected. Please select the " +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 +msgid "" +"There is more than one way using the node you selected. Please select the " "way also." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133 +msgid_plural "" +"There is more than one way using the nodes you selected. Please select the " +"way also." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137 msgid "The selected nodes do not share the same way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -4013,10 +4047,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229 msgid "You must select two or more nodes to split a circular way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -4024,5 +4058,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 msgid "" "A role based relation membership was copied to all new ways.\n" @@ -4030,5 +4064,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:296 #, java-format msgid "Split way {0} into {1} parts" @@ -4415,5 +4449,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 msgid "Align Nodes in Circle" msgstr "Razporedi vozliša v krog" @@ -4427,5 +4461,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 msgid "Please select at least four nodes." msgstr "Prosim, izberite vsaj 4 vozlišča." @@ -4490,4 +4524,32 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "" +"Show status report with useful information that can be attached to bugs" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92 +msgid "Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +msgid "Copy to clipboard and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 +msgid "Close" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 @@ -4499,13 +4561,13 @@ msgstr "Znova uveljavi zadnje razveljavljeno dejanje." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:44 msgid "Delete Mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:46 msgid "Delete nodes or ways." msgstr "Izbriši vozlišča ali poti" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:84 @@ -4516,5 +4578,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:130 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -4524,6 +4586,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:87 msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." +"Drag play head and release near track to play audio from there; " +"SHIFT+release to synchronize audio at that point." msgstr "" @@ -4537,23 +4599,23 @@ msgstr "Ustvari površine" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 msgid "Extrude Way" msgstr "Izrini pot" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:252 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:416 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:430 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/ExtrudeAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 msgid "Draw a rectangle of the desired size, then release the mouse button." msgstr "Narišite kvadrat poljubne velikosti, nato izpustite miškin gumb." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:420 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:434 msgid "Release the mouse button to stop rotating." msgstr "Za prenehanje vrtenja izpustite miškin gumb." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 msgid "Drag a way segment to make a rectangle." msgstr "Povlecite segment poti za ustvarjenje pravokotnika." @@ -4621,14 +4683,14 @@ msgstr "Izberi, premakni ali zasuči predmete" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:191 msgid "Add and move a virtual new node to way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:220 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:223 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 msgid "Cannot move objects outside of the world." msgstr "Predmetov ni možno prestaviti s tega sveta." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:418 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:432 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -4637,5 +4699,5 @@ "najbližjo točko." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:422 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:436 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to remove); Shift-" @@ -4706,30 +4768,30 @@ msgstr "Združi {0} vozlišč" +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Orthogonalize Shape" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -msgid "Orthogonalize Shape" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 msgid "Only two nodes allowed" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 msgid "Selection must consist only of ways." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 msgid "Please select one or more closed ways of at least four nodes." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 msgid "Please select ways with almost right angles to orthogonalize." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 msgid "" "You are using the EPSG:4326 projection which might lead
            to " @@ -4738,9 +4800,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "Only one node selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 msgid "Orthogonalize" msgstr "" @@ -4791,5 +4853,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101 -msgid "Please select exactly three nodes or one way with exactly three nodes." +msgid "" +"Please select exactly three nodes or one way with exactly three nodes." msgstr "Prosim, izberite točno tri vozlišča ali pot s tremi vozlišči." @@ -4798,52 +4861,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../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:71 +msgid "Update Data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:72 +#, java-format +msgid "" +"This action will require {0} individual download requests. Do you wish to " +"continue?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 msgid "Open Location..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 msgid "Open an URL." msgstr "Odpri datoteko." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 msgid "Separate Layer" msgstr "Ločena plast" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 msgid "Enter URL to download:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 msgid "Download Location" msgstr "Mesto vira sprejema" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 msgid "Download URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 msgid "Add Node..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 msgid "Add a node by entering latitude and longitude." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 msgid "Enter the coordinates for the new node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 msgid "Use decimal degrees." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 msgid "Negative values denote Western/Southern hemisphere." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 #: ../plugins/livegps/livegps/LiveGpsDialog.java:54 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93 @@ -4852,5 +4932,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 #: ../plugins/livegps/livegps/LiveGpsDialog.java:56 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96 @@ -4893,14 +4973,14 @@ msgstr "Premakni predmete {0}" +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "Overwrite" msgstr "Prepiši" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "File exists. Overwrite?" msgstr "Datoteka obstaja. Jo nadomestim?" @@ -4919,52 +4999,57 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 msgid "This node is not glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 msgid "None of these nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of this way's nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 msgid "The current selection cannot be used for unglueing." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "Select either:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +msgid "* One tagged node, or" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "* One node that is used by more than one way, or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 -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:104 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +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:117 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:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 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:107 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -4974,10 +5059,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:160 +msgid "Unglued Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:373 #, java-format msgid "Dupe into {0} nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:320 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:397 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -5078,5 +5167,5 @@ msgstr "Izniči zadnje dejanje." -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 msgid "No Shortcut" msgstr "" @@ -5098,13 +5187,13 @@ msgstr "Podatki OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:29 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:28 msgid "Downloading GPS data" msgstr "Sprejem podatkov GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:41 msgid "Downloaded GPX Data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:71 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:69 msgid "Raw GPS data" msgstr "Surovi podatki GPS" @@ -5325,5 +5414,6 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169 -msgid "Header contains several values and cannot be mapped to a single string" +msgid "" +"Header contains several values and cannot be mapped to a single string" msgstr "" @@ -5671,5 +5761,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69 -msgid "Maximum number of segments allowed in each generated way. Default 250." +msgid "" +"Maximum number of segments allowed in each generated way. Default 250." msgstr "" @@ -5688,6 +5779,7 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72 msgid "" -"Accuracy of Douglas-Peucker line simplification, measured in degrees." -"
            Lower values give more nodes, and more accurate lines. Default 0.0003." +"Accuracy of Douglas-Peucker line simplification, measured in " +"degrees.
            Lower values give more nodes, and more accurate lines. Default " +"0.0003." msgstr "" @@ -6314,6 +6406,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:509 msgid "" -"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." -"org/index.php/User:JLS/speller) or tag checking data files." +"The sources (URL or filename) of spell check (see " +"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking " +"data files." msgstr "" @@ -6770,6 +6863,6 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:40 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:43 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 #, java-format @@ -6777,18 +6870,29 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:51 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:55 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 msgid "Contacting WMS Server..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157 msgid "Create buildings" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 msgid "CadastreGrabber: Illegal url." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +msgid "" +"To avoid cadastre WMS overload,\n" +"building import size is limited to 1 km2 max." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" @@ -6811,16 +6915,25 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:128 +msgid "Cadastre" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:139 +msgid "Auto sourcing" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164 +msgid "Invalid projection" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 +#, java-format +msgid "Change the projection to {0} first." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:169 msgid "" "To enable the cadastre WMS plugin, change\n" "the JOSM projection to Lambert and restart" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132 -msgid "Cadastre" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 -msgid "Auto sourcing" msgstr "" @@ -6893,6 +7006,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:43 msgid "" -"More than one WMS layer present.\n" -"Select one of them first, then retry." +"More than one WMS layer present\n" +"Select one of them first, then retry" msgstr "" @@ -6901,5 +7014,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136 #, java-format @@ -6909,13 +7022,13 @@ msgstr[1] "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61 msgid "Extract SVG ViewBox..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65 msgid "Extract best fitting boundary..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:120 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126 msgid "Create boundary" msgstr "" @@ -6951,15 +7064,15 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 msgid "Save WMS layer to file" msgstr "Shrani plast WMS v datoteko" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "Load WMS layer from file" msgstr "Naloži plast WMS iz datoteke" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -6967,5 +7080,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 msgid "File Format Error" msgstr "" @@ -6973,5 +7086,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 msgid "Error loading file" msgstr "" @@ -6997,52 +7110,53 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 msgid "Replace original background by JOSM background color." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30 msgid "Reverse grey colors (for black backgrounds)." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 msgid "Set background transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34 msgid "Draw boundaries of downloaded data." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Enable automatic caching." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:53 -msgid "" -"A special handler of the french cadastre wms at www.cadastre.gouv." -"fr

            Please read the Terms and Conditions of Use here (in french): " -"
            http://www.cadastre.gouv.fr/scpc/html/" -"CU_01_ConditionsGenerales_fr.html
            before any upload of data created " -"by this plugin." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:58 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:55 +msgid "" +"A special handler of the french cadastre wms at " +"www.cadastre.gouv.fr

            Please read the Terms and Conditions of Use here " +"(in french):
            " +"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " +"
            before any upload of data created by this plugin." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -7050,26 +7164,40 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 -msgid "" -"Invert the original texts from black to white (and all intermediate greys)." +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +msgid "" +"Invert the original black and white colors (and all intermediate greys). " +"Useful for texts on dark backgrounds." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 +msgid "Allows multiple layers stacking" msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 -msgid "Allows multiple layers stacking" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:99 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:113 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 msgid "Image grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:162 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:125 +msgid "Grab smaller images (higher quality but use more memory)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +msgid "Fixed size square (default is 100m)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +msgid "Fixed size (from 25 to 1000 meters)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -7178,5 +7306,5 @@ msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:254 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:255 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -7317,7 +7445,7 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:203 msgid "" -"Take a photo of your GPS receiver while it displays the time." -"
            Display that photo here.
            And then, simply capture the time you read " -"on the photo and select a timezone
            " +"Take a photo of your GPS receiver while it displays the " +"time.
            Display that photo here.
            And then, simply capture the time you " +"read on the photo and select a timezone
            " msgstr "" @@ -7382,5 +7510,6 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:484 -msgid "I can take a picture of my GPS receiver.
            Can this help?" +msgid "" +"I can take a picture of my GPS receiver.
            Can this help?" msgstr "" @@ -7424,5 +7553,5 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #, java-format msgid "" @@ -7431,14 +7560,14 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:579 msgid "Invalid offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:641 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:643 #, java-format msgid "Found {0} matchs of {1} in GPX track {2}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:642 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:644 msgid "GPX Track loaded" msgstr "" @@ -7446,5 +7575,5 @@ #: ../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/UploadDataGui.java:79 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 msgid "Upload Traces" msgstr "Pošiljanje sledi" @@ -7454,58 +7583,72 @@ msgstr "Pošlji sledi na openstreetmap.org" +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71 +msgid "Upload Trace" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +msgid "Public" +msgstr "" + #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 -msgid "Upload GPX track" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -msgid "Public" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 msgid "Selected makes your trace public in openstreetmap.org" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Description" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:123 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 msgid "Tags" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:182 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:153 +#, java-format +msgid "Selected track: {0}" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:176 msgid "Connecting..." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 -msgid "Uploading GPX track..." -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:214 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:199 +msgid "Upload cancelled" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:209 +msgid "Error while uploading" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:227 -msgid "Error while uploading" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:235 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +msgid "Upload failed. Server returned the following message: " +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 +#, java-format +msgid "Uploading GPX track: {0}% ({1} of {2})" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:252 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "Ni izbrana plast GPX. Sledi ni mogoče poslati." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:241 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:244 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "" @@ -7724,32 +7867,32 @@ msgstr "Samodejno sprejemanje" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:232 msgid "Download visible tiles" msgstr "Naloži vidne ploščice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241 msgid "Change resolution" msgstr "Spremeni ločljivost" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:253 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:264 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:271 msgid "Alpha channel" msgstr "" @@ -12615,2 +12758,5 @@ msgid "to way" msgstr "" + +#~ msgid "Upload this trace..." +#~ msgstr "Pošlji to sled..." Index: /applications/editors/josm/i18n/po/sv.po =================================================================== --- /applications/editors/josm/i18n/po/sv.po (revision 13832) +++ /applications/editors/josm/i18n/po/sv.po (revision 13833) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-15 22:03+0100\n" +"POT-Creation-Date: 2009-02-21 16:35+0100\n" "PO-Revision-Date: 2009-02-15 15:45+0000\n" "Last-Translator: Susanna Björverud \n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-02-15 20:41+0000\n" +"X-Launchpad-Export-Date: 2009-02-22 20:29+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 #, java-format msgid "" @@ -26,10 +26,10 @@ "\n" msgstr "" -"Det gick inte att tilldela kortkommandot ''{0}'' till handlingen " -"''{1}'' ({2})\n" +"Det gick inte att tilldela kortkommandot ''{0}'' till handlingen ''{1}'' " +"({2})\n" "eftersom detta kortkommando redan används för handlingen ''{3}'' ({4}).\n" "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 msgid "" "This action will have no shortcut.\n" @@ -39,5 +39,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -48,5 +48,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Tips: Du kan själv välja kortkommandon i inställningarna.)" @@ -57,17 +57,17 @@ #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 msgid "Information" msgstr "Information" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Do nothing" msgstr "Gör ingenting" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Report Bug" msgstr "Rapportera en bugg" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 msgid "" "An unexpected exception occurred.\n" @@ -81,14 +81,14 @@ "lämna in en felrapport." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Unexpected Exception" msgstr "Oväntat undantag" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 #, java-format msgid "Please report a ticket at {0}" msgstr "Lämna in en rapport på {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" @@ -96,5 +96,5 @@ "möjligt)!" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:78 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -104,9 +104,9 @@ "versionen av JOSM och alla insticksmoduler." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Be sure to include the following information:" msgstr "Följande information måste finnas med:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75 msgid "(The text has already been copied to your clipboard.)" msgstr "(Texten finns redan i urklipp.)" @@ -120,5 +120,5 @@ msgstr "Fel vid uppspelning av ljud" -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:94 @@ -126,5 +126,5 @@ msgstr "Ansluter till OSM-servern..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:48 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:32 @@ -132,10 +132,10 @@ msgstr "Hämtar OSM-data..." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 msgid "NullPointerException, possibly some missing tags." msgstr "NullPointerException, Det saknas förmodligen några taggar." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83 msgid "Preparing data..." msgstr "Förbereder data..." @@ -164,35 +164,35 @@ msgstr "Hämtar punkter {0} till {1}..." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:164 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:168 msgid "Unknown version" msgstr "Okänd version" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 msgid "Found element in non-way." msgstr "Hittade element av typen på icke-sträcka" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 msgid " has zero ref" msgstr " har nollreferens" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 msgid "Found element in non-relation." msgstr "Fann -tagg utanför relation." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:252 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250 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:294 msgid "Illegal object with id=0" msgstr "Ogiltigt objekt med id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Det nödvändiga attributet \"{0}\" saknas." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 #, java-format msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" @@ -200,13 +200,13 @@ "Hoppar över en sträcka eftersom den innehåller en nod som inte finns: {0}\n" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:502 msgid "Prepare OSM data..." msgstr "Förbereder OSM-data..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:518 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:516 msgid "Ill-formed node id" msgstr "Felformaterad nod-id" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:280 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:287 msgid "Parse error: invalid document structure for gpx document" msgstr "Tolkningsfel: ogiltig dokumentstruktur för gpx-dokument" @@ -216,18 +216,18 @@ msgstr "Tar kontakt med servern..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 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/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 msgid "Commit comment" msgstr "Bidragskommentar" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" msgstr "{0}% ({1}/{2}), {3} kvar. Skickar in {4}: {5} (id: {6})" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64 @@ -237,34 +237,32 @@ msgstr "Ett fel inträffade: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:192 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190 msgid "Opening changeset..." msgstr "Öppnar ändringssamling..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:226 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224 msgid "Server does not support changesets" msgstr "Servern har inte stöd för ändringssamlingar" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:246 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:428 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:609 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:184 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607 msgid "Unknown host" msgstr "Okänd värddator" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282 msgid "Preparing..." msgstr "Förbereder..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:294 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292 msgid "Uploading..." msgstr "Skickar in..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375 msgid "Closing changeset..." msgstr "Stänger ändringssamling..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:652 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650 msgid "Transfer aborted due to error (will wait for 5 seconds):" msgstr "Överföringen avbröts på grund av fel (väntar nu i fem sekunder):" @@ -302,17 +300,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95 #: ../core/src/org/openstreetmap/josm/Main.java:348 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:29 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 @@ -325,11 +326,11 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:110 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -344,11 +345,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:186 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 msgid "Creating main GUI" msgstr "Skapar huvudgränssnittet" #: ../core/src/org/openstreetmap/josm/Main.java:195 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:271 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:278 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:56 msgid "Help" @@ -391,21 +392,21 @@ msgstr "Hoppar över felaktig URL till en fil: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109 msgid "min lat" msgstr "min lat" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111 msgid "min lon" msgstr "min lat" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:117 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "max lat" msgstr "max lat" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 msgid "max lon" msgstr "max lon" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:122 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -415,5 +416,5 @@ "hem området)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:134 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130 msgid "Bounding Box" msgstr "Gränsvärden" @@ -449,6 +450,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:96 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:894 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:956 msgid "name" msgstr "namn" @@ -481,5 +482,5 @@ msgstr "zooma" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:107 msgid "" "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -489,5 +490,5 @@ "och flytta musen. Välj: Klicka" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:109 msgid "Slippy map" msgstr "Glidande karta" @@ -498,7 +499,7 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:605 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:602 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:89 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -518,5 +519,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380 msgid "Remove" msgstr "Ta bort" @@ -561,5 +562,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:195 msgid "Download area too large; will probably be rejected by server" -msgstr "Hämtningsområdet är alltför stort; kommer troligen avvisas av servern." +msgstr "" +"Hämtningsområdet är alltför stort; kommer troligen avvisas av servern." #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:198 @@ -619,5 +621,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" -msgstr "Ändra storleken på appleten till angiven geometri (format: BREDDxHÖJD)" +msgstr "" +"Ändra storleken på appleten till angiven geometri (format: BREDDxHÖJD)" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 @@ -657,22 +660,23 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "If specified, reset the configuration instead of reading it." -msgstr "Om angivet så återställ konfigurationen istället för att läsa in den." - -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:109 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:186 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:198 +msgstr "" +"Om angivet så återställ konfigurationen istället för att läsa in den." + +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:108 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:191 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:203 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 msgid "Java OpenStreetMap Editor" msgstr "Java OpenStreetMap-redigeraren" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:111 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:110 msgid "Message of the day not available" msgstr "Dagens meddelande är inte tillgängligt" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:200 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:205 msgid "Downloading \"Message of the day\"" msgstr "Hämtar \"Dagens meddelande\"" @@ -712,33 +716,33 @@ msgstr "Zooma ut" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:234 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:474 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:512 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:383 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:380 msgid "More information about this feature" msgstr "Mer information om denna funktion" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:393 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:390 msgid "Optional Attributes:" msgstr "Valfria attribut:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:437 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Använd snabbvalet ''{0}'' i gruppen ''{1}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:438 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:435 #, java-format msgid "Use preset ''{0}''" msgstr "Använd snabbval ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 msgid "way" @@ -747,11 +751,11 @@ msgstr[1] "sträckor" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:214 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 msgid "node" msgid_plural "nodes" @@ -759,6 +763,6 @@ msgstr[1] "noder" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:81 @@ -768,14 +772,14 @@ msgstr[1] "relationer" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 msgid "closedway" msgstr "slutenväg" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:475 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 #, java-format msgid "Unknown type: {0}" msgstr "Okänd typ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:549 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 #, java-format @@ -783,15 +787,15 @@ msgstr "Kunde inte läsa källan till snabbval för taggning: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:555 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 #, java-format msgid "Error parsing {0}: " msgstr "Fel vid tolkning {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:572 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:569 #, 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:607 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595 #, java-format msgid "Change {0} object" @@ -800,9 +804,17 @@ msgstr[1] "Ändra {0} objekt" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 msgid "Nothing selected!" msgstr "Inget markerat!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 +msgid "Selection unsuitable!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +msgid "Apply Preset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 msgid "Change Properties" msgstr "Ändra egenskaper" @@ -813,14 +825,14 @@ msgstr "Snabbvalsgrupp ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:107 msgid "File" msgstr "Arkiv" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:135 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:107 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:86 @@ -832,22 +844,22 @@ msgstr "Redigera" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 msgid "View" msgstr "Visa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:26 msgid "Tools" msgstr "Verktyg" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:141 msgid "Audio" msgstr "Ljud" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:142 msgid "Presets" msgstr "Snabbval" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:40 @@ -859,18 +871,18 @@ msgstr "Meny: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:210 msgid "Wireframe View" msgstr "Trådnätsvisning" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212 msgid "Toggle Wireframe view" msgstr "Växla trådnätsvisning" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:28 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 msgid "Contacting the OSM server..." msgstr "Ansluter till OSM-servern" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 #, java-format msgid "This will change up to {0} object." @@ -879,11 +891,11 @@ msgstr[1] "Detta kommer att ändra upp till {0} objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 msgid "An empty value deletes the key." msgstr "Om värdet är tomt tas nyckeln bort." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66 @@ -893,7 +905,7 @@ msgstr "Nyckel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 @@ -902,10 +914,10 @@ msgstr "Värde" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333 msgid "Change values?" msgstr "Ändra värden?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:257 #, java-format msgid "Change properties of up to {0} object" @@ -914,33 +926,33 @@ msgstr[1] "Ändra egenskaper för upp till {0} objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 msgid "Please select a key" msgstr "Välj en nyckel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321 msgid "Please select a value" msgstr "Välj ett värde" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:445 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:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 msgid "Properties/Memberships" msgstr "Egenskaper/Roller" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 msgid "Properties for selected objects." msgstr "Egenskaper för valda objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97 @@ -952,58 +964,58 @@ msgstr "Växla: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 msgid "Member Of" msgstr "Medlem av" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Role" msgstr "Roll" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:559 msgid "Change relation" msgstr "Ändra relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560 #, 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:564 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 msgid "Delete from relation" msgstr "Ta bort från relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:600 msgid "Add Properties" msgstr "Lägg till egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 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:609 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 msgid "Edit Properties" msgstr "Redigera egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609 msgid "Edit the value of the selected key for all objects" msgstr "Redigera värdet av den valda nyckeln för alla objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 msgid "Delete Properties" msgstr "Ta bort egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:77 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:293 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 @@ -1012,98 +1024,115 @@ msgstr "Ta bort" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 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:766 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:763 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Egenskaper: {0} / Medlemskap: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:769 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 msgid "Properties / Memberships" msgstr "Egenskaper / Roller" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178 +msgid "Apply Changes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 msgid "Create new relation" msgstr "Skapa ny relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208 msgid "Edit new relation" msgstr "Redigera ny relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209 #, java-format msgid "Edit relation #{0}" msgstr "Redigera relation # {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230 +msgid "Basic" +msgstr "Grundläggande" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Occupied By" msgstr "Innehas av" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311 msgid "Tags (empty value deletes tag)" msgstr "Taggar (tomt värde tar bort taggen)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313 msgid "Members" msgstr "Medlemmar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 +msgid "Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 msgid "Move the currently selected members up" msgstr "Flytta vald medlem/valda medlemmar uppåt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358 +msgid "Add Selected" +msgstr "Lägg till vald" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359 +msgid "Add all currently selected objects as members" +msgstr "Lägg till alla för närvarande valda objekt som medlemmar" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365 +msgid "Remove Selected" +msgstr "Ta bort det valda" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366 +msgid "Remove all currently selected objects from relation" +msgstr "Ta bort alla för närvarande valda objekt från relationen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 +msgid "Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 msgid "Move the currently selected members down" msgstr "Flytta vald medlem/valda medlemmar nedåt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356 -msgid "Add Selected" -msgstr "Lägg till vald" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:357 -msgid "Add all currently selected objects as members" -msgstr "Lägg till alla för närvarande valda objekt som medlemmar" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:363 -msgid "Remove Selected" -msgstr "Ta bort det valda" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:364 -msgid "Remove all currently selected objects from relation" -msgstr "Ta bort alla för närvarande valda objekt från relationen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381 msgid "Remove the member in the current table row from this relation" msgstr "Ta bort medlemmen på den nuvarande tabellraden från denna relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394 msgid "Download Members" msgstr "Hämta medlemmar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:406 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395 msgid "Download all incomplete ways and nodes in relation" msgstr "Hämta alla ofullständiga sträckor och noder i relationen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:415 -msgid "Basic" -msgstr "Grundläggande" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:453 #, java-format msgid "Members: {0}" msgstr "Medlemmar: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:587 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:461 +#, java-format +msgid "Relation Editor: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:585 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 msgid "There were conflicts during import." msgstr "Konflikter upptäcktes under import." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593 msgid "Error parsing server response." msgstr "Fel vid inläsning av serverns svar." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:600 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:594 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:598 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -1117,9 +1146,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:345 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 msgid "Error" msgstr "Fel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:599 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597 msgid "Cannot connect to server." msgstr "Kan inte ansluta till server." @@ -1282,5 +1311,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:94 @@ -1290,9 +1319,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 msgid "" "Set the selected elements on the map to the selected items in the list above." -msgstr "Sätt urval av element på kartan till de valda posterna i listan ovan." +msgstr "" +"Sätt urval av element på kartan till de valda posterna i listan ovan." #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 @@ -1354,16 +1384,24 @@ msgstr "Urval: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +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:67 +msgid "Delete the selected relation" +msgstr "Ta bort den valda relationen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 #: trans_presets.java:2904 msgid "Relations" msgstr "Relationer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 msgid "Open a list of all relations." msgstr "Öppna en lista över alla relationer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 @@ -1371,17 +1409,9 @@ msgstr "Ny" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 msgid "Create a new relation" msgstr "Skapa en ny relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -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:90 -msgid "Delete the selected relation" -msgstr "Ta bort den valda relationen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:130 #, java-format msgid "Relations: {0}" @@ -1409,48 +1439,48 @@ msgstr "Kommandolista: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +msgid "Resolve" +msgstr "Jämka" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +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:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Conflict" msgstr "Konflikt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 msgid "Merging conflicts." msgstr "Jämkar konflikter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67 -msgid "Resolve" -msgstr "Jämka" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:68 -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:105 -msgid "Please select something from the conflict list." -msgstr "Välj någonting från konfliktlistan." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Resolve Conflicts" msgstr "Jämka konflikter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +msgid "Solve Conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 #, java-format msgid "Conflicts: {0}" msgstr "Konflikter: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Conflicts" msgstr "Konflikter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 msgid "conflict" msgstr "konflikt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 msgid "background" msgstr "bakgrund" @@ -1474,5 +1504,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 msgid "Customize Color" @@ -1480,5 +1510,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1488,5 +1518,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1495,5 +1525,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:326 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:152 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -1511,5 +1541,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:265 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 #, java-format msgid "Audio synchronized at point {0}." @@ -1517,5 +1547,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232 msgid "Unable to synchronize in layer being played." msgstr "Det går inte att synkronisera i det lager som spelas upp." @@ -1538,5 +1568,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:958 msgid "desc" msgstr "beskr" @@ -1558,5 +1588,5 @@ msgstr "Fel vid visning av URL" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -1566,5 +1596,5 @@ "upp." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -1574,18 +1604,18 @@ "spårpunkt där du vill synkronisera." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224 msgid "Unable to create new audio marker." msgstr "Kunde inte skapa ny ljudmarkör." #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 msgid "Convert to data layer" msgstr "Omvandla till datalager" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:725 -msgid "" -"Upload of unprocessed GPS data as map data is considered harmful." -"
            If you want to upload traces, look here:" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:645 +msgid "" +"Upload of unprocessed GPS data as map data is considered " +"harmful.
            If you want to upload traces, look here:" msgstr "" "Det anses skadligt att skicka in obehandlad GPS-data.
            Om du vill " @@ -1593,66 +1623,22 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:646 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:747 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:448 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:667 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "Converted from: {0}" msgstr "Omvandlad från:{0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612 -msgid "Upload this trace..." -msgstr "Skicka in detta spår..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:616 -msgid "" -"This functionality has been added only recently. Please
            use with " -"care and check if it works as expected." -msgstr "" -"Denna funktion har nyligen lagts till. Använd med försiktighet
            och " -"kontrollera om det fungerar som tänkt." - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:102 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:107 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:626 -msgid "Upload track filtered by JOSM" -msgstr "Skicka in spår filtrerat av JOSM" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:103 -#, java-format -msgid "Upload raw file: {0}" -msgstr "Skicka in rå fil: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:108 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:627 -msgid "Upload raw file: " -msgstr "Skicka in rå fil: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640 -msgid "Description:" -msgstr "Beskrivning:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:123 -msgid "Tags:" -msgstr "Taggar:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:129 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:648 -msgid "GPX-Upload" -msgstr "Skicka in GPX" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:229 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:217 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113 msgid "gps point" msgstr "gps-punkt" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 #: trans_presets.java:1795 trans_presets.java:1801 trans_presets.java:1807 #: trans_presets.java:1813 trans_presets.java:1819 trans_presets.java:1825 @@ -1672,5 +1658,5 @@ msgstr[1] "spår" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 msgid "point" msgid_plural "points" @@ -1678,5 +1664,5 @@ msgstr[1] "punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 #, java-format msgid "a track with {0} point" @@ -1685,5 +1671,5 @@ msgstr[1] "ett spår med {0} punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} consists of {1} track" @@ -1692,5 +1678,5 @@ msgstr[1] "{0} består av {1} spår" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} point" @@ -1699,25 +1685,25 @@ msgstr[1] "{0} punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117 msgid "Customize line drawing" msgstr "Anpassa linjeritning" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:296 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 msgid "Use global settings." msgstr "Använd globala inställningar" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 msgid "Draw lines between points for this layer." msgstr "Rita linjer mellan punkter i detta lager." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:298 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123 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/RawGpsLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:135 msgid "Select line drawing options" @@ -1751,5 +1737,5 @@ msgstr "JPEG-bilder (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290 #, java-format msgid "{0} track, " @@ -1758,5 +1744,5 @@ msgstr[1] "{0} spår, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 #, java-format msgid "{0} route, " @@ -1765,5 +1751,5 @@ msgstr[1] "{0} rutter, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 #, java-format msgid "{0} waypoint" @@ -1772,55 +1758,51 @@ msgstr[1] "{0} sträckpunkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #, java-format msgid "Name: {0}" msgstr "Namn: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "Description: {0}" msgstr "Beskrivning: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 msgid "Timespan: " msgstr "Tidsomfång: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Length: " msgstr "Längd: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:642 -msgid "Tags (keywords in GPX):" -msgstr "Taggar (nyckelord i GPX):" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:655 msgid "time" msgstr "tid" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:780 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:679 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:700 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 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:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:686 msgid "Download everything within:" msgstr "Hämta allting inom:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 #, java-format msgid "{0} meters" msgstr "{0} meter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:692 msgid "Maximum area per request:" msgstr "Största tillåtna område per begäran:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 #, java-format msgid "{0} sq km" msgstr "{0} km2" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787 #, java-format msgid "" @@ -1831,14 +1813,14 @@ "Önskar du
            fortsätta?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:844 #, java-format msgid "Audio markers from {0}" msgstr "Ljudmarkörer från {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 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:1049 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "" "Some waypoints with timestamps from before the start of the track were " @@ -1847,5 +1829,5 @@ "Några sträckpunkter med tidsstämplar tidigare än spårets början uteslöts." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -1955,19 +1937,19 @@ msgstr "Angiven tid kunde inte tolkas." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:140 msgid "outside downloaded area" msgstr "utanför hämtat område" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 #, java-format msgid "{0} consists of:" msgstr "{0} består av:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:353 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:347 #, java-format msgid " ({0} deleted.)" msgstr " ({0} raderad.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:445 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 msgid "Convert to GPX layer" msgstr "Omvandla till gpx-lager" @@ -1995,37 +1977,37 @@ msgstr "Kunde inte skriva bokmärken." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 msgid "The geographic longitude at the mouse pointer." msgstr "Den geografiska longituden vid muspekaren." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The name of the object at the mouse pointer." msgstr "Namnet på objektet vid muspekaren." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 msgid "The geographic latitude at the mouse pointer." msgstr "Den geografiska latituden vid muspekaren." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The angle between the previous and the current way segment." msgstr "Vinkeln mellan föregående och pågående delsträcka." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The (compass) heading of the line segment being drawn." msgstr "Kompassriktning för den delsträcka som ritas." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The length of the new way segment being drawn." msgstr "Längden hos den nya delsträcka som håller på att ritas." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:160 msgid "(no object)" msgstr "(inget objekt)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:62 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:56 msgid "Color" msgstr "Färg" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:57 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107 #: trans_presets.java:56 trans_presets.java:92 trans_presets.java:130 @@ -2126,27 +2108,36 @@ msgstr "Namn" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:118 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:112 #, java-format msgid "Paint style {0}: {1}" msgstr "Ritstil{0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 msgid "Choose" msgstr "Välj" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 msgid "Please select a color." msgstr "Välj en färg." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 #, java-format msgid "Choose a color for {0}" msgstr "Välj en färg för {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +msgid "Set to default" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:172 +msgid "Set all to default" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:184 msgid "Colors used by different objects in JOSM." msgstr "De färger som används av olika objekt i JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:171 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:198 msgid "Colors" msgstr "Färger" @@ -2180,26 +2171,26 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45 msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
            The password is transfered in plain text to the server, encoded in the " -"URL.
            Do not use a valuable Password." -msgstr "" -"VARNING: Lösenordet lagras okryperat i inställningsfilen." -"
            Lösenordet skickas okryperat till servern, som en del av URL:en." -"
            Använd inte ett värdefullt lösenord." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:45 +"WARNING: The password is stored in plain text in the preferences " +"file.
            The password is transfered in plain text to the server, encoded in " +"the URL.
            Do not use a valuable Password." +msgstr "" +"VARNING: Lösenordet lagras okryperat i " +"inställningsfilen.
            Lösenordet skickas okryperat till servern, som en del " +"av URL:en.
            Använd inte ett värdefullt lösenord." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44 msgid "Sort presets menu" msgstr "Sortera snabbvalsmenyn" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46 msgid "Enable built-in defaults" msgstr "Aktivera inbyggda förval" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:58 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69 msgid "Tagging preset source" msgstr "Källa till snabbval för taggning" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:156 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 @@ -2207,5 +2198,5 @@ msgstr "Välj vilken rad du vill ändra." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500 @@ -2214,8 +2205,8 @@ msgstr "Välj vilken rad du vill ta bort." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89 -msgid "" -"The sources (URL or filename) of tagging preset definition files. See http://" -"josm.openstreetmap.de/wiki/TaggingPresets for help." +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88 +msgid "" +"The sources (URL or filename) of tagging preset definition files. See " +"http://josm.openstreetmap.de/wiki/TaggingPresets for help." msgstr "" "Källorna (URL eller filnamn) till de filer i vilka snabbval för taggning " @@ -2223,18 +2214,18 @@ "information." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89 msgid "Add a new tagging preset source to the list." msgstr "Lägg till en källa för snabbval för taggning till listan." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 msgid "Delete the selected source from the list." msgstr "Ta bort vald källa från listan." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:94 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93 msgid "Tagging Presets" msgstr "Snabbval för taggning" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97 msgid "Tagging preset sources" msgstr "Källor för snabbval för taggning" @@ -2248,6 +2239,6 @@ msgstr "När man sparar, behåll backup-filer som slutar på ~" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:141 @@ -2255,34 +2246,34 @@ msgstr "Insticksmoduler" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 msgid "Configure available plugins." msgstr "Ställ in tillgängliga insticksmoduler." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43 msgid "Download List" msgstr "Hämta lista" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:80 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51 msgid "Update" msgstr "Uppdatera" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:60 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 msgid "Configure Sites..." msgstr "Konfigurera hämtställen..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add either site-josm.xml or Wiki Pages." msgstr "Lägg till antingen site-josm.xml eller wikisidor." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99 msgid "Please select an entry." msgstr "Välj en post." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 msgid "Configure Plugin Sites" msgstr "Konfigurera hämtställen för insticksmoduler" @@ -2374,5 +2365,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36 msgid "Explicit waypoints with time estimated from track position." -msgstr "Explicita sträckpunkter med tid uppskattad från position längs spåret." +msgstr "" +"Explicita sträckpunkter med tid uppskattad från position längs spåret." #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:37 @@ -2471,9 +2463,9 @@ msgstr "Kalibrering av röstinspelare" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "Display Settings" msgstr "Visningsinställningar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "" "Various settings that influence the visual representation of the whole " @@ -2482,56 +2474,64 @@ "Olika inställningar som påverkar hur hela programmet representeras visuellt." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings" msgstr "Anslutningsinställningar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings for the OSM server." msgstr "Anslutningsinställningar för OSM-servern" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Map Settings" msgstr "Kartinställningar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Settings for the map projection and data interpretation." msgstr "Inställningar för kartprojektion och datatolkning." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Audio Settings" msgstr "Ljudinställningar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Settings for the audio player and audio markers." msgstr "Inställnignar för ljudspelare och ljudmarkörer." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97 msgid "You have to restart JOSM for some settings to take effect." msgstr "" "Du behöver starta om JOSM för att vissa inställningar skall slå igenom." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:25 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 msgid "Draw lines between raw gps points." msgstr "Rita linjer mellan råa gps-punkter." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:27 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 msgid "Force lines if no segments imported." msgstr "Tvinga linjer om inga segment importerats." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:28 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 msgid "Draw large GPS points." msgstr "Rita stora GPS-punkter" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 -msgid "Color tracks by velocity." -msgstr "Färglägg spår efter hastighet." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34 +msgid "Velocity (red = slow, green = fast)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 +msgid "Dilution of Position (red = high, green = low, if available)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 +msgid "Single Color (can be customized for named layers)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:1346 msgid "Car" msgstr "Bil" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:309 trans_presets.java:635 trans_presets.java:833 #: trans_presets.java:842 trans_presets.java:851 trans_presets.java:864 @@ -2543,5 +2543,5 @@ msgstr "Cykel" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:310 trans_presets.java:637 trans_presets.java:832 #: trans_presets.java:841 trans_presets.java:850 trans_presets.java:863 @@ -2552,15 +2552,15 @@ msgstr "Fotgängare" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 msgid "Draw Direction Arrows" msgstr "Rita riktningspilar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 msgid "Fast drawing (looks uglier)" msgstr "Snabb ritning (ser sämre ut)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180 msgid "Only interesting direction hints (e.g. with oneway tag)." msgstr "" @@ -2568,30 +2568,30 @@ "oneway - enkelriktat)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:186 msgid "Only on the head of a way." msgstr "Enbart på en sträckas huvud." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44 msgid "Draw segment order numbers" msgstr "Rita ut segmentens ordningsnummer" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45 msgid "Draw boundaries of downloaded data" msgstr "Rita gränser för hämtade data" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46 msgid "Draw virtual nodes in select mode" msgstr "Rita virtuella noder i urvalsläge" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47 msgid "Draw inactive layers in other color" msgstr "Rita inaktiva lager i avvikande färg" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 msgid "Smooth map graphics (antialiasing)" msgstr "Mjuk kartgrafik (antialiasing)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 msgid "" "If your gps device draws too few lines, select this to draw lines along your " @@ -2601,5 +2601,5 @@ "din sträcka." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:71 msgid "" "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines." @@ -2608,9 +2608,9 @@ "längd." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73 msgid "Maximum length (meters)" msgstr "Maxlängd (meter)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:77 msgid "" "Force drawing of lines if the imported data contain no line information." @@ -2619,15 +2619,16 @@ "linjeinformation." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:84 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89 msgid "Draw direction arrows for lines, connecting GPS points." msgstr "Rita riktningspilar för linjer, som förbinder GPS-punkter" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90 -msgid "Draw the direction arrows using table lookups instead of complex math." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95 +msgid "" +"Draw the direction arrows using table lookups instead of complex math." msgstr "" "Rita riktningspilar med hjälp av tabelluppslagning istället för komplicerad " "matematik." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:96 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:101 msgid "" "Don't draw arrows if they are not at least this distance away from the last " @@ -2637,50 +2638,68 @@ "senast ritade pil." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104 msgid "Minimum distance (pixels)" msgstr "Minimiavstånd (pixlar)" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:109 -msgid "Choose the hue for the track color by the velocity at that point." -msgstr "Välj färgnyans för spåret baserat på hastigheten vid den punkten." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116 -msgid "Allows to tune the track coloring for different average speeds." -msgstr "Tillåter att spårets färg justeras efter olika genomsnittshastigheter." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122 msgid "Draw larger dots for the GPS points." msgstr "Rita större punkter för GPS-punkter." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136 +msgid "" +"All points and track segments will have the same color. Can be customized in " +"Layer Manager." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137 +msgid "Colors points and track segments by velocity." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:138 +msgid "" +"Colors points and track segments by dilution of position (HDOP). Your " +"capture device needs to logs that information." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143 +msgid "Allows to tune the track coloring for different average speeds." +msgstr "" +"Tillåter att spårets färg justeras efter olika genomsnittshastigheter." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148 +msgid "Track and Point Coloring" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 msgid "GPS Points" msgstr "GPS-punkter" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175 msgid "Draw direction hints for way segments." msgstr "Rita riktningsanvisningar för delsträckor." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:163 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192 msgid "Draw the order numbers of all segments within their way." msgstr "Rita ordningsnummer för alla delsträckor inom deras sträcka." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:168 -msgid "Apply antialiasing to the map view resulting in a smoother appearance." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:197 +msgid "" +"Apply antialiasing to the map view resulting in a smoother appearance." msgstr "Använd antialiasing för att ge kartan ett jämnare utseende." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202 msgid "Draw the boundaries of data loaded from the server." msgstr "Rita gränser för data hämtade från servern." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:178 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:207 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" "Rita virtuella noder i urvalsläge för underlätta förändring av sträckor." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212 msgid "Draw the inactive data layers in a different color." msgstr "Rita de inaktiva datalagren i avvikande färg." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219 msgid "OSM Data" msgstr "OSM-data" @@ -2791,6 +2810,6 @@ "a menu entry of button for the first time. So some of your changes may " "become active even without restart --- but also without collistion handling. " -"This is another reason to restart JOSM after making any changes here." -"

            " +"This is another reason to restart JOSM after making any changes " +"here.

            " msgstr "" "

            Dessutom så aktiveras kortkommandon när händelser knyts till en menyknapp " @@ -2808,8 +2827,9 @@ "key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also " "there will be 'keys' listed that correspond to a shortcut on your keyboard " -"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/" -"Semicolon on US keyboards, '.'/Period on German keyboards, ...) instead. Not " -"doing so may result in conflicts, as there is no way for JOSM to know that " -"Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...

            " +"(e.g. ':'/Colon). Please also do not use them, use the base key " +"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) " +"instead. Not doing so may result in conflicts, as there is no way for JOSM " +"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US " +"keyboard...

            " msgstr "" "

            Du kommer att märka att urvalslistan för tangenter på nästa sida " @@ -2824,6 +2844,6 @@ "tangentbord, '.'/punkt på tyska eller svenska tangentbor,...) istället. Om " "du inte gör så kan krockar uppstå, eftersom det inte finns något sätt för " -"JOSM att veta att på ett amerikanskt tangentbord så är i själva verket Ctrl" -"+Shift+; och Ctrl+: samma sak...

            " +"JOSM att veta att på ett amerikanskt tangentbord så är i själva verket " +"Ctrl+Shift+; och Ctrl+: samma sak...

            " #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:177 @@ -2852,6 +2872,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183 msgid "" -"

            The pseudo-modifier 'disabled' will disable the shortcut when encountered." -"

            " +"

            The pseudo-modifier 'disabled' will disable the shortcut when " +"encountered.

            " msgstr "" "

            Pseudomodifieraren 'disabled' avaktiverar kortkommandot när detta " @@ -2923,10 +2943,10 @@ msgstr "Modifierargrupper" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:231 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:236 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:250 msgid "layer not in list." msgstr "lagret finns inte i listan." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -2934,57 +2954,57 @@ "Kunde inte hitta någon översättning för locale {0}. Faller tillbaka på {1}." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "usage" msgstr "användning" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 msgid "options" msgstr "alternativ" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 msgid "Show this help" msgstr "Visa denna hjälptext" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Standard unix geometry argument" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 msgid "Download the bounding box" msgstr "Hämta hem området inom gränsvärdena" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 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:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Open file (as raw gps, if .gpx)" msgstr "Öppna fil (som rå gps, om .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 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:144 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Select with the given search" msgstr "Gör urval med angivet sökkriterium" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 msgid "Don't launch in fullscreen mode" msgstr "Starta inte i helskärmsläge" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 msgid "Reset the preferences to default" msgstr "Återställ inställningarna till förval" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 msgid "Set the language." msgstr "Ange språk" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 msgid "examples" msgstr "exempel" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -2994,21 +3014,21 @@ "data innan --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 msgid "Instead of --download= you may specify osm://\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 msgid "Activating updated plugins" msgstr "Aktiverar uppdaterade insticksmoduler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 msgid "Loading early plugins" msgstr "Hämtar tidiga insticksmoduler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Setting defaults" msgstr "Anger förval" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171 msgid "Loading plugins" msgstr "Hämtar insticksmoduler" @@ -3042,6 +3062,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:108 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:164 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:162 #: trans_presets.java:308 trans_presets.java:309 trans_presets.java:310 #: trans_presets.java:311 trans_presets.java:312 trans_presets.java:313 @@ -3058,5 +3078,5 @@ msgstr "okänd" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:66 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 #, java-format msgid "" @@ -3067,10 +3087,10 @@ "längre." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 #, java-format msgid "Plugin requires JOSM update: {0}." msgstr "Insticksmodulen kräver en uppdatering av JOSM: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." @@ -3078,15 +3098,16 @@ "Plugin {0}, som behövs för att plugin {1} ska fungera, men det hittades inte." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 #, java-format msgid "Plugin not found: {0}." msgstr "Insticksmodulen kunde ej hittas: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Last plugin update more than {0} days ago." -msgstr "Senaste uppdatering av insticksmoduler var för mer än {0} dagar sedan." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127 +msgstr "" +"Senaste uppdatering av insticksmoduler var för mer än {0} dagar sedan." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 msgid "" "(You can change the number of days after which this warning appears
            by " @@ -3096,12 +3117,12 @@ "med hjälp av inställningen 'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 msgid "Disable plugin" msgstr "Avaktivera insticksmodul" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" @@ -3110,5 +3131,5 @@ "inställningarna?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -3118,5 +3139,5 @@ "JOSM har behörighet att skriva över de existerande." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 #, java-format msgid "" @@ -3125,10 +3146,10 @@ "Ett oväntat undantag inträffade som kan ha kommit från plugin:en ''{0}''." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Enligt information inifrån insticksmodulen är dess upphovsman {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:262 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -3137,9 +3158,9 @@ "innan du rapporterar en bugg." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 msgid "Should the plugin be disabled?" msgstr "Skall insticksmodulen avaktiveras?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:278 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -3149,5 +3170,5 @@ "frigöra insticksmodulen." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -3157,6 +3178,6 @@ "JOSM från." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:322 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:181 msgid "no description available" msgstr "ingen beskrivning tillgänglig" @@ -3168,5 +3189,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 msgid "Update Plugins" msgstr "Uppdatera insticksmoduler" @@ -3203,5 +3224,5 @@ "Insticksmodulen {0} verkar korrupt eller kunde inte hämtas automatiskt." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 #, java-format msgid "Downloaded plugin information from {0} site" @@ -3210,13 +3231,13 @@ msgstr[1] "Hämtade information om insticksmoduler från {0} ställen" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 msgid "No plugin information found." msgstr "Kunde inte hitta någon information om insticksmoduler." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:76 msgid "All installed plugins are up to date." msgstr "Alla installerade insticksmoduler är av senaste version." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 #, java-format msgid "" @@ -3229,9 +3250,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:105 msgid "Download missing plugins" msgstr "Hämta saknade insticksmoduler" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:106 #, java-format msgid "" @@ -3244,22 +3265,22 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 msgid "Download Plugins" msgstr "Hämta insticksprogram" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:170 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:168 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Version {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:176 msgid "Plugin bundled with JOSM" msgstr "Insticksmodul som medföljer JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208 msgid "Plugin already exists" msgstr "Insticksmodulen finns redan" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:211 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:209 #, java-format msgid "" @@ -3274,15 +3295,15 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 msgid "Delete and Download" msgstr "Ta bort och hämta hem" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:222 #, java-format msgid "Error deleting plugin file: {0}" msgstr "Fel vid borttagande av fil för insticksmodulen: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:281 #, java-format msgid "Error reading plugin information file: {0}" @@ -3349,10 +3370,10 @@ msgstr "Ta bort {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:165 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 msgid "Conflicting relation" msgstr "Relationskonflikt" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 #, java-format msgid "" @@ -3363,5 +3384,5 @@ "Ta bort från relationen?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:166 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 #, java-format msgid "" @@ -3378,7 +3399,7 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:349 msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
            This can cause problems because other objects (that you don't see) might " -"use them.
            Do you really want to delete?" +"You are about to delete nodes outside of the area you have " +"downloaded.
            This can cause problems because other objects (that you don't " +"see) might use them.
            Do you really want to delete?" msgstr "" "Du håller på att ta bort noder utanför det område som du har hämtat hem.
            " @@ -3509,124 +3530,135 @@ msgstr "Kunde inte hämta inställningar från server." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:232 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 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:426 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:428 #, 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:527 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:765 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:776 msgid "Empty member in relation." msgstr "Tom medlem i relationen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:767 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:531 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 #, 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:547 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 #, 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:552 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:549 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:558 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555 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:564 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:561 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 +msgid "More than one \"via\" found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 #, java-format msgid "Unknown role ''{0}''." msgstr "Okänd roll ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 #, 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:584 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 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:588 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 msgid "No \"to\" way found." msgstr "Det finns inte någon \"till\"-sträcka." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -msgid "No \"via\" node found." -msgstr "Det finns inte någon \"via\"-nod." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +msgid "No \"via\" node or way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 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:619 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:636 -#, java-format -msgid "The \"{0}\" way must contain at least 2 nodes." -msgstr "Det måste finnas åtminstone \"{0}\"-sträckor." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:731 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +msgid "The \"to\" way doesn't start or end at a \"via\" node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:620 +msgid "The \"from\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:624 +msgid "The \"to\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:742 #, 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:787 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 #, 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:798 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 #, 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:847 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:858 #, 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:927 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 #, 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:938 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:949 #, 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:987 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:998 #, 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:1012 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1023 #, 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:1195 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1206 msgid "untagged" msgstr "otaggade" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1196 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207 msgid "text" msgstr "text" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" msgstr "inaktiv" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:94 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:181 @@ -3634,13 +3666,13 @@ msgstr "markerad" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" msgstr "otaggade sträcka" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 msgid "incomplete way" msgstr "ofullständig sträcka" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 msgid "highlight" msgstr "" @@ -3662,5 +3694,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:113 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:89 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:77 msgid "incomplete" @@ -3690,14 +3722,14 @@ msgstr[1] "{0} medlemmar" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 msgid "Duplicate" msgstr "Duplicera" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 msgid "Duplicate selection by copy and immediate paste." msgstr "Duplicera det valda genom att kopiera och omedelbart klistra in." -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 @@ -3706,5 +3738,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -3775,7 +3807,9 @@ msgstr "Visa historikinformation om sträckor eller noder i OSM" -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:57 -msgid "Please select at least one node, way or relation." -msgstr "Välj åtminstone en nod, sträcka eller relation." +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:60 +msgid "" +"Please select at least one node, way or relation. Only already uploaded " +"elements have a history." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 @@ -3797,7 +3831,7 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/TerracerAction.java:47 @@ -3934,5 +3968,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:123 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:314 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:315 msgid "Enter values for all conflicts." msgstr "Ange värden för alla konflikter" @@ -3940,5 +3974,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 msgid "Solve Conflicts" msgstr "Jämka konflikter" @@ -4074,5 +4108,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #, java-format @@ -4099,16 +4133,19 @@ msgstr[1] "De valda noderna ligger inte inuti någon sträcka." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125 -msgid "" -"There is more than one way using the node(s) you selected. Please select the " +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 +msgid "" +"There is more than one way using the node you selected. Please select the " "way also." -msgstr "" -"Den nod/de noder du valt ingår i mer än en sträcka. Välj sträckan också." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133 +msgid_plural "" +"There is more than one way using the nodes you selected. Please select the " +"way also." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137 msgid "The selected nodes do not share the same way." msgstr "De valda noderna ingår inte i samma sträcka." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -4116,10 +4153,10 @@ msgstr[1] "Den valda sträckan innehåller inte alla de valda noderna." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229 msgid "You must select two or more nodes to split a circular way." msgstr "Du måste välja två eller fler noder för att dela en sluten sträcka." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -4129,5 +4166,5 @@ "sträckan.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 msgid "" "A role based relation membership was copied to all new ways.\n" @@ -4137,5 +4174,5 @@ "Du bör kontrollera detta och rätta till eventuella fel." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:296 #, java-format msgid "Split way {0} into {1} parts" @@ -4534,5 +4571,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 msgid "Align Nodes in Circle" msgstr "Bilda en cirkel av noderna" @@ -4546,5 +4583,5 @@ msgstr "Några av noderna befinner sig (nästan) på linje" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 msgid "Please select at least four nodes." msgstr "Välj åtminstone fyra noder." @@ -4614,4 +4651,32 @@ msgstr "Det uppstod ett fel när backup-filen skulle återställas." +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "" +"Show status report with useful information that can be attached to bugs" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92 +msgid "Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +msgid "Copy to clipboard and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 +msgid "Close" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 @@ -4623,13 +4688,13 @@ msgstr "Gör om den senaste ogjorda handlingen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:44 msgid "Delete Mode" msgstr "Borttagningsläge" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:46 msgid "Delete nodes or ways." msgstr "Ta bort noder eller sträckor" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:84 @@ -4640,5 +4705,5 @@ msgstr "Läge: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:130 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -4650,6 +4715,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:87 msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." +"Drag play head and release near track to play audio from there; " +"SHIFT+release to synchronize audio at that point." msgstr "" "Dra spelhuvudet och släpp i närheten av spår för att spela upp ljud " @@ -4665,23 +4730,23 @@ msgstr "Skapa ytor" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 msgid "Extrude Way" msgstr "Dra ut sträcka" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:252 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:416 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:430 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/ExtrudeAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 msgid "Draw a rectangle of the desired size, then release the mouse button." msgstr "Rita en rektangel av önskad storlek, och släpp sedan musknappen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:420 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:434 msgid "Release the mouse button to stop rotating." msgstr "Släpp musknappen för att sluta rotera." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 msgid "Drag a way segment to make a rectangle." msgstr "Dra en delsträcka för bilda en rektangel." @@ -4749,14 +4814,14 @@ msgstr "Välj, flytta och rotera objekt." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:191 msgid "Add and move a virtual new node to way" msgstr "Lägg till och flytta en virtuell ny nod till sträckan" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:220 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:223 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 msgid "Cannot move objects outside of the world." msgstr "Kan inte flytta objekt utanför världen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:418 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:432 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -4765,5 +4830,5 @@ "nod." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:422 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:436 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to remove); Shift-" @@ -4839,30 +4904,30 @@ msgstr "Slå ihop {0} noder" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Orthogonalize Shape" msgstr "Räta upp form" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 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:60 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 msgid "Only two nodes allowed" msgstr "Enbart två noder kan vara valda" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 msgid "Selection must consist only of ways." msgstr "Urvalet måste bestå uteslutande av sträckor." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 msgid "Please select one or more closed ways of at least four nodes." msgstr "Välj en eller flera slutna sträckor med åtminstone fyra noder." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 msgid "Please select ways with almost right angles to orthogonalize." msgstr "Välj sträckor som nästan har räta vinklar att räta upp." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 msgid "" "You are using the EPSG:4326 projection which might lead
            to " @@ -4875,9 +4940,9 @@ "du fortsätta?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "Only one node selected" msgstr "Enbart en nod vald" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 msgid "Orthogonalize" msgstr "Räta upp" @@ -4928,5 +4993,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101 -msgid "Please select exactly three nodes or one way with exactly three nodes." +msgid "" +"Please select exactly three nodes or one way with exactly three nodes." msgstr "" "Välj antingen exakt tre noder eller en sträcka som innehåller exakt tre " @@ -4937,52 +5003,69 @@ msgstr "De noderna är inte i en cirkel." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../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:71 +msgid "Update Data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:72 +#, java-format +msgid "" +"This action will require {0} individual download requests. Do you wish to " +"continue?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 msgid "Open Location..." msgstr "Öppna plats..." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 msgid "Open an URL." msgstr "Öppna en URL." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 msgid "Separate Layer" msgstr "Skilda lager" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 msgid "Enter URL to download:" msgstr "Ange URL att hämta:" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 msgid "Download Location" msgstr "Hämta plats" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 msgid "Download URL" msgstr "Hämta URL" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 msgid "Add Node..." msgstr "Lägg till nod..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 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:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 msgid "Enter the coordinates for the new node." msgstr "Ange den nya nodens koordinater." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 msgid "Use decimal degrees." msgstr "Använd decimalgrader." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 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:62 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 #: ../plugins/livegps/livegps/LiveGpsDialog.java:54 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93 @@ -4991,5 +5074,5 @@ msgstr "Latitud" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 #: ../plugins/livegps/livegps/LiveGpsDialog.java:56 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96 @@ -5032,14 +5115,14 @@ msgstr "Flytta objekt {0}" +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "Overwrite" msgstr "Skriv över" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "File exists. Overwrite?" msgstr "Filen existerar redan. Vill du skriva över?" @@ -5058,43 +5141,48 @@ msgstr "Välj någonting att kopiera." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Frigör sträckor" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "Duplicera noder som används av flera olika sträckor." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 msgid "This node is not glued to anything else." msgstr "Denna nod är inte bunden till något annat." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 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:90 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 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:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 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:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "Select either:" msgstr "Välj antingen:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +msgid "* One tagged node, or" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 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:103 -msgid "* One node that is used by more than one way and one of those ways, or" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +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:104 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -5103,5 +5191,5 @@ "eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -5110,5 +5198,5 @@ "sträcka." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -5123,10 +5211,14 @@ "få sina egna kopior och alla noder kommer att vara valda." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:160 +msgid "Unglued Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:373 #, java-format msgid "Dupe into {0} nodes" msgstr "Duplicera till {0} noder" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:320 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:397 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -5229,5 +5321,5 @@ msgstr "Ångra senaste åtgärden." -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 msgid "No Shortcut" msgstr "Inget kortkommando" @@ -5249,13 +5341,13 @@ msgstr "OpenStreetMap-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:29 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:28 msgid "Downloading GPS data" msgstr "Hämtar GPS-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:41 msgid "Downloaded GPX Data" msgstr "Hämtade GPX-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:71 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:69 msgid "Raw GPS data" msgstr "Rå GPS-data" @@ -5481,5 +5573,6 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169 -msgid "Header contains several values and cannot be mapped to a single string" +msgid "" +"Header contains several values and cannot be mapped to a single string" msgstr "" @@ -5494,5 +5587,6 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:53 msgid "Really mark this issue as ''done''?" -msgstr "Vill du verkligen sätta status för detta problemfall som \"slutförd\"?" +msgstr "" +"Vill du verkligen sätta status för detta problemfall som \"slutförd\"?" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:54 @@ -5609,5 +5703,6 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 msgid "A plugin that allows JOSM to be controlled from other applications." -msgstr "En insticksmodul som låter JOSM kontrolleras från andra applikationer." +msgstr "" +"En insticksmodul som låter JOSM kontrolleras från andra applikationer." #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 @@ -5834,5 +5929,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69 -msgid "Maximum number of segments allowed in each generated way. Default 250." +msgid "" +"Maximum number of segments allowed in each generated way. Default 250." msgstr "" "Största antal delsträckor som tillåts i varje skapad sträcka. Förval 250." @@ -5856,6 +5952,7 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72 msgid "" -"Accuracy of Douglas-Peucker line simplification, measured in degrees." -"
            Lower values give more nodes, and more accurate lines. Default 0.0003." +"Accuracy of Douglas-Peucker line simplification, measured in " +"degrees.
            Lower values give more nodes, and more accurate lines. Default " +"0.0003." msgstr "" "Noggrannhet för Douglas-Peuckers linjeförenkling, mätt i grader.
            Lägre " @@ -6499,5 +6596,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439 msgid "Validate property values and tags using complex rules." -msgstr "Validera egenskapsvärden och taggar med hjälp av komplicerade regler." +msgstr "" +"Validera egenskapsvärden och taggar med hjälp av komplicerade regler." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:458 @@ -6509,6 +6607,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:509 msgid "" -"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." -"org/index.php/User:JLS/speller) or tag checking data files." +"The sources (URL or filename) of spell check (see " +"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking " +"data files." msgstr "" "De källor (URL eller filnamn) som används för att stavningskontrollera (läs " @@ -6928,6 +7027,6 @@ msgstr "" "Kan inte hämta biblioteket rxtxSerial. Om du behöver assistans med att " -"installera detta, så läs globalsats hemsida på http://www.raphael-mack.de/" -"josm-globalsat-gpx-import-plugin/" +"installera detta, så läs globalsats hemsida på http://www.raphael-" +"mack.de/josm-globalsat-gpx-import-plugin/" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 @@ -6974,6 +7073,6 @@ msgstr "Lägg till ett nytt lager" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:40 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:43 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 #, java-format @@ -6981,18 +7080,29 @@ msgstr "Hämtar {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:51 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:55 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 msgid "Contacting WMS Server..." msgstr "Kontaktar WMS-servern..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157 msgid "Create buildings" msgstr "Skapa byggnader" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 msgid "CadastreGrabber: Illegal url." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +msgid "" +"To avoid cadastre WMS overload,\n" +"building import size is limited to 1 km2 max." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" @@ -7015,17 +7125,26 @@ msgstr "Cadastre: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:128 +msgid "Cadastre" +msgstr "Cadastre" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:139 +msgid "Auto sourcing" +msgstr "Automatkälla" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164 +msgid "Invalid projection" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 +#, java-format +msgid "Change the projection to {0} first." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:169 msgid "" "To enable the cadastre WMS plugin, change\n" "the JOSM projection to Lambert and restart" msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132 -msgid "Cadastre" -msgstr "Cadastre" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 -msgid "Auto sourcing" -msgstr "Automatkälla" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20 @@ -7097,9 +7216,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:43 msgid "" -"More than one WMS layer present.\n" -"Select one of them first, then retry." -msgstr "" -"Det finns mer än ett WMS-lager.\n" -"Välj ett av dem först och försök sedan igen." +"More than one WMS layer present\n" +"Select one of them first, then retry" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:19 @@ -7107,5 +7224,5 @@ msgstr "Hämta plats från cachen (enbart om cache är aktiverad)" -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136 #, java-format @@ -7115,13 +7232,13 @@ msgstr[1] "Förenkla sträcka (ta bort {0} noder)" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61 msgid "Extract SVG ViewBox..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65 msgid "Extract best fitting boundary..." msgstr "Extrahera den gräns som passar bäst..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:120 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126 msgid "Create boundary" msgstr "Skapa gräns" @@ -7157,15 +7274,15 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 msgid "Save WMS layer to file" msgstr "Spara WMS-lagret till en fil" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "Load WMS layer from file" msgstr "Hämta WMS-lager från en fil" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -7173,5 +7290,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 msgid "File Format Error" msgstr "Fel filformat" @@ -7179,5 +7296,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 msgid "Error loading file" msgstr "Fel vid läsning av fil" @@ -7203,43 +7320,44 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 msgid "Replace original background by JOSM background color." msgstr "Ersätt originalets bakgrund med JOSM:s bakgrundsfärg." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30 msgid "Reverse grey colors (for black backgrounds)." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 msgid "Set background transparent." msgstr "Gör bakgrunden genomskinlig." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34 msgid "Draw boundaries of downloaded data." msgstr "Rita gränser för hämtade data." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Enable automatic caching." msgstr "Aktivera automatisk cachning." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 msgid "Max. cache size (in MB)" msgstr "Största tillåtna cachestorlek (MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:53 -msgid "" -"A special handler of the french cadastre wms at www.cadastre.gouv." -"fr

            Please read the Terms and Conditions of Use here (in french): " -"
            http://www.cadastre.gouv.fr/scpc/html/" -"CU_01_ConditionsGenerales_fr.html
            before any upload of data created " -"by this plugin." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:58 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:55 +msgid "" +"A special handler of the french cadastre wms at " +"www.cadastre.gouv.fr

            Please read the Terms and Conditions of Use here " +"(in french):
            " +"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " +"
            before any upload of data created by this plugin." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 msgid "French cadastre WMS" msgstr "Fransk Cadastre-WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -7247,10 +7365,10 @@ "källa är aktiverat." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65 msgid "Source" msgstr "Källa" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -7260,26 +7378,40 @@ "JOSM:s inställningar." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 -msgid "" -"Invert the original texts from black to white (and all intermediate greys)." +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +msgid "" +"Invert the original black and white colors (and all intermediate greys). " +"Useful for texts on dark backgrounds." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 +msgid "Allows multiple layers stacking" msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 -msgid "Allows multiple layers stacking" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:99 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:113 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 msgid "Image grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:162 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:125 +msgid "Grab smaller images (higher quality but use more memory)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +msgid "Fixed size square (default is 100m)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +msgid "Fixed size (from 25 to 1000 meters)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -7308,5 +7440,6 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40 msgid "Opens a dialog that allows to jump to a specific location" -msgstr "Öppnar en dialogruta som gör att man kan gå direkt till en viss plats" +msgstr "" +"Öppnar en dialogruta som gör att man kan gå direkt till en viss plats" #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:65 @@ -7395,5 +7528,5 @@ msgstr "Inga tvärsnitt hittades. Ingenting har ändrats." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:254 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:255 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -7543,7 +7676,7 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:203 msgid "" -"Take a photo of your GPS receiver while it displays the time." -"
            Display that photo here.
            And then, simply capture the time you read " -"on the photo and select a timezone

            " +"Take a photo of your GPS receiver while it displays the " +"time.
            Display that photo here.
            And then, simply capture the time you " +"read on the photo and select a timezone
            " msgstr "" "Ta ett foto av din GPS-mottagare när den visar tiden.
            Visa detta " @@ -7613,8 +7746,9 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:484 -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 "" +"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?" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:501 @@ -7659,5 +7793,5 @@ msgstr "Ogiltig tidszon" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #, java-format msgid "" @@ -7668,14 +7802,14 @@ "Förväntat format: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:579 msgid "Invalid offset" msgstr "Ogiltig förskjutning" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:641 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:643 #, java-format msgid "Found {0} matchs of {1} in GPX track {2}" msgstr "Hittade {0} träffar av {1} i GPX-spår {2}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:642 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:644 msgid "GPX Track loaded" msgstr "GPX-spår har hämtats" @@ -7683,5 +7817,5 @@ #: ../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/UploadDataGui.java:79 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 msgid "Upload Traces" msgstr "Skicka in spår" @@ -7691,58 +7825,72 @@ msgstr "Skickar in spår till openstreetmap.org" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 -msgid "Upload GPX track" -msgstr "Skicka in GPX-spår" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71 +msgid "Upload Trace" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Public" msgstr "Publik" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 msgid "Selected makes your trace public in openstreetmap.org" msgstr "Om vald så är dina spår öppna för allmänheten på openstreetmap.org" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Description" msgstr "Beskrivning" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:123 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 msgid "Tags" msgstr "Taggar" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:182 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:153 +#, java-format +msgid "Selected track: {0}" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:176 msgid "Connecting..." msgstr "Ansluter..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 -msgid "Uploading GPX track..." -msgstr "Skicka in detta spår..." - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:214 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:199 +msgid "Upload cancelled" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:209 +msgid "Error while uploading" +msgstr "Fel vid inskickning" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "GPX-inskickning genomförd" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:227 -msgid "Error while uploading" -msgstr "Fel vid inskickning" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:235 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +msgid "Upload failed. Server returned the following message: " +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 +#, java-format +msgid "Uploading GPX track: {0}% ({1} of {2})" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "Ingen beskrivning angiven. Skriv in en beskrivning." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:252 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "Inget GPX-lager valt. Kan inte skicka in ett spår." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:241 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "Inget användarnamn angivet." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:244 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "Inget lösenord angviet." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "Skickar in GPX-spår" @@ -7967,32 +8115,32 @@ msgstr "Automatisk hämtning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS-lager ({0}), hämtas automatiskt i zoomläge {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS-lager ({0}), hämtas i zoomläge {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "Den begärda ytan är för stor. Zooma in lite eller ändra upplösning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:232 msgid "Download visible tiles" msgstr "Hämta de rutor som syns" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241 msgid "Change resolution" msgstr "Ändra upplösning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:253 msgid "Reload erroneous tiles" msgstr "Läs om felaktiga rutor" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:264 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:271 msgid "Alpha channel" msgstr "Alfakanal" @@ -12884,4 +13032,7 @@ msgstr "till sträcka" +#~ msgid "Please select something from the conflict list." +#~ msgstr "Välj någonting från konfliktlistan." + #~ msgid "OSM History Information" #~ msgstr "OSM-historik" @@ -12891,13 +13042,13 @@ #~ msgid "" -#~ "This is the basic relation editor which allows you to change the " -#~ "relation's tags as well as the members. In addition to this we should " -#~ "have a smart editor that detects the type of relationship and limits your " -#~ "choices in a sensible way." +#~ "This is the basic relation editor which allows you to change the relation's " +#~ "tags as well as the members. In addition to this we should have a smart " +#~ "editor that detects the type of relationship and limits your choices in a " +#~ "sensible way." #~ msgstr "" -#~ "Detta är den grundläggande relationsredigeraren som låter dig ändra " -#~ "taggar för en relation och dess medlemmar. Därutöver skulle det behövas " -#~ "en smart redigerare som läser av typ av relation och gör förnuftiga " -#~ "begränsningar av dina valmöjligheter." +#~ "Detta är den grundläggande relationsredigeraren som låter dig ändra taggar " +#~ "för en relation och dess medlemmar. Därutöver skulle det behövas en smart " +#~ "redigerare som läser av typ av relation och gör förnuftiga begränsningar av " +#~ "dina valmöjligheter." #~ msgid "Highlight the member from the current table row as JOSM's selection" @@ -12905,4 +13056,39 @@ #~ "Markera medlemmen från den nuvarande tabellraden som JOSM:s valda objekt" +#~ msgid "Upload this trace..." +#~ msgstr "Skicka in detta spår..." + +#~ msgid "" +#~ "This functionality has been added only recently. Please
            use with " +#~ "care and check if it works as expected." +#~ msgstr "" +#~ "Denna funktion har nyligen lagts till. Använd med försiktighet
            och " +#~ "kontrollera om det fungerar som tänkt." + +#~ msgid "Upload track filtered by JOSM" +#~ msgstr "Skicka in spår filtrerat av JOSM" + +#~ msgid "Upload raw file: " +#~ msgstr "Skicka in rå fil: " + +#~ msgid "Description:" +#~ msgstr "Beskrivning:" + +#~ msgid "Tags (keywords in GPX):" +#~ msgstr "Taggar (nyckelord i GPX):" + +#~ msgid "GPX-Upload" +#~ msgstr "Skicka in GPX" + +#, java-format +#~ msgid "Upload raw file: {0}" +#~ msgstr "Skicka in rå fil: {0}" + +#~ msgid "Tags:" +#~ msgstr "Taggar:" + +#~ msgid "Choose the hue for the track color by the velocity at that point." +#~ msgstr "Välj färgnyans för spåret baserat på hastigheten vid den punkten." + #~ msgid "Unknown type" #~ msgstr "Okänd typ" @@ -12911,4 +13097,5 @@ #~ msgstr "NullPointerException, Det saknas förmodligen några taggar." +#, java-format #~ msgid "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..." #~ msgstr "Skicka in {0} {1} (id: {2}) {3}% {4}/{5} ({6} kvar)..." @@ -12935,4 +13122,5 @@ #~ msgstr "Naturfenomen" +#, java-format #~ msgid "Version: {0}
            Last change at {1}" #~ msgstr "Version: {0}
            Senast ändrad {1}" @@ -12950,4 +13138,5 @@ #~ msgstr "SurveyorPlugin" +#, java-format #~ msgid "Version {0} - Last change at {1}" #~ msgstr "Version {0} - Senaste ändring {1}" @@ -12959,7 +13148,9 @@ #~ msgstr "Öppna en sträckpunktsfil." +#, java-format #~ msgid "Data error: lat value \"{0}\" is out of bounds." #~ msgstr "Datafel: latitudvärdet \"{0}\" ligger utanför gränsvärdena." +#, java-format #~ msgid "Data error: lon value \"{0}\" is out of bounds." #~ msgstr "Datafel: longitudvärdet \"{0}\" ligger utanför gränsvärdena." @@ -12985,2 +13176,9 @@ #~ msgid "bus" #~ msgstr "buss" + +#, java-format +#~ msgid "The \"{0}\" way must contain at least 2 nodes." +#~ msgstr "Det måste finnas åtminstone \"{0}\"-sträckor." + +#~ msgid "Upload GPX track" +#~ msgstr "Skicka in GPX-spår" Index: /applications/editors/josm/i18n/po/tr.po =================================================================== --- /applications/editors/josm/i18n/po/tr.po (revision 13832) +++ /applications/editors/josm/i18n/po/tr.po (revision 13833) @@ -10,6 +10,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-15 22:03+0100\n" -"PO-Revision-Date: 2009-02-14 14:09+0000\n" +"POT-Creation-Date: 2009-02-21 16:35+0100\n" +"PO-Revision-Date: 2009-02-21 16:13+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Türkçe\n" @@ -18,8 +18,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-02-15 20:41+0000\n" +"X-Launchpad-Export-Date: 2009-02-22 20:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 #, java-format msgid "" @@ -32,5 +32,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 msgid "" "This action will have no shortcut.\n" @@ -40,5 +40,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -49,5 +49,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(İpucu: Kısayolları Tercihler Penceresinden Değiştirebilirisiniz.)" @@ -58,17 +58,17 @@ #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 msgid "Information" msgstr "Bilgi" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Do nothing" msgstr "Birşey Yapma" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Report Bug" msgstr "hatayı Bildir" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 msgid "" "An unexpected exception occurred.\n" @@ -82,18 +82,18 @@ "hatayı bildiriniz" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Unexpected Exception" msgstr "Beklenmedik Durum" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 #, java-format msgid "Please report a ticket at {0}" msgstr "Lütfen {0} 'daki problemi bildiriniz" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "Hatayı oluşturan adımları belirtiniz (Mümkün olduğunca detaylı)!" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:78 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -103,9 +103,9 @@ "deneyiniz." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Be sure to include the following information:" msgstr "Aşağıdaki bilgiyi eklediğinizden emin olunuz:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75 msgid "(The text has already been copied to your clipboard.)" msgstr "(Metin zaten panoda mevcut.)" @@ -119,5 +119,5 @@ msgstr "Sesin çalıştırılmasında hata" -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:40 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:94 @@ -125,5 +125,5 @@ msgstr "OSM Server'ına Bağlanıyor..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:48 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:32 @@ -131,10 +131,10 @@ msgstr "OSM bilgisi indiriliyor..." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 msgid "NullPointerException, possibly some missing tags." msgstr "Boş göstergeç(Pointer) hatası, bazı etiketler eksik olmalı." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83 msgid "Preparing data..." msgstr "Bilgiler hazırlanıyor..." @@ -163,48 +163,48 @@ msgstr "{0} ve {1} arası bilgiler indiriliyor" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:164 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:168 msgid "Unknown version" msgstr "Bilinmeyen versiyon" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 msgid "Found element in non-way." msgstr "-bileşene erişelemdi." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 msgid " has zero ref" msgstr " in içi boş" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 msgid "Found element in non-relation." msgstr ". eleman ile bağlantı bulunamadı." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:252 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250 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:294 msgid "Illegal object with id=0" msgstr "Geçersiz obje bulundu id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Gerekli özellik eksik \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 #, java-format msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:502 msgid "Prepare OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:518 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:516 msgid "Ill-formed node id" msgstr "Yanlış tanımlı kavşak bilgisi" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:280 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:287 msgid "Parse error: invalid document structure for gpx document" msgstr "Ayrıştırma hatası: gpx dökümanı için geçersiz yapı." @@ -214,18 +214,18 @@ msgstr "Server'e bağlanıyor..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 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/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 msgid "Commit comment" msgstr "Açıklamayı Kabul Ediniz" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:164 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64 @@ -235,34 +235,32 @@ msgstr "Hata Oluştu: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:192 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190 msgid "Opening changeset..." msgstr "Açılıyor..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:226 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224 msgid "Server does not support changesets" msgstr "Bu bu bilgiyi desteklemiyor." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:246 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:428 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:609 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:184 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607 msgid "Unknown host" msgstr "Tanımsız host" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282 msgid "Preparing..." msgstr "Hazırlanıyor..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:294 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292 msgid "Uploading..." msgstr "Yükleniyor..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375 msgid "Closing changeset..." msgstr "Kapanıyor..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:652 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650 msgid "Transfer aborted due to error (will wait for 5 seconds):" msgstr "Aktarım hata nedeniyle kesildi (5 sn bekle):" @@ -300,17 +298,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95 #: ../core/src/org/openstreetmap/josm/Main.java:348 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:29 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 @@ -323,11 +324,11 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:110 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -342,11 +343,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:186 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 msgid "Creating main GUI" msgstr "Arayüz Oluşturuluyor." #: ../core/src/org/openstreetmap/josm/Main.java:195 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:271 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:278 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:56 msgid "Help" @@ -388,21 +389,21 @@ msgstr "Yanlış dosyalr atlanıldı URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109 msgid "min lat" msgstr "min lat" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111 msgid "min lon" msgstr "min lon" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:117 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "max lat" msgstr "max lat" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 msgid "max lon" msgstr "max lon" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:122 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -410,5 +411,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:134 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130 msgid "Bounding Box" msgstr "Sınır Çerçevesi" @@ -444,6 +445,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:96 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:894 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:956 msgid "name" msgstr "sism" @@ -476,13 +477,13 @@ msgstr "yaklaş" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:107 msgid "" "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " "move mouse. Select: Click." msgstr "" -"Yakınlaştır:FareTekeri veya çift Klik. Harita Taşı: Sağ klik ve fareyi oynat." -"Seçim:Klik" - -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +"Yakınlaştır:FareTekeri veya çift Klik. Harita Taşı: Sağ klik ve fareyi " +"oynat.Seçim:Klik" + +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:109 msgid "Slippy map" msgstr "Hareketli Harita" @@ -493,7 +494,7 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:605 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:602 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:89 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -513,5 +514,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380 msgid "Remove" msgstr "Çıkart" @@ -653,20 +654,20 @@ msgstr "Belirlenmişse, konfigürsayonu sıfırla." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:109 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:186 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:198 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:108 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:191 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:203 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 msgid "Java OpenStreetMap Editor" msgstr "Java OpenStreetMap Editor" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:111 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:110 msgid "Message of the day not available" msgstr "Günün Mesajı mevcut değil" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:200 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:205 msgid "Downloading \"Message of the day\"" msgstr "" @@ -706,33 +707,33 @@ msgstr "Dışarı Zoom" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:234 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:474 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:512 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:383 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:380 msgid "More information about this feature" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:393 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:390 msgid "Optional Attributes:" msgstr "Seçilebilen Özellikler:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:437 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "''{1}'' gurubu için ''{0}'' kullan" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:438 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:435 #, java-format msgid "Use preset ''{0}''" msgstr "''{0}'' ı kullan" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 msgid "way" @@ -740,17 +741,17 @@ msgstr[0] "yol" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:214 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91 msgid "node" msgid_plural "nodes" msgstr[0] "kavşak" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:81 @@ -759,14 +760,14 @@ msgstr[0] "ilişki" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:475 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 #, java-format msgid "Unknown type: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:549 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 #, java-format @@ -774,15 +775,15 @@ msgstr "Etiketteki özellikler okunamadı: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:555 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552 #, java-format msgid "Error parsing {0}: " msgstr "İşleme Hatası {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:572 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:569 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595 #, java-format msgid "Change {0} object" @@ -790,9 +791,17 @@ msgstr[0] "{0} Objeyi Değiştir" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 msgid "Nothing selected!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 +msgid "Selection unsuitable!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607 +msgid "Apply Preset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 msgid "Change Properties" msgstr "Özellikleri Değiştir" @@ -803,14 +812,14 @@ msgstr "Varolan Grup ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:107 msgid "File" msgstr "Dosya" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:135 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:107 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:86 @@ -822,22 +831,22 @@ msgstr "Düzenle" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 msgid "View" msgstr "Görünüm" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:26 msgid "Tools" msgstr "Araçlar" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:141 msgid "Audio" msgstr "Ses" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:142 msgid "Presets" msgstr "Ayarlanmış" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:40 @@ -849,18 +858,18 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:210 msgid "Wireframe View" msgstr "Tel Görünümü" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212 msgid "Toggle Wireframe view" msgstr "Tel Göünümünü İşaretle" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:28 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 msgid "Contacting the OSM server..." msgstr "OSM serverına bağlanılıyor..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 #, java-format msgid "This will change up to {0} object." @@ -868,11 +877,11 @@ msgstr[0] "İşlem {0} objeyi değiştirecek." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138 msgid "An empty value deletes the key." msgstr "Boş değer anahtarı sildi." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66 @@ -882,7 +891,7 @@ msgstr "Anahtar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 @@ -891,10 +900,10 @@ msgstr "Değer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333 msgid "Change values?" msgstr "Değerleri Değiştir?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:257 #, java-format msgid "Change properties of up to {0} object" @@ -902,33 +911,33 @@ msgstr[0] "Değerleri {0} obje için değiştir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310 msgid "Please select a key" msgstr "Lütfen bir anahtar seçiniz" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321 msgid "Please select a value" msgstr "Lütfen bir değer seçiniz" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:445 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:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 msgid "Properties/Memberships" msgstr "Özellikler/Üyelikler" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451 msgid "Properties for selected objects." msgstr "Seçili objenin özellikleri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97 @@ -940,58 +949,58 @@ msgstr "Anahtar: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 msgid "Member Of" msgstr "Üyesi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Role" msgstr "Rol" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:559 msgid "Change relation" msgstr "İlişkiyi değiştir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560 #, 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:564 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 msgid "Delete from relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:600 msgid "Add Properties" msgstr "Özellik Ekle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603 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:609 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606 msgid "Edit Properties" msgstr "Özellikleri Değiştir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609 msgid "Edit the value of the selected key for all objects" msgstr "Seçili anahtarın değerini her obje için düzenle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 msgid "Delete Properties" msgstr "Özelliği Sil" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:77 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:293 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 @@ -1000,98 +1009,115 @@ msgstr "Sil" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615 msgid "Delete the selected key in all objects" msgstr "Seçili anahtarı her objeden sil" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:763 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Özellik: {0} / Üyelik: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:769 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766 msgid "Properties / Memberships" msgstr "Özellik / Üyelik" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178 +msgid "Apply Changes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 msgid "Create new relation" msgstr "Yeni ilişki oluştur" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208 msgid "Edit new relation" msgstr "Yeni ilişkiyi düzenle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209 #, java-format msgid "Edit relation #{0}" msgstr "İlişki Düzenle #{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230 +msgid "Basic" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274 msgid "Occupied By" msgstr "Meşgul Eden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311 msgid "Tags (empty value deletes tag)" msgstr "Etiket (Boş değerler etiketi siler)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313 msgid "Members" msgstr "Üyeler" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 +msgid "Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351 msgid "Move the currently selected members up" msgstr "Seçili üyeyi yukarı taşı" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358 +msgid "Add Selected" +msgstr "Seçileni Ekle" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359 +msgid "Add all currently selected objects as members" +msgstr "Seçili bütün objeleri üye olarak ekle" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365 +msgid "Remove Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366 +msgid "Remove all currently selected objects from relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 +msgid "Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373 msgid "Move the currently selected members down" msgstr "Seçili üyeyi aşağı taşı" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356 -msgid "Add Selected" -msgstr "Seçileni Ekle" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:357 -msgid "Add all currently selected objects as members" -msgstr "Seçili bütün objeleri üye olarak ekle" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:363 -msgid "Remove Selected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:364 -msgid "Remove all currently selected objects from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381 msgid "Remove the member in the current table row from this relation" msgstr "Seçili satırdaki üyeyi bu ilişkiden kaldır" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394 msgid "Download Members" msgstr "Üyeleri İndir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:406 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395 msgid "Download all incomplete ways and nodes in relation" msgstr "Bütün eksik yolları ve kavşakları ilişkili olarak indir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:415 -msgid "Basic" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:453 #, java-format msgid "Members: {0}" msgstr "Üyeler: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:587 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:461 +#, java-format +msgid "Relation Editor: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:585 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 msgid "There were conflicts during import." msgstr "İçeri taşıma esnasında karşıklık oluştu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593 msgid "Error parsing server response." msgstr "Serverın cevabı tanımlanamdı." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:600 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:594 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:598 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -1105,9 +1131,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:345 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 msgid "Error" msgstr "Hata" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:599 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597 msgid "Cannot connect to server." msgstr "Server'a bağlantı kurulamadı." @@ -1266,5 +1292,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:94 @@ -1274,5 +1300,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 msgid "" @@ -1335,16 +1361,24 @@ msgstr "Seçim: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57 +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:67 +msgid "Delete the selected relation" +msgstr "Seçili ilişkiyi sil" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 #: trans_presets.java:2904 msgid "Relations" msgstr "İlişkiler" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 msgid "Open a list of all relations." msgstr "İlişkilerin listesini göster." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 @@ -1352,17 +1386,9 @@ msgstr "Yeni" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 msgid "Create a new relation" msgstr "Yeni ilişki oluştur" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -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:90 -msgid "Delete the selected relation" -msgstr "Seçili ilişkiyi sil" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:130 #, java-format msgid "Relations: {0}" @@ -1390,47 +1416,47 @@ msgstr "Komut Yığını: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +msgid "Resolve" +msgstr "Çözümle" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +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:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 msgid "Conflict" msgstr "Çelişki" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71 msgid "Merging conflicts." msgstr "Çelişkileri Birleştir." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67 -msgid "Resolve" -msgstr "Çözümle" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:68 -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:105 -msgid "Please select something from the conflict list." -msgstr "Lütfen çelişki listesinden bir seçim yapınız." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Resolve Conflicts" msgstr "Çelişkileri Çözümle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123 +msgid "Solve Conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146 #, java-format msgid "Conflicts: {0}" msgstr "Çeşişkiler: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 msgid "Conflicts" msgstr "Çelişkiler" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 msgid "conflict" msgstr "Çelişki" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 msgid "background" msgstr "arkaplan" @@ -1452,5 +1478,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 msgid "Customize Color" @@ -1458,5 +1484,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1466,5 +1492,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -1473,5 +1499,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:326 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:152 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -1489,5 +1515,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:265 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 #, java-format msgid "Audio synchronized at point {0}." @@ -1495,5 +1521,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232 msgid "Unable to synchronize in layer being played." msgstr "Çalan tabakada eşleme yapılamadı." @@ -1514,5 +1540,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:958 msgid "desc" msgstr "Tanım" @@ -1534,5 +1560,5 @@ msgstr "Linkin gösterilmesinde hata" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -1542,5 +1568,5 @@ "gerekir." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -1550,18 +1576,18 @@ "sürükleyiniz." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224 msgid "Unable to create new audio marker." msgstr "Yeni ses imleci oluşturulamadı." #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 msgid "Convert to data layer" msgstr "Bilgi tabakasına çevir" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:725 -msgid "" -"Upload of unprocessed GPS data as map data is considered harmful." -"
            If you want to upload traces, look here:" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:645 +msgid "" +"Upload of unprocessed GPS data as map data is considered " +"harmful.
            If you want to upload traces, look here:" msgstr "" "İşlenilmemiş GPS bilgisis yüklemek zararlı olabilir.
            Eğer izleri " @@ -1569,66 +1595,22 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:646 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:747 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:448 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:667 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "Converted from: {0}" msgstr "Çevrildiği yer: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612 -msgid "Upload this trace..." -msgstr "Bu izi yükle..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:616 -msgid "" -"This functionality has been added only recently. Please
            use with " -"care and check if it works as expected." -msgstr "" -"Bu özellik yeni eklenildi. Lütfen
            kullanırken dikkatli kullanınız." -"" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:102 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:107 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:626 -msgid "Upload track filtered by JOSM" -msgstr "JOSM tarafından filtrelenen izleri yükle" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:103 -#, java-format -msgid "Upload raw file: {0}" -msgstr "Ham dosya yükle: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:108 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:627 -msgid "Upload raw file: " -msgstr "Ham dosya yükle: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640 -msgid "Description:" -msgstr "Tanım:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:123 -msgid "Tags:" -msgstr "Etiketler:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:129 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:648 -msgid "GPX-Upload" -msgstr "GPX-Yükle" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:229 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:217 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113 msgid "gps point" msgstr "gps noktası" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 #: trans_presets.java:1795 trans_presets.java:1801 trans_presets.java:1807 #: trans_presets.java:1813 trans_presets.java:1819 trans_presets.java:1825 @@ -1647,10 +1629,10 @@ msgstr[0] "iz" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 msgid "point" msgid_plural "points" msgstr[0] "nokta" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177 #, java-format msgid "a track with {0} point" @@ -1658,5 +1640,5 @@ msgstr[0] "{0} noktalı iz" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} consists of {1} track" @@ -1664,5 +1646,5 @@ msgstr[0] "{0} {1} izden oluşur" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181 #, java-format msgid "{0} point" @@ -1670,25 +1652,25 @@ msgstr[0] "{0} nokta" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117 msgid "Customize line drawing" msgstr "Çizimi özelleştir" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:296 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 msgid "Use global settings." msgstr "Genel ayarları kullan." -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 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/RawGpsLayer.java:298 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123 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/RawGpsLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:135 msgid "Select line drawing options" @@ -1722,5 +1704,5 @@ msgstr "JPEG görüntüsü (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290 #, java-format msgid "{0} track, " @@ -1728,5 +1710,5 @@ msgstr[0] "{0} iz, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291 #, java-format msgid "{0} route, " @@ -1734,5 +1716,5 @@ msgstr[0] "{0} rut, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292 #, java-format msgid "{0} waypoint" @@ -1740,55 +1722,51 @@ msgstr[0] "{0} yol noktaları" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #, java-format msgid "Name: {0}" msgstr "İsim: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299 #, java-format msgid "Description: {0}" msgstr "Tanım: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:324 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 msgid "Timespan: " msgstr "Zaman_aralığı: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 msgid "Length: " msgstr "Uzunluk: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:642 -msgid "Tags (keywords in GPX):" -msgstr "Etiketler (GPX deki anahtar isimler):" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:655 msgid "time" msgstr "zaman" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:780 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:679 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:700 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 msgid "Download from OSM along this track" msgstr "OSM den bu izi indir" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:686 msgid "Download everything within:" msgstr "Bunun içindeki herşeyi indir:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 #, java-format msgid "{0} meters" msgstr "{0} metre" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:692 msgid "Maximum area per request:" msgstr "Her istek için max. alan:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 #, java-format msgid "{0} sq km" msgstr "{0} km2" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787 #, java-format msgid "" @@ -1799,14 +1777,14 @@ "istiyor musunuz?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:844 #, java-format msgid "Audio markers from {0}" msgstr "{0} daki ses imleçleri" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867 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:1049 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 msgid "" "Some waypoints with timestamps from before the start of the track were " @@ -1815,5 +1793,5 @@ "Bazı zaman damgalı yolnoktaları, izin başlangıcından öncekiler atlanıldı." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -1921,19 +1899,19 @@ msgstr "Girilen zaman ayrıştırılamadı." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:140 msgid "outside downloaded area" msgstr "indirilen alanın dışında" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 #, java-format msgid "{0} consists of:" msgstr "{0} şunları içerir:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:353 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:347 #, java-format msgid " ({0} deleted.)" msgstr " ({0} silindi.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:445 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 msgid "Convert to GPX layer" msgstr "GPX tabakasına çevir" @@ -1961,37 +1939,37 @@ msgstr "Yer imleçleri yazılamadı." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 msgid "The geographic longitude at the mouse pointer." msgstr "Fare imleci üzerindeki coğrafi boylam." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The name of the object at the mouse pointer." msgstr "Fare imleci üzerindeki objenin adı." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 msgid "The geographic latitude at the mouse pointer." msgstr "Fare imleci üzerindeki coğrafi enlem." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The angle between the previous and the current way segment." msgstr "Önceki ve şimdiki yol kısımları arasındaki açı." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The (compass) heading of the line segment being drawn." msgstr "Segment çizildi." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The length of the new way segment being drawn." msgstr "Yeni yol segmentinin uzunluğu çizildi." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:160 msgid "(no object)" msgstr "(obje yok)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:62 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:56 msgid "Color" msgstr "Renk" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:57 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107 #: trans_presets.java:56 trans_presets.java:92 trans_presets.java:130 @@ -2092,27 +2070,36 @@ msgstr "İsim" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:118 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:112 #, java-format msgid "Paint style {0}: {1}" msgstr "Boya Stili {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 msgid "Choose" msgstr "Seç" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 msgid "Please select a color." msgstr "Lütfen Bir Renk Seçiniz." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 #, java-format msgid "Choose a color for {0}" msgstr "{0} için bir renk seçiniz" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +msgid "Set to default" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:172 +msgid "Set all to default" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:184 msgid "Colors used by different objects in JOSM." msgstr "JOSM da farklı objlerin kullandığı renkler." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:171 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:198 msgid "Colors" msgstr "Renkler" @@ -2129,5 +2116,6 @@ 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." +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:39 @@ -2145,26 +2133,26 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45 msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
            The password is transfered in plain text to the server, encoded in the " -"URL.
            Do not use a valuable Password." -msgstr "" -"UYARI: şifre konfigürasyon dosyasında düz metin olarak tutulmaktadır." -"
            şifre internet üzerinde aynı şekilde düz metin olarak gönderilmektedir. " -"
            Değerli bir şifre kullanmayınız." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:45 +"WARNING: The password is stored in plain text in the preferences " +"file.
            The password is transfered in plain text to the server, encoded in " +"the URL.
            Do not use a valuable Password." +msgstr "" +"UYARI: şifre konfigürasyon dosyasında düz metin olarak " +"tutulmaktadır.
            şifre internet üzerinde aynı şekilde düz metin olarak " +"gönderilmektedir.
            Değerli bir şifre kullanmayınız." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44 msgid "Sort presets menu" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46 msgid "Enable built-in defaults" msgstr "Önceden tanımlanmış ayarları etkinleştir" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:58 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69 msgid "Tagging preset source" msgstr "İlk ayarların kaynağı gösteriliyor" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:156 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 @@ -2172,5 +2160,5 @@ msgstr "Editlemek için bir satır seçiniz." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500 @@ -2179,26 +2167,26 @@ msgstr "Silmek için bir satır seçiniz." +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88 +msgid "" +"The sources (URL or filename) of tagging preset definition files. See " +"http://josm.openstreetmap.de/wiki/TaggingPresets for help." +msgstr "" +"Etiketleme ayarları kaynakları dosyası, yardım " +"için:http://josm.openstreetmap.de/wiki/TaggingPresets." + #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89 -msgid "" -"The sources (URL or filename) of tagging preset definition files. See http://" -"josm.openstreetmap.de/wiki/TaggingPresets for help." -msgstr "" -"Etiketleme ayarları kaynakları dosyası, yardım için:http://josm." -"openstreetmap.de/wiki/TaggingPresets." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 msgid "Add a new tagging preset source to the list." msgstr "Yeni bir etiketleme ayar dosyası ekle." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 msgid "Delete the selected source from the list." msgstr "Seçili kaynağı listeden sil." -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:94 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93 msgid "Tagging Presets" msgstr "Etiketleme Ayarları" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97 msgid "Tagging preset sources" msgstr "Etiketleme ayar kaynakaları" @@ -2212,6 +2200,6 @@ msgstr "Saklama sırasında backup dosyalarının sonuna ~ ekle" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:141 @@ -2219,34 +2207,34 @@ msgstr "Eklentiler" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 msgid "Configure available plugins." msgstr "Yüklü eklentileri ayarla." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43 msgid "Download List" msgstr "İndirme listesi" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:80 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51 msgid "Update" msgstr "Güncelle" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:60 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 msgid "Configure Sites..." msgstr "Siteleri Ayarla..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add either site-josm.xml or Wiki Pages." msgstr "site-josm.xml veya Wiki Pages ekle." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99 msgid "Please select an entry." msgstr "Lütfen bir seçim yapınız." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 msgid "Configure Plugin Sites" msgstr "Eklenti sitelerini ayarla" @@ -2427,9 +2415,9 @@ msgstr "Ses kayıt cihazı kalibrasyonu" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "Display Settings" msgstr "Ayarları Göster" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 msgid "" "Various settings that influence the visual representation of the whole " @@ -2437,55 +2425,63 @@ msgstr "Programın görünüşünü değiştirmeye yarayan bir çok ayar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings" msgstr "Bağlantı Ayarları" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings for the OSM server." msgstr "OSM server bağlantı ayarları." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Map Settings" msgstr "Harita Ayarları" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 msgid "Settings for the map projection and data interpretation." msgstr "Harita Projeksiyonu ve İnterpolasyon Ayarları." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Audio Settings" msgstr "Ses Ayarları" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Settings for the audio player and audio markers." msgstr "Ses çalıcısı ve ses imleç ayarları." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97 msgid "You have to restart JOSM for some settings to take effect." msgstr "Ayarların aktif olamsı için programı açıp/kapatmalısınız." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:25 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 msgid "Draw lines between raw gps points." msgstr "GPS noktaları boyunca çiz." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:27 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 msgid "Force lines if no segments imported." msgstr "Herhangi bir segment içeri alınmadıysa çizgileri zorla." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:28 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 msgid "Draw large GPS points." msgstr "Geniş gps noktaları çiz." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29 -msgid "Color tracks by velocity." -msgstr "İvme gösteren izlerin renkleri." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34 +msgid "Velocity (red = slow, green = fast)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 +msgid "Dilution of Position (red = high, green = low, if available)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 +msgid "Single Color (can be customized for named layers)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:1346 msgid "Car" msgstr "Araba" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:309 trans_presets.java:635 trans_presets.java:833 #: trans_presets.java:842 trans_presets.java:851 trans_presets.java:864 @@ -2497,5 +2493,5 @@ msgstr "Bisiklet" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 #: trans_presets.java:310 trans_presets.java:637 trans_presets.java:832 #: trans_presets.java:841 trans_presets.java:850 trans_presets.java:863 @@ -2506,44 +2502,44 @@ msgstr "Ayak" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 msgid "Draw Direction Arrows" msgstr "Yön oklarını çiz" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 msgid "Fast drawing (looks uglier)" msgstr "Hızlı Çizim (kötü görünür)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180 msgid "Only interesting direction hints (e.g. with oneway tag)." msgstr "Sadece ilginiç yön ipuçlar (ör:tek yön)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:186 msgid "Only on the head of a way." msgstr "Sadece yolun başında" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44 msgid "Draw segment order numbers" msgstr "Segment sıra numaralarını çiz" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45 msgid "Draw boundaries of downloaded data" msgstr "İndirilen alan için sınırları çiz" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46 msgid "Draw virtual nodes in select mode" msgstr "Seçim modunda sanal kavşakları çiziniz" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47 msgid "Draw inactive layers in other color" msgstr "Pasif tabakaları başka renkte çiz" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 msgid "Smooth map graphics (antialiasing)" msgstr "Düzgün harita grafikleri (antialiasing)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 msgid "" "If your gps device draws too few lines, select this to draw lines along your " @@ -2551,5 +2547,5 @@ msgstr "GPS çok az ölçüm yapmışsa, bu yolu yön olarak seç" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:71 msgid "" "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines." @@ -2558,22 +2554,23 @@ "'-1' yap." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73 msgid "Maximum length (meters)" msgstr "Maximum uzunluk (metre)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:77 msgid "" "Force drawing of lines if the imported data contain no line information." msgstr "Gelen çizimde herhangi bilgi olmasa bile çizime zorla." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:84 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89 msgid "Draw direction arrows for lines, connecting GPS points." msgstr "GPS noktalarını bağlayan yönler için okları çiz." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90 -msgid "Draw the direction arrows using table lookups instead of complex math." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95 +msgid "" +"Draw the direction arrows using table lookups instead of complex math." msgstr "Yön çizgi okları için tablo değerlerini kullan hesap yapma." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:96 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:101 msgid "" "Don't draw arrows if they are not at least this distance away from the last " @@ -2581,49 +2578,66 @@ msgstr "Son çizilen çizgiden sonra bu kadar boşluk varsa okları çizme" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104 msgid "Minimum distance (pixels)" msgstr "Minimum uzaklık (pixel)" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:109 -msgid "Choose the hue for the track color by the velocity at that point." -msgstr "Bu nokta için ivme izini gösteren rengi seç." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116 +msgid "Draw larger dots for the GPS points." +msgstr "GPS noktaları için geniş nokta çiz." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136 +msgid "" +"All points and track segments will have the same color. Can be customized in " +"Layer Manager." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137 +msgid "Colors points and track segments by velocity." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:138 +msgid "" +"Colors points and track segments by dilution of position (HDOP). Your " +"capture device needs to logs that information." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143 msgid "Allows to tune the track coloring for different average speeds." msgstr "Farklı ortalama hızar için farklı renklerin kullanılmasına izin ver" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122 -msgid "Draw larger dots for the GPS points." -msgstr "GPS noktaları için geniş nokta çiz." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148 +msgid "Track and Point Coloring" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157 msgid "GPS Points" msgstr "GPS Noktaları" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175 msgid "Draw direction hints for way segments." msgstr "Yol segmentleri için yön ipuçları çiz." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:163 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192 msgid "Draw the order numbers of all segments within their way." msgstr "Her segment için kendi yolu buyunca sıra numarası çiz." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:168 -msgid "Apply antialiasing to the map view resulting in a smoother appearance." +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:197 +msgid "" +"Apply antialiasing to the map view resulting in a smoother appearance." msgstr "Daha düzgün harita grafikleri için 'antialiasing' uygula ." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202 msgid "Draw the boundaries of data loaded from the server." msgstr "Server'dan gelen bilginin sınırlarını çiz ." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:178 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:207 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "Kolay yol düzenlemesi için sanal kavşaklar çiz." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212 msgid "Draw the inactive data layers in a different color." msgstr "Pasif tabakaları farklı renklerde çiz." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219 msgid "OSM Data" msgstr "OSM Data" @@ -2733,11 +2747,11 @@ "a menu entry of button for the first time. So some of your changes may " "become active even without restart --- but also without collistion handling. " -"This is another reason to restart JOSM after making any changes here." -"

            " +"This is another reason to restart JOSM after making any changes " +"here.

            " msgstr "" "

            BAzı kısayollar ilgili düğmeye ilk defa basıldığında aktif oluryani " "yaptığınız değişiklik program yeniden açılmadanda aktif olabilir fakat " -"herhangi bir sorun oluşmaması için programı yeniden başlatmalısınız." -"

            " +"herhangi bir sorun oluşmaması için programı yeniden " +"başlatmalısınız.

            " #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:170 @@ -2749,8 +2763,9 @@ "key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also " "there will be 'keys' listed that correspond to a shortcut on your keyboard " -"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/" -"Semicolon on US keyboards, '.'/Period on German keyboards, ...) instead. Not " -"doing so may result in conflicts, as there is no way for JOSM to know that " -"Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...

            " +"(e.g. ':'/Colon). Please also do not use them, use the base key " +"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) " +"instead. Not doing so may result in conflicts, as there is no way for JOSM " +"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US " +"keyboard...

            " msgstr "" "

            Kısayollar konusunda dikkat edilmesi gereken konu ise kısayol " @@ -2781,6 +2796,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183 msgid "" -"

            The pseudo-modifier 'disabled' will disable the shortcut when encountered." -"

            " +"

            The pseudo-modifier 'disabled' will disable the shortcut when " +"encountered.

            " msgstr "" "

            Sanal düzenleyci pasif haldedir, aktif hale gelince bütün kısayollar " @@ -2852,67 +2867,67 @@ msgstr "Düzenleyici Grupları" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:231 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:236 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:250 msgid "layer not in list." msgstr "tabaka listede yok." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "usage" msgstr "kullanım" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 msgid "options" msgstr "seçenekler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 msgid "Show this help" msgstr "Bu Yardımı Göster" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Standard unix geometry argument" msgstr "Standart unix geometry argümanı" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 msgid "Download the bounding box" msgstr "Kutu ile belirlenen sınırları indir" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 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:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 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:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 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:144 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Select with the given search" msgstr "Yapılan aramaya göre seçim yap" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 msgid "Don't launch in fullscreen mode" msgstr "Tam ekran ise çalıştırma" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 msgid "Reset the preferences to default" msgstr "Tercihleri varsayılan değerlere getir" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 msgid "Set the language." msgstr "Dil seçimi." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 msgid "examples" msgstr "örnekler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -2922,21 +2937,21 @@ "bir harita yükleyiniz --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153 msgid "Instead of --download= you may specify osm://\n" msgstr "--download= indirmek yerine osm:// kullanabilirsin\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 msgid "Activating updated plugins" msgstr "Güncellenen eklentiler aktif olacak" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 msgid "Loading early plugins" msgstr "Eski eklentiler yükleniyor" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Setting defaults" msgstr "Varsayılan ayarlar alınıyor" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171 msgid "Loading plugins" msgstr "Eklentiler yükleniyor" @@ -2969,6 +2984,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:108 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:156 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:164 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:162 #: trans_presets.java:308 trans_presets.java:309 trans_presets.java:310 #: trans_presets.java:311 trans_presets.java:312 trans_presets.java:313 @@ -2985,5 +3000,5 @@ msgstr "bilinmeyen" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:66 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 #, java-format msgid "" @@ -2992,25 +3007,25 @@ msgstr "Uyarı - {0} eklentisi istenildi. Eklenti artık gerekli değil." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 #, java-format msgid "Plugin requires JOSM update: {0}." msgstr "eklenti JOSM’un güncellemesini gerektiriyor: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 #, java-format msgid "Plugin not found: {0}." msgstr "Eklenti Bulunamadı: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "En son eklenti güncellemesi {0} gün önce yapıldı." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 msgid "" "(You can change the number of days after which this warning appears
            by " @@ -3020,17 +3035,17 @@ "değiştirebilirsin.
            " -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 msgid "Disable plugin" msgstr "Eklentiyi Pasif Yap" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Eklenti yüklenemedi {0}. Tercihlerden silinsin mi?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -3040,5 +3055,5 @@ "üzerine yazma yetkisi varmıdır kontrol ediniz." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 #, java-format msgid "" @@ -3046,10 +3061,10 @@ msgstr "''{0}'' Eklentisinden beklenmeyen bir durum oluştu." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Eklenti Yazarın {0} Olduğunu Belirtiyor." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:262 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -3057,9 +3072,9 @@ "Hata bildirmeden önce eklentinin yeni versiyonu ile güncellemeyi deneyin." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263 msgid "Should the plugin be disabled?" msgstr "Eklentiyi Pasif Hale Getireyim mi?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:278 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -3069,5 +3084,5 @@ "çalıştırın." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -3075,6 +3090,6 @@ msgstr "Eklenti kaldırılamıyor, Lütfen JOSM u edindiğiniz yere danışın" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:322 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:181 msgid "no description available" msgstr "Açıklama mevcut değil" @@ -3086,5 +3101,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 msgid "Update Plugins" msgstr "Eklentileri Güncelle" @@ -3119,5 +3134,5 @@ "Eklenti {0} göründüğü kadarıyla linki bozuk veya otomatik indirilemiyor ." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 #, java-format msgid "Downloaded plugin information from {0} site" @@ -3125,13 +3140,13 @@ msgstr[0] "{0} sitesinden indirilen eklenti" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 msgid "No plugin information found." msgstr "Eklenti bilgisi bulunamadı." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:76 msgid "All installed plugins are up to date." msgstr "Bütün eklentiler güncel." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 #, java-format msgid "" @@ -3144,9 +3159,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:105 msgid "Download missing plugins" msgstr "Eksik eklentileri yükle" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:106 #, java-format msgid "" @@ -3159,22 +3174,22 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107 msgid "Download Plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:170 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:168 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Versiyon {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:176 msgid "Plugin bundled with JOSM" msgstr "Eklenti JOSM ile beraber geliyor." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208 msgid "Plugin already exists" msgstr "Eklentiler zaten mevcut" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:211 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:209 #, java-format msgid "" @@ -3189,15 +3204,15 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212 msgid "Delete and Download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:222 #, java-format msgid "Error deleting plugin file: {0}" msgstr "Eklentinin silinmesinde hata: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:281 #, java-format msgid "Error reading plugin information file: {0}" @@ -3263,10 +3278,10 @@ msgstr "Sil {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:165 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 msgid "Conflicting relation" msgstr "İlişkilerde Karışıklık" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 #, java-format msgid "" @@ -3277,5 +3292,5 @@ "İlişkiden sil?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:166 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 #, java-format msgid "" @@ -3292,7 +3307,7 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:349 msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
            This can cause problems because other objects (that you don't see) might " -"use them.
            Do you really want to delete?" +"You are about to delete nodes outside of the area you have " +"downloaded.
            This can cause problems because other objects (that you don't " +"see) might use them.
            Do you really want to delete?" msgstr "" "İndirdiğiniz alan dışındaki bir kavşağı sileceksiniz.
            Göremediğiniz başka " @@ -3417,124 +3432,135 @@ msgstr "Tercihler serverdan alınamadı." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:232 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 msgid "Area style way is not closed." msgstr "Alan stili yol kapalı değil." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:426 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:428 #, 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:527 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:765 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:776 msgid "Empty member in relation." msgstr "İlişkide boş üye." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:767 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:531 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "''{0}'' üyesini ilişkiden sil." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:547 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 #, 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:552 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:549 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:558 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:561 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 +msgid "More than one \"via\" found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 #, java-format msgid "Unknown role ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 #, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587 msgid "No \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 msgid "No \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -msgid "No \"via\" node found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +msgid "No \"via\" node or way found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:636 -#, java-format -msgid "The \"{0}\" way must contain at least 2 nodes." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:731 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +msgid "The \"to\" way doesn't start or end at a \"via\" node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:620 +msgid "The \"from\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:624 +msgid "The \"to\" way doesn't start or end at the \"via\" way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:742 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798 #, 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:798 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 #, 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:847 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:858 #, 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:927 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 #, 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:938 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:949 #, 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:987 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:998 #, 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:1012 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1023 #, 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:1195 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1206 msgid "untagged" msgstr "etiketsiz" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1196 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207 msgid "text" msgstr "metin" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:93 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" msgstr "durgun" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:94 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:181 @@ -3542,13 +3568,13 @@ msgstr "seçilmiş" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" msgstr "etiketsiz yol" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 msgid "incomplete way" msgstr "eksik yol" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 msgid "highlight" msgstr "" @@ -3570,5 +3596,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:113 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:89 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:77 msgid "incomplete" @@ -3597,14 +3623,14 @@ msgstr[0] "{0} üye" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 msgid "Duplicate" msgstr "Çift" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 msgid "Duplicate selection by copy and immediate paste." msgstr "Kopyala ve Yapştır ile seçimi çiftle." -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 @@ -3613,5 +3639,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -3682,7 +3708,9 @@ msgstr "OSM yolları ve kavşakları için geçmiş bilgisini göster." -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:57 -msgid "Please select at least one node, way or relation." -msgstr "Lütfen en az bir kavşak, yol veya ilişki seçiniz." +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:60 +msgid "" +"Please select at least one node, way or relation. Only already uploaded " +"elements have a history." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 @@ -3704,7 +3732,7 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/TerracerAction.java:47 @@ -3842,5 +3870,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:123 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:314 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:315 msgid "Enter values for all conflicts." msgstr "Bütün çelişkilere değer ver." @@ -3848,5 +3876,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 msgid "Solve Conflicts" msgstr "" @@ -3980,5 +4008,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 #, java-format @@ -4004,25 +4032,29 @@ msgstr[0] "Seçili kavşak herhangi bir yolun ortasında değil." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125 -msgid "" -"There is more than one way using the node(s) you selected. Please select the " +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 +msgid "" +"There is more than one way using the node you selected. Please select the " "way also." -msgstr "Seçtiğiniz kavşak(lar) için birden fazla yol var. lütfen yol seçiniz" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133 +msgid_plural "" +"There is more than one way using the nodes you selected. Please select the " +"way also." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137 msgid "The selected nodes do not share the same way." msgstr "seçili kavşaklar aynı yolu paylaşmıyorlar." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." msgstr[0] "Seçili yol seçili kavşakları içermiyor." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229 msgid "You must select two or more nodes to split a circular way." msgstr "Dairesel bir yolu bölmek için iki veya fazla kavşak seçiniz." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -4031,5 +4063,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:286 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 msgid "" "A role based relation membership was copied to all new ways.\n" @@ -4039,5 +4071,5 @@ "Gerek duyulursa kontrol edilmeli" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:296 #, java-format msgid "Split way {0} into {1} parts" @@ -4427,5 +4459,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245 msgid "Align Nodes in Circle" msgstr "Daire içindeki kavşakları hizala" @@ -4439,5 +4471,5 @@ msgstr "bazı kavşaklar zaten hizada" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180 msgid "Please select at least four nodes." msgstr "Lütfen en az dört kavşak seçiniz." @@ -4504,4 +4536,32 @@ msgstr "Yedek dosyası içeri alınırken hata oluştu." +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "" +"Show status report with useful information that can be attached to bugs" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92 +msgid "Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +msgid "Copy to clipboard and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 +msgid "Close" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 @@ -4513,13 +4573,13 @@ msgstr "Son bitmemiş komutu tekrar yap." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:44 msgid "Delete Mode" msgstr "Silme Modu" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:46 msgid "Delete nodes or ways." msgstr "Kavşak veya yolları sil." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:84 @@ -4530,5 +4590,5 @@ msgstr "Mode: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:130 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -4540,6 +4600,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:87 msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." +"Drag play head and release near track to play audio from there; " +"SHIFT+release to synchronize audio at that point." msgstr "" "Çalan dosyayı sürükle ve bir izin yakınında bırak; SHIFT+bıraksesi " @@ -4555,24 +4615,24 @@ msgstr "Alanları Oluştur" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 msgid "Extrude Way" msgstr "Yolu genişlet" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:252 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:416 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:430 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/ExtrudeAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 msgid "Draw a rectangle of the desired size, then release the mouse button." msgstr "" "İstediğiniz boyutta bir dikdörtgen çizin, sonra fare düğmesini bırakınız." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:420 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:434 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/ExtrudeAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 msgid "Drag a way segment to make a rectangle." msgstr "Dikdörtgen çizmek için bir yol segmentini sürükleyin." @@ -4640,14 +4700,14 @@ msgstr "Objeyi seç,taşı ve dönder" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:191 msgid "Add and move a virtual new node to way" msgstr "Sanal yeni bir kavşak ekle ve yola taşı" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:220 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:223 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 msgid "Cannot move objects outside of the world." msgstr "Objeleri dünya dışına taşıyamazsın." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:418 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:432 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -4656,5 +4716,5 @@ "yapıştır." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:422 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:436 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to remove); Shift-" @@ -4678,6 +4738,6 @@ "move zoom with right button" msgstr "" -"Sürükleyerek Zoom yap; Ctrl+ veya Ctrl-; beraber taşı Ctrl+Yukarı,aşağı,sol," -"sağzoom taşı ise sağ klik" +"Sürükleyerek Zoom yap; Ctrl+ veya Ctrl-; beraber taşı " +"Ctrl+Yukarı,aşağı,sol,sağzoom taşı ise sağ klik" #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22 @@ -4720,5 +4780,6 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239 msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "Kavşaklar birleştirlemiyor: Kullanılan bir yolun silinmesi gerekiyor." +msgstr "" +"Kavşaklar birleştirlemiyor: Kullanılan bir yolun silinmesi gerekiyor." #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:277 @@ -4727,30 +4788,30 @@ msgstr "{0} Kavşak birleştirildi" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Orthogonalize Shape" msgstr "Orthogonalize Shape" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Kavşakları taşı, açılar 90 veya 270 derece olsun" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 msgid "Only two nodes allowed" msgstr "Sadece iki kavşak olabilir" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 msgid "Selection must consist only of ways." msgstr "Seçimde sadece yollar olmalı." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 msgid "Please select one or more closed ways of at least four nodes." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 msgid "Please select ways with almost right angles to orthogonalize." msgstr "Ortogonal yapmak için uygun açılı yollar seçiniz." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 msgid "" "You are using the EPSG:4326 projection which might lead
            to " @@ -4762,9 +4823,9 @@ "değiştirmeniz önerilir.
            Devam etmek istiyormusunuz?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "Only one node selected" msgstr "Sadece bir kavşak seçili" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:245 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 msgid "Orthogonalize" msgstr "Orthogonalise" @@ -4815,5 +4876,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101 -msgid "Please select exactly three nodes or one way with exactly three nodes." +msgid "" +"Please select exactly three nodes or one way with exactly three nodes." msgstr "Lütfen üç nokta veya üç nokta içeren bir yol seçiniz." @@ -4822,52 +4884,69 @@ msgstr "Noktalar daire içinde değiller." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50 +#: ../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:71 +msgid "Update Data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:72 +#, java-format +msgid "" +"This action will require {0} individual download requests. Do you wish to " +"continue?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 msgid "Open Location..." msgstr "Lokasyon Aç" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 msgid "Open an URL." msgstr "Link Aç." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 msgid "Separate Layer" msgstr "farklı Tabaka" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 msgid "Enter URL to download:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 msgid "Download Location" msgstr "Lokasyonu indir" -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 msgid "Download URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 msgid "Add Node..." msgstr "Kavşak Ekle..." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 msgid "Add a node by entering latitude and longitude." msgstr "Enlem ve Boylam girerek kavşak ekle." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 msgid "Enter the coordinates for the new node." msgstr "Yeni kavşak için koordinat giriniz." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 msgid "Use decimal degrees." msgstr "Ondalık derece kullan." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 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:62 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 #: ../plugins/livegps/livegps/LiveGpsDialog.java:54 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93 @@ -4876,5 +4955,5 @@ msgstr "Enlem" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 #: ../plugins/livegps/livegps/LiveGpsDialog.java:56 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96 @@ -4917,14 +4996,14 @@ msgstr "Objeleri taşı {0}" +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "Overwrite" msgstr "Üzerine Yaz" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379 msgid "File exists. Overwrite?" msgstr "Dosya mevcut. Üzerine Yaz?" @@ -4943,42 +5022,47 @@ msgstr "Lütfen kopyalama için seçim yapınız" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Yolları Çıkar" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "Birçok yol tarafında kullanılan kavşakları çift yap." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80 msgid "This node is not glued to anything else." msgstr "Bu kavşak başka bir nesneye yapışık değil." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100 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:90 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 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:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 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:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "Select either:" msgstr "Şunların Arasında Seçiniz:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +msgid "* One tagged node, or" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 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:103 -msgid "* One node that is used by more than one way and one of those ways, or" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +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:104 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -4987,5 +5071,5 @@ "kullanılabilir, veya" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -4993,5 +5077,5 @@ "* Yolun bir veya birkaç kavşağı, birden fazla yol tarafında kullanılabilir." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -5004,10 +5088,14 @@ "kopyalarını oluşturur ve bütün kavşaklar seçilir" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:160 +msgid "Unglued Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:373 #, java-format msgid "Dupe into {0} nodes" msgstr "{0} kavşak değiştirildi" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:320 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:397 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -5110,5 +5198,5 @@ msgstr "Son komutu geri al." -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 msgid "No Shortcut" msgstr "Kısayol Yok" @@ -5130,13 +5218,13 @@ msgstr "OpenStreetMap verisi" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:29 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:28 msgid "Downloading GPS data" msgstr "GPS verisi indiriliyor" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:41 msgid "Downloaded GPX Data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:71 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:69 msgid "Raw GPS data" msgstr "Ham GPS verisi" @@ -5360,5 +5448,6 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169 -msgid "Header contains several values and cannot be mapped to a single string" +msgid "" +"Header contains several values and cannot be mapped to a single string" msgstr "Başlık çeşitli değerler taşır ve bir metine atanamaz." @@ -5710,5 +5799,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69 -msgid "Maximum number of segments allowed in each generated way. Default 250." +msgid "" +"Maximum number of segments allowed in each generated way. Default 250." msgstr "Oluşturulan yol için max. segment sayısı. Varsayılan 250." @@ -5731,6 +5821,7 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72 msgid "" -"Accuracy of Douglas-Peucker line simplification, measured in degrees." -"
            Lower values give more nodes, and more accurate lines. Default 0.0003." +"Accuracy of Douglas-Peucker line simplification, measured in " +"degrees.
            Lower values give more nodes, and more accurate lines. Default " +"0.0003." msgstr "" "Douglas-Peucker hat basitleştirme hassasiyeti, açı olarak verilir.
            düşük " @@ -5762,5 +5853,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78 msgid "Tag ways as water, coastline, land or nothing. Default is water." -msgstr "Yolu su, sahilşeridi,kara veya hiçbişi olarak etiketle. Varsayılan Su." +msgstr "" +"Yolu su, sahilşeridi,kara veya hiçbişi olarak etiketle. Varsayılan Su." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79 @@ -6374,6 +6466,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:509 msgid "" -"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." -"org/index.php/User:JLS/speller) or tag checking data files." +"The sources (URL or filename) of spell check (see " +"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking " +"data files." msgstr "" "İmla kontrolu için kaynak dosya veya link veya etiket kontolcusu veri dosyası" @@ -6397,5 +6490,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 msgid "Validate that property values are valid checking against presets." -msgstr "Önceden tanımlı değerleri kullanarak, özellik değerlerini kontrol et." +msgstr "" +"Önceden tanımlı değerleri kullanarak, özellik değerlerini kontrol et." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 @@ -6833,6 +6927,6 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:40 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:43 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:47 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 #, java-format @@ -6840,18 +6934,29 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:51 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:55 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 msgid "Contacting WMS Server..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157 msgid "Create buildings" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 msgid "CadastreGrabber: Illegal url." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +msgid "" +"To avoid cadastre WMS overload,\n" +"building import size is limited to 1 km2 max." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" @@ -6874,16 +6979,25 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:128 +msgid "Cadastre" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:139 +msgid "Auto sourcing" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164 +msgid "Invalid projection" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 +#, java-format +msgid "Change the projection to {0} first." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:169 msgid "" "To enable the cadastre WMS plugin, change\n" "the JOSM projection to Lambert and restart" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132 -msgid "Cadastre" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 -msgid "Auto sourcing" msgstr "" @@ -6956,6 +7070,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:43 msgid "" -"More than one WMS layer present.\n" -"Select one of them first, then retry." +"More than one WMS layer present\n" +"Select one of them first, then retry" msgstr "" @@ -6964,5 +7078,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136 #, java-format @@ -6971,13 +7085,13 @@ msgstr[0] "Yolu Basitleştir ({0} nokta kaldır)" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61 msgid "Extract SVG ViewBox..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65 msgid "Extract best fitting boundary..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:120 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126 msgid "Create boundary" msgstr "" @@ -7013,15 +7127,15 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 msgid "Save WMS layer to file" msgstr "WMS tabakasını dosyaya kaydet" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "Load WMS layer from file" msgstr "WMS tabakasını dosyadan yükle" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -7029,5 +7143,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 msgid "File Format Error" msgstr "Dosya Format Hatası" @@ -7035,5 +7149,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 msgid "Error loading file" msgstr "Dosya Yüklemede Sorun" @@ -7059,52 +7173,53 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 msgid "Replace original background by JOSM background color." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30 msgid "Reverse grey colors (for black backgrounds)." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 msgid "Set background transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34 msgid "Draw boundaries of downloaded data." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Enable automatic caching." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:53 -msgid "" -"A special handler of the french cadastre wms at www.cadastre.gouv." -"fr

            Please read the Terms and Conditions of Use here (in french): " -"
            http://www.cadastre.gouv.fr/scpc/html/" -"CU_01_ConditionsGenerales_fr.html
            before any upload of data created " -"by this plugin." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:58 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:55 +msgid "" +"A special handler of the french cadastre wms at " +"www.cadastre.gouv.fr

            Please read the Terms and Conditions of Use here " +"(in french):
            " +"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " +"
            before any upload of data created by this plugin." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -7112,26 +7227,40 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 -msgid "" -"Invert the original texts from black to white (and all intermediate greys)." +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +msgid "" +"Invert the original black and white colors (and all intermediate greys). " +"Useful for texts on dark backgrounds." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 +msgid "Allows multiple layers stacking" msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 -msgid "Allows multiple layers stacking" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:99 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:113 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 msgid "Image grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:162 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:125 +msgid "Grab smaller images (higher quality but use more memory)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +msgid "Fixed size square (default is 100m)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +msgid "Fixed size (from 25 to 1000 meters)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -7243,5 +7372,5 @@ msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:254 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:255 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -7385,7 +7514,7 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:203 msgid "" -"Take a photo of your GPS receiver while it displays the time." -"
            Display that photo here.
            And then, simply capture the time you read " -"on the photo and select a timezone

            " +"Take a photo of your GPS receiver while it displays the " +"time.
            Display that photo here.
            And then, simply capture the time you " +"read on the photo and select a timezone
            " msgstr "" "Zaman hesaplanırken GPS alıcınız fotoğrafını göster.
            Fotoğrafı " @@ -7455,5 +7584,6 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:484 -msgid "I can take a picture of my GPS receiver.
            Can this help?" +msgid "" +"I can take a picture of my GPS receiver.
            Can this help?" msgstr "GPS alıcımın resmini çizebilirim.
            yardımcı olurmu?" @@ -7499,5 +7629,5 @@ msgstr "Geçersiz zaman dilimi" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #, java-format msgid "" @@ -7508,14 +7638,14 @@ "İstenen format: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:579 msgid "Invalid offset" msgstr "Geçersiz offset" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:641 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:643 #, java-format msgid "Found {0} matchs of {1} in GPX track {2}" msgstr "Bulunan {0} den {1} eşleşim, GPX izi {2}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:642 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:644 msgid "GPX Track loaded" msgstr "GPX izi yüklendi" @@ -7523,5 +7653,5 @@ #: ../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/UploadDataGui.java:79 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 msgid "Upload Traces" msgstr "İzleri Yükle" @@ -7531,58 +7661,72 @@ msgstr "İzleri openstreetmap.org sitesine yükle" +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71 +msgid "Upload Trace" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +msgid "Public" +msgstr "" + #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 -msgid "Upload GPX track" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -msgid "Public" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 msgid "Selected makes your trace public in openstreetmap.org" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Description" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:123 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 msgid "Tags" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:182 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:153 +#, java-format +msgid "Selected track: {0}" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:176 msgid "Connecting..." msgstr "Bağlanıyor..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 -msgid "Uploading GPX track..." -msgstr "Bu izi yükle..." - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:214 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:199 +msgid "Upload cancelled" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:209 +msgid "Error while uploading" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:227 -msgid "Error while uploading" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:235 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +msgid "Upload failed. Server returned the following message: " +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 +#, java-format +msgid "Uploading GPX track: {0}% ({1} of {2})" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:252 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "GPX tabakası seçili değil. İz yüklenemez." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:241 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:244 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "İzleri Yükle" @@ -7803,15 +7947,15 @@ msgstr "Otomatik indir" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS tabaksı ({0}), otomatik indirildi, görüntü seviyesi {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS tabakası ({0}), görüntü seviyesi {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -7820,17 +7964,17 @@ "değiştirin" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:232 msgid "Download visible tiles" msgstr "Görünen mozaikleri indir" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241 msgid "Change resolution" msgstr "Çözünürlüğü değiştir" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:253 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:264 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:271 msgid "Alpha channel" msgstr "" @@ -7888,6 +8032,6 @@ "\n" "Tam WMS link formatı örnek (landsat)\n" -"http://onearth.jpl.nasa.gov/wms.cgi?" -"request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n" +"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&style" +"s=&srs=EPSG:4326&format=image/jpeg\n" "\n" "Metacarta Map Rectifier için http://labs.metacarta.com/rectifier/ , sadece " @@ -7895,6 +8039,6 @@ "Metacarta Map Rectifier menusunu eklemek için şu linki örnek olarak, 73 ü " "sizin 'id' niz ile değiştirin:\n" -"http://labs.metacarta.com/rectifier/wms.cgi?" -"id=73&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&\n" +"http://labs.metacarta.com/rectifier/wms.cgi?id=73&srs=EPSG:4326&Service=WMS&V" +"ersion=1.1.0&Request=GetMap&\n" "format=image/png" @@ -12721,4 +12865,42 @@ msgstr "" +#~ msgid "Please select something from the conflict list." +#~ msgstr "Lütfen çelişki listesinden bir seçim yapınız." + +#~ msgid "Upload this trace..." +#~ msgstr "Bu izi yükle..." + +#~ msgid "" +#~ "This functionality has been added only recently. Please
            use with " +#~ "care and check if it works as expected." +#~ msgstr "" +#~ "Bu özellik yeni eklenildi. Lütfen
            kullanırken dikkatli " +#~ "kullanınız." + +#~ msgid "Upload track filtered by JOSM" +#~ msgstr "JOSM tarafından filtrelenen izleri yükle" + +#~ msgid "Upload raw file: " +#~ msgstr "Ham dosya yükle: " + +#~ msgid "Description:" +#~ msgstr "Tanım:" + +#~ msgid "Tags (keywords in GPX):" +#~ msgstr "Etiketler (GPX deki anahtar isimler):" + +#~ msgid "GPX-Upload" +#~ msgstr "GPX-Yükle" + +#, java-format +#~ msgid "Upload raw file: {0}" +#~ msgstr "Ham dosya yükle: {0}" + +#~ msgid "Tags:" +#~ msgstr "Etiketler:" + +#~ msgid "Choose the hue for the track color by the velocity at that point." +#~ msgstr "Bu nokta için ivme izini gösteren rengi seç." + #~ msgid "Highway Exit" #~ msgstr "otoyol çıkış"