Ignore:
Timestamp:
2010-02-08T15:59:35+01:00 (17 years ago)
Author:
bastik
Message:

Updated i18n

File:
1 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/i18n/po/en_GB.po

    r19698 r19934  
    1111"Project-Id-Version: JOSM\n"
    1212"Report-Msgid-Bugs-To: \n"
    13 "POT-Creation-Date: 2010-01-31 16:51+0100\n"
    14 "PO-Revision-Date: 2010-01-31 08:02+0000\n"
    15 "Last-Translator: Michael Keppler <Bananeweizen@gmx.de>\n"
     13"POT-Creation-Date: 2010-02-08 15:25+0100\n"
     14"PO-Revision-Date: 2010-02-04 13:47+0000\n"
     15"Last-Translator: Bruce Cowan <Unknown>\n"
    1616"Language-Team: German <josm-dev@openstreetmap.org>\n"
    1717"MIME-Version: 1.0\n"
    … …  
    1919"Content-Transfer-Encoding: 8bit\n"
    2020"Plural-Forms: nplurals=2; plural=n != 1;\n"
    21 "X-Launchpad-Export-Date: 2010-01-31 15:37+0000\n"
     21"X-Launchpad-Export-Date: 2010-02-07 18:57+0000\n"
    2222"X-Generator: Launchpad (build Unknown)\n"
    2323
    … …  
    2727#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
    2828#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
    29 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
    30 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:314
    31 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184
     29#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
     30#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:317
     31#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209
    3232#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
    3333msgid "Help"
    … …  
    7474#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
    7575#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
    76 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
     76#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:742
    7777#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
    7878#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
    … …  
    8282#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
    8383#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
    84 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:199
    85 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:222
     84#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:214
     85#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:237
    8686#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:160
    8787#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
    88 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
    89 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:497
     88#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
     89#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:529
    9090#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
    9191#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
    … …  
    177177
    178178#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
     179#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:167
    179180#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:52
    180181msgid "Plugins"
    … …  
    213214
    214215#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
    215 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
     216#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:276
    216217#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
    217218msgid "Continue"
    … …  
    228229#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
    229230#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
     231#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:75
    230232#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
    231233#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
    … …  
    242244#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345
    243245#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
    244 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
     246#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
    245247#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
    246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
     248#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:880
    247249#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
    248250#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
    … …  
    255257#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
    256258#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
    257 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
     259#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
    258260#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
    259261#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
    260262#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
    261 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
     263#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
    262264#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
    263265#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
    264266#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
    265267#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
    266 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
     268#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
    267269#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
    268270#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
    … …  
    271273#: ../plugins/grid/src/grid/GridLayer.java:199
    272274#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
    273 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:105
    274 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
     275#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
     276#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
    275277#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
    276278#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
    … …  
    402404#: ../plugins/grid/src/grid/GridLayer.java:199
    403405#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
    404 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:105
     406#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
    405407#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
    406408#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
    … …  
    442444#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74
    443445#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
    444 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
     446#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:63
    445447#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
    446448#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36
    447449#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
    448450#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43
     451#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49
     452#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49
     453#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:51
    449454#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
    450455#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
    … …  
    455460#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
    456461#: ../plugins/terracer/src/terracer/TerracerAction.java:63
     462#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
    457463#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
    458464#, java-format
    … …  
    480486#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
    481487#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
    482 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
    483 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
     488#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844
     489#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873
    484490#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
    485491#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
    … …  
    583589#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39
    584590#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
    585 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:44
     591#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:37
     592#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:30
    586593#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
    587594#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:43
    … …  
    692699#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
    693700#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
    694 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
     701#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:902
    695702#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
    696 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
     703#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
    697704#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
    698 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
     705#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:231
    699706#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
    700707#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
    … …  
    744751msgstr "Download map data from the OSM server."
    745752
    746 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:43
    747 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:44
     753#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:36
     754#, fuzzy
     755msgid "Download object..."
     756msgstr "Download content"
     757
     758#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:36
     759#, fuzzy
     760msgid "Download OSM object by ID."
     761msgstr "Downloading OSM data..."
     762
     763#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:37
     764#, fuzzy
     765msgid "Download Object..."
     766msgstr "Downloading..."
     767
     768#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:42
     769#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
     770msgid "Separate Layer"
     771msgstr "Separate Layer"
     772
     773#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:43
     774#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
     775msgid "Select if the data should be downloaded into a new layer"
     776msgstr "Select if the data should be downloaded into a new layer"
     777
     778#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:45
     779#, fuzzy
     780msgid "Download referrers"
     781msgstr "Download referrers..."
     782
     783#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:46
     784#, fuzzy
     785msgid "Select if the referrers of the object should be downloaded as well"
     786msgstr "Select if the data should be downloaded into a new layer"
     787
     788#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:54
     789#, fuzzy
     790msgid "Object type:"
     791msgstr "Object history"
     792
     793#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:61
     794#, fuzzy
     795msgid "Object ID:"
     796msgstr "Object"
     797
     798#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63
     799#, fuzzy
     800msgid "Enter the ID of the object that should be downloaded"
     801msgstr "Enter an URL from where data should be downloaded"
     802
     803#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:74
     804#, fuzzy
     805msgid "Download Object"
     806msgstr "Download Data"
     807
     808#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:75
     809#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
     810#, fuzzy
     811msgid "Download object"
     812msgstr "Download content"
     813
     814#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:80
     815#, fuzzy
     816msgid "Start downloading"
     817msgstr "Start downloading data"
     818
     819#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:81
     820#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
     821msgid "Close dialog and cancel downloading"
     822msgstr "Close dialog and cancel downloading"
     823
     824#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29
     825#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:30
    748826msgid "Download parent ways/relations..."
    749827msgstr "Download parent ways/relations..."
    750828
    751 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:43
     829#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29
    752830msgid "Download primitives referring to one of the selected primitives"
    753831msgstr "Download primitives referring to one of the selected primitives"
    754 
    755 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:226
    756 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
    757 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
    758 #, java-format
    759 msgid "There was {0} conflict during import."
    760 msgid_plural "There were {0} conflicts during import."
    761 msgstr[0] "There was {0} conflict during import."
    762 msgstr[1] "There were {0} conflicts during import."
    763 
    764 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
    765 msgid "Conflict during download"
    766 msgid_plural "Conflicts during download"
    767 msgstr[0] "Conflict during download"
    768 msgstr[1] "Conflicts during download"
    769 
    770 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
    771 #, java-format
    772 msgid "({0}/{1}) Loading parents of node {2}"
    773 msgstr "({0}/{1}) Loading parents of node {2}"
    774 
    775 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
    776 #, java-format
    777 msgid "({0}/{1}) Loading parents of way {2}"
    778 msgstr "({0}/{1}) Loading parents of way {2}"
    779 
    780 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:258
    781 #, java-format
    782 msgid "({0}/{1}) Loading parents of relation {2}"
    783 msgstr "({0}/{1}) Loading parents of relation {2}"
    784832
    785833#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
    … …  
    796844
    797845#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
    798 #, fuzzy
    799846msgid "Duplicate Layer"
    800 msgstr "Duplicate Way"
     847msgstr "Duplicate Layer"
    801848
    802849#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
    803 #, fuzzy
    804850msgid "Make a duplicate of the currently selected layer."
    805 msgstr "Edit the currently selected relation"
     851msgstr "Make a duplicate of the currently selected layer."
    806852
    807853#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
    … …  
    813859#. Translators: "Copy of {layer name}"
    814860#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
    815 #, fuzzy, java-format
     861#, java-format
    816862msgid "Copy of {0}"
    817 msgstr "Zoom to {0}"
     863msgstr "Copy of {0}"
    818864
    819865#. Translators: "Copy {number} of {layer name}"
    … …  
    821867#, java-format
    822868msgid "Copy {1} of {0}"
    823 msgstr ""
     869msgstr "Copy {1} of {0}"
    824870
    825871#. <button label="Info" hotkey="I">
    … …  
    11821228
    11831229#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
    1184 #, fuzzy
    11851230msgid "<html>Cannot open directory.<br>Please select a file!</html>"
    1186 msgstr "<html>Cannot open directory.<br>Please select a file!"
     1231msgstr "<html>Cannot open directory.<br>Please select a file!</html>"
    11871232
    11881233#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:121
    … …  
    12151260msgstr "Open an URL."
    12161261
    1217 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
    1218 msgid "Separate Layer"
    1219 msgstr "Separate Layer"
    1220 
    1221 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
    1222 msgid "Select if the data should be downloaded into a new layer"
    1223 msgstr "Select if the data should be downloaded into a new layer"
    1224 
    12251262#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
    12261263msgid "Enter URL to download:"
    … …  
    12431280msgstr "Start downloading data"
    12441281
    1245 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
    1246 msgid "Close dialog and cancel downloading"
    1247 msgstr "Close dialog and cancel downloading"
    1248 
    12491282#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
    12501283msgid "Download Data"
    … …  
    12521285
    12531286#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
    1254 #, fuzzy
    12551287msgid ""
    12561288"<h3>When one or more ways are selected, the shape is adjusted such, that all "
    … …  
    12601292"shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
    12611293msgstr ""
    1262 "When one or more ways are selected, the shape is adjusted such, that all "
    1263 "angles are 90 or 180 degrees.<h3>You can add two nodes to the selection. "
    1264 "Then, the direction is fixed by these two reference nodes.(Afterwards, you "
     1294"<h3>When one or more ways are selected, the shape is adjusted such, that all "
     1295"angles are 90 or 180 degrees.</h3>You can add two nodes to the selection. "
     1296"Then, the direction is fixed by these two reference nodes. (Afterwards, you "
    12651297"can undo the movement for certain nodes:<br>Select them and press the "
    12661298"shortcut for Orthogonalise / Undo. The default is Shift-Q.)"
    … …  
    12731305
    12741306#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
    1275 #, fuzzy
    12761307msgid "Move nodes so all angles are 90 or 270 degrees"
    1277 msgstr "Move nodes so all angles are 90 or 270 degree"
     1308msgstr "Move nodes so all angles are 90 or 270 degrees"
    12781309
    12791310#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
    … …  
    13151346
    13161347#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
    1317 #, fuzzy
    13181348msgid "Selection must consist only of ways and nodes."
    1319 msgstr "Multipolygon must consist only of closed ways."
     1349msgstr "Selection must consist only of ways and nodes."
    13201350
    13211351#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186
    … …  
    13371367"orthogonalize them one by one.</html>"
    13381368msgstr ""
     1369"<html>Please make sure all selected ways head in a similar direction<br>or "
     1370"orthogonalise them one by one.</html>"
    13391371
    13401372#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
    1341 #, fuzzy
    13421373msgid "Please select ways with angles of approximately 90 or 180 degrees."
    1343 msgstr "Please select ways with almost right angles to orthogonalise."
     1374msgstr "Please select ways with angles of approximately 90 or 180 degrees."
    13441375
    13451376#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
    … …  
    14491480#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
    14501481#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
    1451 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
    1452 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
    1453 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
     1482#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
     1483#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
     1484#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
    14541485#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
    1455 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
     1486#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
    14561487#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
    14571488#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
    … …  
    14601491#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
    14611492#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
    1462 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
    1463 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
     1493#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
     1494#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
    14641495#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
    14651496#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
    … …  
    14681499#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
    14691500#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
    1470 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
     1501#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
    14711502#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
    14721503#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
    … …  
    14841515#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
    14851516#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
    1486 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
     1517#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
    14871518#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:66
    14881519#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:82
    … …  
    15171548#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
    15181549#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239
     1550#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:144
     1551#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:150
     1552#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:153
    15191553msgid "Save"
    15201554msgstr "Save"
    … …  
    16241658#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
    16251659#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
    1626 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
     1660#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:122
    16271661#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
    16281662#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
    … …  
    21652199msgstr "Errors during Download"
    21662200
     2201#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:177
     2202#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
     2203#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
     2204#, java-format
     2205msgid "There was {0} conflict during import."
     2206msgid_plural "There were {0} conflicts during import."
     2207msgstr[0] "There was {0} conflict during import."
     2208msgstr[1] "There were {0} conflicts during import."
     2209
     2210#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:182
     2211msgid "Conflict during download"
     2212msgid_plural "Conflicts during download"
     2213msgstr[0] "Conflict during download"
     2214msgstr[1] "Conflicts during download"
     2215
     2216#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:221
     2217#, java-format
     2218msgid "({0}/{1}) Loading parents of node {2}"
     2219msgstr "({0}/{1}) Loading parents of node {2}"
     2220
     2221#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:222
     2222#, java-format
     2223msgid "({0}/{1}) Loading parents of way {2}"
     2224msgstr "({0}/{1}) Loading parents of way {2}"
     2225
     2226#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:223
     2227#, java-format
     2228msgid "({0}/{1}) Loading parents of relation {2}"
     2229msgstr "({0}/{1}) Loading parents of relation {2}"
     2230
    21672231#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
    21682232msgid "Errors during download"
    … …  
    23062370#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
    23072371#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
    2308 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
     2372#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
    23092373#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
    23102374#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
    … …  
    33453409"{1}"
    33463410
    3347 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
     3411#: ../core/src/org/openstreetmap/josm/data/Version.java:47
    33483412#, java-format
    33493413msgid "Failed to load resource ''{0}'', error is {1}."
    33503414msgstr "Failed to load resource ''{0}'', error is {1}."
    33513415
    3352 #: ../core/src/org/openstreetmap/josm/data/Version.java:93
    3353 #: ../core/src/org/openstreetmap/josm/data/Version.java:156
     3416#: ../core/src/org/openstreetmap/josm/data/Version.java:98
     3417#: ../core/src/org/openstreetmap/josm/data/Version.java:161
    33543418msgid "UNKNOWN"
    33553419msgstr "UNKNOWN"
    33563420
    3357 #: ../core/src/org/openstreetmap/josm/data/Version.java:107
     3421#: ../core/src/org/openstreetmap/josm/data/Version.java:112
    33583422#, java-format
    33593423msgid ""
    … …  
    33623426"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
    33633427
    3364 #: ../core/src/org/openstreetmap/josm/data/Version.java:140
     3428#: ../core/src/org/openstreetmap/josm/data/Version.java:145
    33653429msgid "Warning: the revision file ''/REVISION'' is missing."
    33663430msgstr "Warning: the revision file ''/REVISION'' is missing."
    … …  
    34553519
    34563520#. should not happen
    3457 #.
    3458 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278
     3521#. FIXME: this message does not make sense, source version can not be lower than
     3522#. target version at this point
     3523#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:279
    34593524#, java-format
    34603525msgid ""
    … …  
    35293594msgstr "F"
    35303595
    3531 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
     3596#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:364
    35323597msgid "A primitive with ID = 0 cannot be invisible."
    35333598msgstr "A primitive with ID = 0 cannot be invisible."
    35343599
    3535 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
     3600#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:421
    35363601#, java-format
    35373602msgid "ID > 0 expected. Got {0}."
    35383603msgstr "ID > 0 expected. Got {0}."
    35393604
    3540 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
     3605#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:423
    35413606#, java-format
    35423607msgid "Version > 0 expected. Got {0}."
    35433608msgstr "version > 0 expected. Got {0}"
    35443609
    3545 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
     3610#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:634
    35463611#, java-format
    35473612msgid ""
    … …  
    35523617"{0}"
    35533618
    3554 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
     3619#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1006
    35553620msgid ""
    35563621"Cannot merge because either of the participating primitives is new and the "
    … …  
    35603625"other is not"
    35613626
    3562 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
     3627#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1008
    35633628#, java-format
    35643629msgid ""
    … …  
    35673632"Cannot merge primitives with different ids. This id is {0}, the other is {1}"
    35683633
    3569 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:572
    3570 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:593
    3571 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:610
    3572 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
    3573 msgid ""
    3574 "Tag collection cannot be applied to a primitive because there are keys with "
    3575 "multiple values."
    3576 msgstr ""
    3577 "Tag collection cannot be applied to a primitive because there are keys with "
    3578 "multiple values."
    3579 
    3580 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292
    3581 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314
    3582 #, java-format
    3583 msgid "Cannot add node {0} to incomplete way {1}."
    3584 msgstr "Cannot add node {0} to incomplete way {1}."
    3585 
    3586 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
    3587 #, java-format
    3588 msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
    3589 msgstr "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
    3590 
    3591 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
    3592 #, java-format
    3593 msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
    3594 msgstr "parameter {0} not in range 0..{1}, got {2}"
    3595 
    3596 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:188
    3597 msgid "Area style way is not closed."
    3598 msgstr "Area style way is not closed."
    3599 
    3600 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:266
    3601 msgid "More than one \"from\" way found."
    3602 msgstr "More than one \"from\" way found."
    3603 
    3604 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:272
    3605 msgid "More than one \"to\" way found."
    3606 msgstr "More than one \"to\" way found."
    3607 
    3608 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:278
    3609 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:292
    3610 msgid "More than one \"via\" found."
    3611 msgstr "More than one \"via\" found."
    3612 
    3613 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:283
    3614 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:297
    3615 #, java-format
    3616 msgid "Unknown role ''{0}''."
    3617 msgstr "Unknown role ''{0}''."
    3618 
    3619 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:300
    3620 #, java-format
    3621 msgid "Unknown member type for ''{0}''."
    3622 msgstr "Unknown member type for ''{0}''."
    3623 
    3624 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:306
    3625 msgid "No \"from\" way found."
    3626 msgstr "No \"from\" way found."
    3627 
    3628 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:310
    3629 msgid "No \"to\" way found."
    3630 msgstr "No \"to\" way found."
    3631 
    3632 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:314
    3633 msgid "No \"via\" node or way found."
    3634 msgstr "No \"via\" node or way found."
    3635 
    3636 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:323
    3637 msgid "The \"from\" way does not start or end at a \"via\" node."
    3638 msgstr "The \"from\" way does not start or end at a \"via\" node."
    3639 
    3640 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:327
    3641 msgid "The \"to\" way does not start or end at a \"via\" node."
    3642 msgstr "The \"to\" way does not start or end at a \"via\" node."
    3643 
    3644 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
    3645 msgid "The \"from\" way does not start or end at the \"via\" way."
    3646 msgstr "The \"from\" way does not start or end at the \"via\" way."
    3647 
    3648 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:359
    3649 msgid "The \"to\" way does not start or end at the \"via\" way."
    3650 msgstr "The \"to\" way does not start or end at the \"via\" way."
    3651 
    3652 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:453
    3653 #, java-format
    3654 msgid "Style for restriction {0} not found."
    3655 msgstr "Style for restriction {0} not found."
    3656 
    3657 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:525
    3658 #, java-format
    3659 msgid "Style for inner way ''{0}'' equals multipolygon."
    3660 msgstr "Style for inner way ''{0}'' equals multipolygon."
    3661 
    3662 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:553
    3663 #, java-format
    3664 msgid "Style for outer way ''{0}'' mismatches."
    3665 msgstr "Style for outer way ''{0}'' mismatches."
    3666 
    3667 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:751
    3668 #, java-format
    3669 msgid "Error: {0}"
    3670 msgstr "Error: {0}"
    3671 
    3672 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:751
    3673 #, java-format
    3674 msgid "Warning: {0}"
    3675 msgstr "Warning: {0}"
    3676 
    3677 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13
    3678 msgid "inactive"
    3679 msgstr "inactive"
    3680 
    3681 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
    3682 msgid "selected"
    3683 msgstr "selected"
    3684 
     3634#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
    36853635#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
    36863636#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
    3687 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
     3637#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:577
    36883638#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
    36893639msgid "node"
    … …  
    36923642msgstr[1] "nodes"
    36933643
     3644#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
    36943645#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
    3695 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
     3646#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:577
    36963647#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
    36973648msgid "way"
    … …  
    37013652
    37023653#. dark blue
     3654#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12
    37033655#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
    37043656#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
    37053657#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
    3706 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
     3658#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:577
    37073659#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
    37083660msgid "relation"
    … …  
    37113663msgstr[1] "relations"
    37123664
     3665#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:572
     3666#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:593
     3667#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:610
     3668#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
     3669msgid ""
     3670"Tag collection cannot be applied to a primitive because there are keys with "
     3671"multiple values."
     3672msgstr ""
     3673"Tag collection cannot be applied to a primitive because there are keys with "
     3674"multiple values."
     3675
     3676#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:291
     3677#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:313
     3678#, java-format
     3679msgid "Cannot add node {0} to incomplete way {1}."
     3680msgstr "Cannot add node {0} to incomplete way {1}."
     3681
     3682#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
     3683#, java-format
     3684msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
     3685msgstr "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
     3686
     3687#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
     3688#, java-format
     3689msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
     3690msgstr "parameter {0} not in range 0..{1}, got {2}"
     3691
     3692#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:188
     3693msgid "Area style way is not closed."
     3694msgstr "Area style way is not closed."
     3695
     3696#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:266
     3697msgid "More than one \"from\" way found."
     3698msgstr "More than one \"from\" way found."
     3699
     3700#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:272
     3701msgid "More than one \"to\" way found."
     3702msgstr "More than one \"to\" way found."
     3703
     3704#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:278
     3705#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:292
     3706msgid "More than one \"via\" found."
     3707msgstr "More than one \"via\" found."
     3708
     3709#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:283
     3710#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:297
     3711#, java-format
     3712msgid "Unknown role ''{0}''."
     3713msgstr "Unknown role ''{0}''."
     3714
     3715#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:300
     3716#, java-format
     3717msgid "Unknown member type for ''{0}''."
     3718msgstr "Unknown member type for ''{0}''."
     3719
     3720#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:306
     3721msgid "No \"from\" way found."
     3722msgstr "No \"from\" way found."
     3723
     3724#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:310
     3725msgid "No \"to\" way found."
     3726msgstr "No \"to\" way found."
     3727
     3728#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:314
     3729msgid "No \"via\" node or way found."
     3730msgstr "No \"via\" node or way found."
     3731
     3732#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:323
     3733msgid "The \"from\" way does not start or end at a \"via\" node."
     3734msgstr "The \"from\" way does not start or end at a \"via\" node."
     3735
     3736#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:327
     3737msgid "The \"to\" way does not start or end at a \"via\" node."
     3738msgstr "The \"to\" way does not start or end at a \"via\" node."
     3739
     3740#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
     3741msgid "The \"from\" way does not start or end at the \"via\" way."
     3742msgstr "The \"from\" way does not start or end at the \"via\" way."
     3743
     3744#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:359
     3745msgid "The \"to\" way does not start or end at the \"via\" way."
     3746msgstr "The \"to\" way does not start or end at the \"via\" way."
     3747
     3748#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:453
     3749#, java-format
     3750msgid "Style for restriction {0} not found."
     3751msgstr "Style for restriction {0} not found."
     3752
     3753#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:525
     3754#, java-format
     3755msgid "Style for inner way ''{0}'' equals multipolygon."
     3756msgstr "Style for inner way ''{0}'' equals multipolygon."
     3757
     3758#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:553
     3759#, java-format
     3760msgid "Style for outer way ''{0}'' mismatches."
     3761msgstr "Style for outer way ''{0}'' mismatches."
     3762
     3763#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:751
     3764#, java-format
     3765msgid "Error: {0}"
     3766msgstr "Error: {0}"
     3767
     3768#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:751
     3769#, java-format
     3770msgid "Warning: {0}"
     3771msgstr "Warning: {0}"
     3772
     3773#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13
     3774msgid "inactive"
     3775msgstr "inactive"
     3776
     3777#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
     3778msgid "selected"
     3779msgstr "selected"
     3780
    37133781#. teal
    37143782#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18
    … …  
    37233791#. darker blue
    37243792#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
    3725 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
     3793#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:181
    37263794#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
    37273795msgid "background"
    … …  
    38643932msgstr "<html>Could not write bookmark.<br>{0}</html>"
    38653933
    3866 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:198
     3934#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
    38673935#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39
    38683936msgid "Do not show again (remembers choice)"
    … …  
    39073975#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
    39083976#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
    3909 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
     3977#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:345
    39103978#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
    39113979#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
    … …  
    39654033#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
    39664034#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
     4035#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:172
    39674036msgid "Conflict"
    39684037msgstr "Conflict"
    … …  
    39744043#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
    39754044msgid "Authorisation Failed"
    3976 msgstr ""
     4045msgstr "Authorisation Failed"
    39774046
    39784047#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281
    3979 #, fuzzy
    39804048msgid "Authentication failed"
    39814049msgstr "Authentication failed"
    … …  
    39914059#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:481
    39924060#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
    3993 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
     4061#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
    39944062#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
    39954063msgid "Show help information"
    … …  
    42134281msgstr "Preference setting {0} has been removed since it is no longer used."
    42144282
    4215 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
     4283#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166
    42164284msgid "File"
    42174285msgstr "File"
    42184286
    4219 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
     4287#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
    42204288#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
    4221 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
     4289#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
    42224290#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
    42234291#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
    42244292#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
    4225 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:193
     4293#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:208
    42264294#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
    42274295#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
    … …  
    42324300msgstr "Edit"
    42334301
    4234 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166
     4302#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:168
    42354303msgid "View"
    42364304msgstr "View"
    42374305
    4238 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
     4306#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
    42394307#: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
    42404308msgid "Tools"
    42414309msgstr "Tools"
    42424310
    4243 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:168
     4311#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
    42444312#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
    42454313msgid "Presets"
    42464314msgstr "Presets"
    42474315
    4248 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:193
     4316#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:195
    42494317#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
    42504318#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:59
    … …  
    42554323msgstr "Menu: {0}"
    42564324
    4257 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:301
     4325#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304
    42584326msgid "Audio"
    42594327msgstr "Audio"
    … …  
    44244492#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
    44254493#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
    4426 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:477
     4494#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:491
    44274495#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
    44284496#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
    … …  
    44644532msgstr "role {0} is not participating in compare pair {1}"
    44654533
    4466 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:102
    4467 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
     4534#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:103
     4535#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:207
    44684536#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178
    44694537msgid "Properties"
    44704538msgstr "Properties"
    44714539
    4472 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:107
    4473 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
     4540#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:108
     4541#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:171
    44744542#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180
    44754543#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
    … …  
    44794547msgstr "Tags"
    44804548
    4481 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:112
    4482 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:243
     4549#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:113
     4550#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:256
    44834551#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139
    44844552#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
    … …  
    44864554msgstr "Nodes"
    44874555
    4488 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:117
    4489 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:238
     4556#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:118
     4557#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:251
    44904558#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270
    44914559#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
    … …  
    44934561msgstr "Members"
    44944562
    4495 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:166
     4563#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172
    44964564msgid "No pending tag conflicts to be resolved"
    44974565msgstr "No pending tag conflicts to be resolved"
    44984566
    4499 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
     4567#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175
    45004568#, java-format
    45014569msgid "Tags({0} conflict)"
    … …  
    45044572msgstr[1] "Tags({0} conflicts)"
    45054573
    4506 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
     4574#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
    45074575#, java-format
    45084576msgid "{0} pending tag conflict to be resolved"
    … …  
    45114579msgstr[1] "{0} pending tag conflicts to be resolved"
    45124580
    4513 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
     4581#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184
    45144582msgid "Nodes(resolved)"
    45154583msgstr "Nodes(resolved)"
    45164584
    4517 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178
     4585#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
    45184586msgid ""
    45194587"Merged node list frozen. No pending conflicts in the node list of this way"
    … …  
    45214589"Merged node list frozen. No pending conflicts in the node list of this way"
    45224590
    4523 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
     4591#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188
    45244592msgid "Nodes(with conflicts)"
    45254593msgstr "Nodes(with conflicts)"
    45264594
    4527 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:182
     4595#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
    45284596msgid "Pending conflicts in the node list of this way"
    45294597msgstr "Pending conflicts in the node list of this way"
    45304598
    4531 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
     4599#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:194
    45324600msgid "Members(resolved)"
    45334601msgstr "Members(resolved)"
    45344602
    4535 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187
     4603#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195
    45364604msgid ""
    45374605"Merged member list frozen. No pending conflicts in the member list of this "
    … …  
    45414609"relation"
    45424610
    4543 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
     4611#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
    45444612msgid "Members(with conflicts)"
    45454613msgstr "Members(with conflicts)"
    45464614
    4547 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191
     4615#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199
    45484616msgid "Pending conflicts in the member list of this relation"
    45494617msgstr "Pending conflicts in the member list of this relation"
    45504618
    4551 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199
     4619#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208
    45524620msgid "No pending property conflicts"
    45534621msgstr "No pending property conflicts"
    45544622
    4555 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
     4623#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:211
    45564624msgid "Properties(with conflicts)"
    45574625msgstr "Properties(with conflicts)"
    45584626
    4559 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:203
     4627#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212
    45604628msgid "Pending property conflicts to be resolved"
    45614629msgstr "Pending property conflicts to be resolved"
    45624630
    4563 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
     4631#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:292
    45644632msgid "Conflict Resolution"
    45654633msgstr "Conflict Resolution"
    45664634
    4567 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
    4568 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
     4635#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:334
     4636#, fuzzy, java-format
     4637msgid "{0} more..."
     4638msgstr "{0}, ..."
     4639
     4640#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:336
     4641#, fuzzy, java-format
     4642msgid "Following primitives could not be added because they are deleted: {0}"
     4643msgstr "Primitive {0} cannot be added to the relation because it was deleted."
     4644
     4645#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:604
     4646#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:628
    45694647#, java-format
    45704648msgid "List in role {0} is currently not participating in a compare pair."
    45714649msgstr "list in role {0} is currently not participating in a compare pair"
    45724650
    4573 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
     4651#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:777
    45744652#, java-format
    45754653msgid "Unexpected value of parameter ''index''. Got {0}."
    45764654msgstr "unexpected value of parameter \"index\". Got {0}"
    45774655
    4578 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
     4656#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:791
    45794657#, java-format
    45804658msgid "Item {0} not found in list."
    45814659msgstr "item {0} not found in list"
    45824660
    4583 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218
     4661#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:237
    45844662msgid "lock scrolling"
    45854663msgstr "lock scrolling"
    45864664
    4587 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226
     4665#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:245
    45884666msgid "Compare "
    45894667msgstr "Compare "
    45904668
    4591 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261
    4592 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78
     4669#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280
     4670#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85
    45934671msgid "My version"
    45944672msgstr "My version"
    45954673
    4596 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262
     4674#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:281
    45974675msgid "List of elements in my dataset, i.e. the local dataset"
    45984676msgstr "List of elements in my dataset, i.e. the local dataset"
    45994677
    4600 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267
    4601 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84
    4602 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
     4678#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
     4679#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:91
     4680#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:139
    46034681msgid "Merged version"
    46044682msgstr "Merged version"
    46054683
    4606 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268
     4684#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:287
    46074685msgid ""
    46084686"List of merged elements. They will replace the my elements when the merge "
    … …  
    46124690"decisions are applied."
    46134691
    4614 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273
    4615 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90
     4692#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292
     4693#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:97
    46164694msgid "Their version"
    46174695msgstr "Their version"
    46184696
    4619 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274
     4697#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:293
    46204698msgid "List of elements in their dataset, i.e. the server dataset"
    46214699msgstr "List of elements in their dataset, i.e. the server dataset"
    46224700
    4623 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406
     4701#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:425
    46244702msgid "> top"
    46254703msgstr "> top"
    46264704
    4627 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408
     4705#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:427
    46284706msgid "Copy my selected nodes to the start of the merged node list"
    46294707msgstr "Copy my selected nodes to the start of the merged node list"
    46304708
    4631 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433
     4709#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:452
    46324710msgid "> bottom"
    46334711msgstr "> bottom"
    46344712
    4635 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435
     4713#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:454
    46364714msgid "Copy my selected elements to the end of the list of merged elements."
    46374715msgstr "Copy my selected elements to the end of the list of merged elements"
    46384716
    4639 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462
     4717#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:481
    46404718msgid ""
    46414719"Copy my selected elements before the first selected element in the list of "
    … …  
    46454723"merged elements"
    46464724
    4647 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496
     4725#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:515
    46484726msgid ""
    46494727"Copy my selected elements after the first selected element in the list of "
    … …  
    46534731"merged elements"
    46544732
    4655 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525
     4733#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:544
    46564734msgid ""
    46574735"Copy their selected element to the start of the list of merged elements."
    … …  
    46594737"Copy their selected element to the start of the list of merged elements"
    46604738
    4661 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547
     4739#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
    46624740msgid "Copy their selected elements to the end of the list of merged elements."
    46634741msgstr "Copy their selected elements to the end of the list of merged elements"
    46644742
    4665 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569
     4743#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:588
    46664744msgid ""
    46674745"Copy their selected elements before the first selected element in the list "
    … …  
    46714749"of merged elements"
    46724750
    4673 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598
     4751#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:617
    46744752msgid ""
    46754753"Copy their selected element after the first selected element in the list of "
    … …  
    46794757"merged elements"
    46804758
    4681 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625
     4759#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:643
     4760#, fuzzy
     4761msgid "Use all mine elements"
     4762msgstr "Single elements"
     4763
     4764#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:669
     4765msgid "Use all their elements"
     4766msgstr ""
     4767
     4768#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
    46824769#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
    46834770msgid "Up"
    46844771msgstr "Up"
    46854772
    4686 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627
     4773#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
    46874774msgid "Move up the selected elements by one position."
    46884775msgstr "Move up the selected elements by one position"
    46894776
    4690 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657
     4777#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
    46914778#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115
    46924779msgid "Down"
    46934780msgstr "Down"
    46944781
    4695 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659
     4782#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:730
    46964783msgid "Move down the selected entries by one position."
    46974784msgstr "Move down the selected entries by one position"
    46984785
    4699 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689
     4786#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
    47004787#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30
    47014788#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
    … …  
    47064793msgstr "Remove"
    47074794
    4708 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691
     4795#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:762
    47094796msgid "Remove the selected entries from the list of merged elements."
    47104797msgstr "Remove the selected entries from the list of merged elements"
    47114798
    4712 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720
    4713 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757
     4799#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:791
     4800#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:828
    47144801msgid "Freeze"
    47154802msgstr "Freeze"
    47164803
    4717 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721
    4718 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758
     4804#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:792
     4805#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:829
    47194806msgid "Freeze the current list of merged elements."
    47204807msgstr "Freeze the current list of merged elements"
    47214808
    4722 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753
     4809#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:824
    47234810msgid "Unfreeze"
    47244811msgstr "Unfreeze"
    47254812
    4726 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754
     4813#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:825
    47274814msgid "Unfreeze the list of merged elements and start merging."
    47284815msgstr "Unfreeze the list of merged elements and start merging"
    47294816
    4730 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:779
     4817#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:850
    47314818#, java-format
    47324819msgid ""
    … …  
    47364823"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
    47374824
    4738 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:784
     4825#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:855
    47394826#, java-format
    47404827msgid ""
    … …  
    47454832"html>"
    47464833
    4747 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:802
     4834#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:873
    47484835#, java-format
    47494836msgid "My version ({0} entry)"
    … …  
    47524839msgstr[1] "My version ({0} entries)"
    47534840
    4754 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:805
     4841#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:876
    47554842#, java-format
    47564843msgid "Merged version ({0} entry)"
    … …  
    47594846msgstr[1] "Merged version ({0} entries)"
    47604847
    4761 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:808
     4848#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:879
    47624849#, java-format
    47634850msgid "Their version ({0} entry)"
    … …  
    47664853msgstr[1] "Their version ({0} entries)"
    47674854
    4768 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:871
     4855#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:942
    47694856#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79
    47704857#, java-format
    … …  
    47764863"adjustment."
    47774864
    4778 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:886
     4865#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:957
    47794866#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94
    47804867#, java-format
    … …  
    47864873msgstr "Node"
    47874874
    4788 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
     4875#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
    47894876msgid "Merged nodes not frozen yet. Cannot build resolution command."
    47904877msgstr "Merged nodes not frozen yet. Cannot build resolution command."
    47914878
    4792 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
    4793 #, java-format
    4794 msgid "Node {0} cannot be added to the way because it was deleted"
    4795 msgstr ""
    4796 
    4797 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
     4879#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:460
    47984880#, java-format
    47994881msgid ""
    … …  
    48044886"html>"
    48054887
    4806 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423
     4888#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464
    48074889msgid "Communication with server failed"
    48084890msgstr "Communication with server failed"
    48094891
    4810 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465
    4811 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499
     4892#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
     4893#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:540
    48124894msgid "Yes, undelete them too"
    48134895msgstr "Yes, undelete them too"
    48144896
    4815 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466
    4816 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:500
     4897#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:507
     4898#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:541
    48174899msgid "No, cancel operation"
    48184900msgstr "No, cancel operation"
    48194901
    4820 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470
     4902#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511
    48214903#, java-format
    48224904msgid ""
    … …  
    48334915"server.<br><br>Do you want to undelete these nodes too?"
    48344916
    4835 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:480
     4917#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:521
    48364918msgid "Undelete additional nodes?"
    48374919msgstr "Undelete additional nodes?"
    48384920
    4839 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504
     4921#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545
    48404922#, java-format
    48414923msgid ""
    … …  
    48524934"deleted on the server.<br><br>Do you want to undelete them too?"
    48534935
    4854 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
     4936#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:555
    48554937msgid "Undelete dependent primitives?"
    48564938msgstr "Undelete dependent primitives?"
    48574939
    4858 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:79
     4940#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86
    48594941msgid "Properties in my dataset, i.e. the local dataset"
    48604942msgstr "Properties in my dataset, i.e. the local dataset"
    48614943
    4862 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85
     4944#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92
    48634945msgid ""
    48644946"Properties in the merged element. They will replace properties in my "
    … …  
    48684950"elements when merge decisions are applied."
    48694951
    4870 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:91
     4952#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98
    48714953msgid "Properties in their dataset, i.e. the server dataset"
    48724954msgstr "Properties in their dataset, i.e. the server dataset"
    48734955
    4874 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:107
     4956#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:114
    48754957msgid "Coordinates:"
    48764958msgstr "Coordinates:"
    48774959
    4878 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182
     4960#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:188
    48794961msgid "Deleted State:"
    48804962msgstr "Deleted State:"
    48814963
    4882 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258
     4964#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
    48834965msgid "Visible State:"
    48844966msgstr "Visible State:"
    48854967
    4886 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338
    4887 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350
    4888 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359
    4889 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368
     4968#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340
     4969#, fuzzy
     4970msgid "Referenced by:"
     4971msgstr "Reference"
     4972
     4973#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
     4974#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:388
     4975#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:397
     4976#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:406
     4977#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415
    48904978#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
    48914979msgid "(none)"
    48924980msgstr "(none)"
    48934981
    4894 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352
     4982#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:390
    48954983#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77
    48964984msgid "deleted"
    48974985msgstr "deleted"
    48984986
    4899 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354
     4987#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:392
    49004988msgid "not deleted"
    49014989msgstr "not deleted"
    49024990
    4903 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361
     4991#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:399
    49044992msgid "visible (on the server)"
    49054993msgstr "visible (on the server)"
    49064994
    4907 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363
     4995#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:401
    49084996msgid "not visible (on the server)"
    49094997msgstr "not visible (on the server)"
    49104998
    4911 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370
     4999#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:408
    49125000msgid "Keep a clone of the local version"
    49135001msgstr "Keep a clone of the local version"
    49145002
    4915 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372
     5003#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:410
    49165004msgid "Physically delete from local dataset"
    49175005msgstr "Physically delete from local dataset"
    49185006
    4919 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471
     5007#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:528
    49205008msgid "Keep my coordiates"
    49215009msgstr "Keep my coordiates"
    49225010
    4923 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486
     5011#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:543
    49245012msgid "Keep their coordiates"
    49255013msgstr "Keep their coordiates"
    49265014
    4927 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501
     5015#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:558
    49285016msgid "Undecide conflict between different coordinates"
    49295017msgstr "Undecide conflict between different coordinates"
    49305018
    4931 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516
     5019#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:573
    49325020msgid "Keep my deleted state"
    49335021msgstr "Keep my deleted state"
    49345022
    4935 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531
     5023#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588
    49365024msgid "Keep their deleted state"
    49375025msgstr "Keep their deleted state"
    49385026
    4939 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546
     5027#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:603
    49405028msgid "Undecide conflict between deleted state"
    49415029msgstr "Undecide conflict between deleted state"
    49425030
    4943 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561
     5031#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
    49445032msgid "Keep my visible state"
    49455033msgstr "Keep my visible state"
    49465034
    4947 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576
     5035#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
    49485036msgid "Yes, reset the id"
    49495037msgstr "Yes, reset the id"
    49505038
    4951 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
    4952 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
     5039#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634
     5040#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675
    49535041#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
    49545042msgid "No, abort"
    49555043msgstr "No, abort"
    49565044
    4957 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581
     5045#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:638
    49585046#, java-format
    49595047msgid ""
    … …  
    49665054"yo agree?</html>"
    49675055
    4968 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588
     5056#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:645
    49695057msgid "Reset id to 0"
    49705058msgstr "Reset id to 0"
    49715059
    4972 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602
     5060#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:659
    49735061msgid "Keep their visible state"
    49745062msgstr "Keep their visible state"
    49755063
    4976 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617
     5064#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:674
    49775065msgid "Yes, purge it"
    49785066msgstr "Yes, purge it"
    49795067
    4980 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622
     5068#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:679
    49815069#, java-format
    49825070msgid ""
    … …  
    49875075"dataset.<br>Do you agree?</html>"
    49885076
    4989 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627
     5077#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:684
    49905078msgid "Remove from dataset"
    49915079msgstr "Remove from dataset"
    49925080
    4993 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641
     5081#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:698
    49945082msgid "Undecide conflict between visible state"
    49955083msgstr "Undecide conflict between visible state"
    … …  
    50005088msgstr "Primitive"
    50015089
    5002 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
    5003 #, java-format
    5004 msgid "Primitive {0} cannot be added to the relation because it was deleted."
    5005 msgstr ""
    5006 
    5007 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
     5090#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:121
    50085091msgid "Merged nodes not frozen yet. Cannot build resolution command"
    50095092msgstr "Merged nodes not frozen yet. Cannot build resolution command"
    … …  
    50375120#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
    50385121#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
    5039 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:196
    5040 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:448
     5122#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
     5123#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
    50415124#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
    50425125#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
    … …  
    50505133#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
    50515134#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
    5052 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:227
    5053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:448
     5135#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
     5136#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
    50545137#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
    50555138#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
    … …  
    50665149msgstr "cannot apply undecided tag merge item"
    50675150
    5068 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
     5151#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:128
    50695152msgid "My version (local dataset)"
    50705153msgstr "My version (local dataset)"
    50715154
    5072 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
     5155#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:151
    50735156msgid "Their version (server dataset)"
    50745157msgstr "Their version (server dataset)"
    50755158
    5076 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
     5159#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:274
    50775160msgid "Keep the selected key/value pairs from the local dataset"
    50785161msgstr "Keep the selected key/value pairs from the local dataset"
    50795162
    5080 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
     5163#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:304
    50815164msgid "Keep the selected key/value pairs from the server dataset"
    50825165msgstr "Keep the selected key/value pairs from the server dataset"
    50835166
    5084 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378
     5167#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:397
    50855168msgid "Undecide"
    50865169msgstr "Undecide"
    50875170
    5088 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
     5171#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:399
    50895172msgid "Mark the selected tags as undecided"
    50905173msgstr "Mark the selected tags as undecided"
    … …  
    52165299
    52175300#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
    5218 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
     5301#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
    52195302#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
    52205303#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
    … …  
    52265309
    52275310#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
    5228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
     5311#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:349
    52295312#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
    52305313#, java-format
    … …  
    54305513#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
    54315514#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
    5432 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
     5515#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:458
    54335516#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
    54345517#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
    … …  
    54505533msgstr "Resolve conflicts."
    54515534
    5452 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
     5535#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
     5536#, fuzzy, java-format
     5537msgid "Conflicts: {0} unresolved"
     5538msgstr "Conflicts: {0}"
     5539
     5540#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
    54535541msgid "Resolve"
    54545542msgstr "Resolve"
    54555543
    5456 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
     5544#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328
    54575545msgid "Open a merge dialog of all selected items in the list above."
    54585546msgstr "Open a merge dialogue of all selected items in the list above."
    54595547
    5460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
     5548#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348
    54615549#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
    54625550#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
    … …  
    54665554"Set the selected elements on the map to the selected items in the list above."
    54675555
    5468 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167
     5556#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
    54695557msgid "Cancel conflict resolution and close the dialog"
    54705558msgstr "Cancel conflict resolution and close the dialog"
    54715559
    5472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
     5560#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225
    54735561msgid "Apply resolved conflicts and close the dialog"
    54745562msgstr "Apply resolved conflicts and close the dialogue"
    54755563
    5476 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201
     5564#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226
    54775565msgid "Apply Resolution"
    54785566msgstr "Apply Resolution"
    54795567
    5480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213
     5568#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238
    54815569msgid "Close anyway"
    54825570msgstr "Close anyway"
    54835571
    5484 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214
     5572#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239
    54855573msgid "Continue resolving"
    54865574msgstr "Continue resolving"
    54875575
    5488 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216
     5576#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241
    54895577#, java-format
    54905578msgid ""
    54915579"<html>You did not finish to merge the differences in this conflict."
    54925580"<br>Conflict resolutions will not be applied unless all differences<br>are "
    5493 "resolved.<br>Click <strong>{0}</strong> to close anyway."
    5494 "<strong>Already<br>resolved differences will not be applied.</"
    5495 "strong><br>Click <strong>{1}</strong> to return to resolving conflicts.</"
    5496 "html>"
    5497 msgstr ""
    5498 
    5499 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224
     5581"resolved.<br>Click <strong>{0}</strong> to close anyway.<strong> "
     5582"Already<br>resolved differences will not be applied.</strong><br>Click "
     5583"<strong>{1}</strong> to return to resolving conflicts.</html>"
     5584msgstr ""
     5585"<html>You did not finish to merge the differences in this conflict."
     5586"<br>Conflict resolutions will not be applied unless all differences<br>are "
     5587"resolved.<br>Click <strong>{0}</strong> to close anyway.<strong> "
     5588"Already<br>resolved differences will not be applied.</strong><br>Click "
     5589"<strong>{1}</strong> to return to resolving conflicts.</html>"
     5590
     5591#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
    55005592msgid "Conflict not resolved completely"
    55015593msgstr "Conflict not resolved completely"
    55025594
    5503 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261
     5595#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286
    55045596msgid "Resolve conflicts"
    55055597msgstr "Resolve conflicts"
    55065598
    5507 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263
     5599#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288
    55085600#, java-format
    55095601msgid "Resolve conflicts for ''{0}''"
    … …  
    55155607
    55165608#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
    5517 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
     5609#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
    55185610#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
    5519 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
     5611#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:195
    55205612#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
    55215613#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
    … …  
    55285620
    55295621#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
     5622#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:144
     5623#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:150
     5624#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:153
    55305625msgid "Add filter."
    55315626msgstr "Add filter."
    … …  
    55765671msgstr "Display the history of all selected items."
    55775672
    5578 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:254
     5673#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
    55795674msgid "Object with history"
    55805675msgstr "Object with history"
    55815676
    5582 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
     5677#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
    55835678#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
    5584 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142
     5679#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:140
    55855680#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512
    55865681#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
    … …  
    55885683msgstr "Reload"
    55895684
    5590 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
     5685#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:273
    55915686msgid "Reload all currently selected objects and refresh the list."
    55925687msgstr "Reload all currently selected objects and refresh the list."
    55935688
    5594 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311
     5689#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:312
    55955690msgid "Show"
    55965691msgstr "Show"
    55975692
    5598 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:312
     5693#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:313
    55995694msgid "Display the history of the selected objects."
    56005695msgstr "Display the history of the selected objects."
    … …  
    56355730
    56365731#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
    5637 #, fuzzy
    56385732msgid "Duplicate this layer"
    5639 msgstr "Duplicate Way"
     5733msgstr "Duplicate this layer"
    56405734
    56415735#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
    … …  
    57235817msgstr "Zoom to selection"
    57245818
    5725 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
     5819#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:297
    57265820#, java-format
    57275821msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
    57285822msgstr "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
    57295823
    5730 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
     5824#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:299
    57315825#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
    57325826#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
    … …  
    57345828msgstr "Selection"
    57355829
    5736 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
     5830#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:351
    57375831#, java-format
    57385832msgid "Selection: {0}"
    … …  
    58275921
    58285922#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
    5829 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:125
     5923#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
    58305924msgid "Close the dialog"
    58315925msgstr "Close the dialogue"
    … …  
    69917085
    69927086#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:47
    6993 msgid "Enter a changset id"
    6994 msgstr "Enter a changset id"
     7087msgid "Enter a changeset id"
     7088msgstr "Enter a changeset id"
    69957089
    69967090#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:79
    … …  
    70107104#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
    70117105#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
     7106#: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:48
    70127107msgid "Please enter an integer value > 0"
    70137108msgstr "Please enter an integer value > 0"
    … …  
    72057300#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:109
    72067301msgid ""
    7207 "<html>Select to restrict the query to your changsets only.<br>Unselect to "
     7302"<html>Select to restrict the query to your changesets only.<br>Unselect to "
    72087303"include all changesets in the query.</html>"
    72097304msgstr ""
    7210 "<html>Select to restrict the query to your changsets only.<br>Unselect to "
     7305"<html>Select to restrict the query to your changesets only.<br>Unselect to "
    72117306"include all changesets in the query.</html>"
    72127307
    … …  
    73047399msgstr "This changeset query URL is invalid"
    73057400
    7306 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
     7401#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:183
    73077402#, java-format
    73087403msgid "This will change {0} object."
    … …  
    73117406msgstr[1] "This will change up to {0} objects."
    73127407
    7313 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:183
     7408#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:185
    73147409msgid "An empty value deletes the tag."
    73157410msgstr "An empty value deletes the tag."
    73167411
    7317 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
    7318 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:274
    7319 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
    7320 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
    7321 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
     7412#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:235
     7413#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:280
     7414#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:288
     7415#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:476
     7416#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
     7417#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:114
    73227418msgid "<different>"
    73237419msgstr "<different>"
    73247420
    7325 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
    7326 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:363
     7421#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
     7422#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:377
    73277423msgid "Change values?"
    73287424msgstr "Change values?"
    73297425
    7330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:296
     7426#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:310
    73317427#, java-format
    73327428msgid "Change properties of up to {0} object"
    … …  
    73357431msgstr[1] "Change properties of up to {0} objects"
    73367432
    7337 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
     7433#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:350
    73387434#, java-format
    73397435msgid "This will change up to {0} object."
    … …  
    73427438msgstr[1] "This will change up to {0} objects."
    73437439
    7344 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:338
     7440#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
    73457441msgid "Please select a key"
    73467442msgstr "Please select a key"
    73477443
    7348 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
     7444#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:365
    73497445msgid "Please select a value"
    73507446msgstr "Please select a value"
    73517447
    7352 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:437
     7448#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:451
    73537449msgid "Please select the objects you want to change properties for."
    73547450msgstr "Please select the objects you want to change properties for."
    73557451
    7356 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443
    7357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
     7452#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457
     7453#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:458
    73587454msgid "Properties/Memberships"
    73597455msgstr "Properties/Memberships"
    73607456
    7361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443
     7457#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457
    73627458msgid "Properties for selected objects."
    73637459msgstr "Properties for selected objects."
    73647460
    73657461#. setting up the membership table
    7366 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:477
     7462#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:491
    73677463msgid "Member Of"
    73687464msgstr "Member Of"
    73697465
    7370 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:566
     7466#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:580
    73717467msgid "Add Properties"
    73727468msgstr "Add Properties"
    73737469
    7374 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
     7470#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:823
    73757471#, java-format
    73767472msgid "Properties: {0} / Memberships: {1}"
    73777473msgstr "Properties: {0} / Memberships: {1}"
    73787474
    7379 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
     7475#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:826
    73807476msgid "Properties / Memberships"
    73817477msgstr "Properties / Memberships"
    73827478
    7383 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
     7479#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:879
    73847480msgid "Change relation"
    73857481msgstr "Change relation"
    73867482
    7387 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
     7483#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:880
    73887484msgid "Delete from relation"
    73897485msgstr "Delete from relation"
    73907486
    7391 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
     7487#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
    73927488#, java-format
    73937489msgid "Really delete selection from relation {0}?"
    73947490msgstr "Really delete selection from relation {0}?"
    73957491
    7396 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
     7492#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:903
    73977493msgid "Delete the selected key in all objects"
    73987494msgstr "Delete the selected key in all objects"
    73997495
    7400 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
     7496#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:905
    74017497msgid "Delete Properties"
    74027498msgstr "Delete Properties"
    74037499
    7404 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
     7500#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:936
    74057501msgid "Add a new key/value pair to all objects"
    74067502msgstr "Add a new key/value pair to all objects"
    74077503
    7408 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
     7504#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:948
    74097505msgid "Edit the value of the selected key for all objects"
    74107506msgstr "Edit the value of the selected key for all objects"
    74117507
    7412 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
     7508#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:984
    74137509msgid "Select relation"
    74147510msgstr "Select relation"
    74157511
    7416 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
     7512#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:985
    74177513msgid "Select relation in main selection."
    74187514msgstr "Select relation in main selection."
    74197515
    7420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
     7516#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
    74217517msgid "Select in relation list"
    74227518msgstr "Select in relation list"
    74237519
    7424 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
     7520#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
    74257521msgid "Select relation in relation list."
    74267522msgstr "Select relation in relation list."
    … …  
    76957791
    76967792#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
    7697 msgid ""
    7698 "Click to to return to the relation editor and to resume relation editing"
    7699 msgstr ""
    7700 "Click to to return to the relation editor and to resume relation editing"
     7793msgid "Click to return to the relation editor and to resume relation editing"
     7794msgstr "Click to return to the relation editor and to resume relation editing"
    77017795
    77027796#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
    … …  
    78987992
    78997993#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
    7900 #, fuzzy
    79017994msgid ""
    79027995"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
    79037996"maxlat): </html>"
    79047997msgstr ""
    7905 "<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
    7906 "maxlon): {0}, {1}, {2}, {3}</html>"
     7998"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
     7999"maxlat): </html>"
    79078000
    79088001#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
    … …  
    81468239#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
    81478240#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
     8241#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:45
     8242#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:56
     8243#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:58
    81488244#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:45
    81498245#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:56
    … …  
    82198315"is not available yet. It is missing both in your local language ({1}) and in "
    82208316"english.<br><br>Please help to improve the JOSM help system and fill in the "
    8221 "missing information.You can both edit the <a href=\"{2}\">help topic in your "
    8222 "local language ({1})</a> and the <a href=\"{3}\">help topic in english</a>.</"
    8223 "p></html>"
     8317"missing information. You can both edit the <a href=\"{2}\">help topic in "
     8318"your local language ({1})</a> and the <a href=\"{3}\">help topic in english</"
     8319"a>.</p></html>"
    82248320msgstr ""
    82258321"<html><p class=\"warning-header\">Help content for help topic missing</p><p "
    … …  
    82278323"is not available yet. It is missing both in your local language ({1}) and in "
    82288324"english.<br><br>Please help to improve the JOSM help system and fill in the "
    8229 "missing information.You can both edit the <a href=\"{2}\">help topic in your "
    8230 "local language ({1})</a> and the <a href=\"{3}\">help topic in english</a>.</"
    8231 "p></html>"
     8325"missing information. You can both edit the <a href=\"{2}\">help topic in "
     8326"your local language ({1})</a> and the <a href=\"{3}\">help topic in english</"
     8327"a>.</p></html>"
    82328328
    82338329#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
    … …  
    82488344msgid ""
    82498345"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
    8250 "network problem, please check your<br>your internet connection</html>"
     8346"network problem, please check<br>your internet connection</html>"
    82518347msgstr ""
    82528348"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
    8253 "network problem, please check your<br>your internet connection</html>"
     8349"network problem, please check<br>your internet connection</html>"
    82548350
    82558351#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354
    … …  
    83368432msgstr "History for relation {0}"
    83378433
    8338 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:143
     8434#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:141
    83398435msgid "Reload the history from the server"
    83408436msgstr "Reload the history from the server"
    … …  
    87268822
    87278823#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238
    8728 msgid "Please enter the password name of your OSM account"
    8729 msgstr "Please enter the password name of your OSM account"
     8824msgid "Please enter the password of your OSM account"
     8825msgstr "Please enter the password of your OSM account"
    87308826
    87318827#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240
    … …  
    87988894#, java-format
    87998895msgid ""
    8800 "Warning: Failed to retrieve user infos for the current JOSM user. Exceptions "
     8896"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
    88018897"was: {0}"
    88028898msgstr ""
    8803 "Warning: Failed to retrieve user infos for the current JOSM user. Exceptions "
    8804 "was: {0}"
    88058899
    88068900#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
    … …  
    92689362
    92699363#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80
    9270 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280
     9364#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:275
    92719365msgid "Continue uploading"
    92729366msgstr "Continue uploading"
    … …  
    92959389#, java-format
    92969390msgid ""
    9297 "The server reported that the current changset was closed.<br>This is most "
     9391"The server reported that the current changeset was closed.<br>This is most "
    92989392"likely because the changesets size exceeded the max. size<br>of {0} objects "
    92999393"on the server ''{1}''."
    93009394msgstr ""
    9301 "The server reported that the current changset was closed.<br>This is most "
    9302 "likely because the changesets size exceeded the max. size<br>of {0} objects "
    9303 "on the server ''{1}''."
    93049395
    93059396#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
    … …  
    93149405msgid ""
    93159406"Click ''<strong>{0}</strong>'' to continue uploading to additional new "
    9316 "changsets.<br>Click ''<strong>{1}</strong>'' to return to the upload dialog."
     9407"changesets.<br>Click ''<strong>{1}</strong>'' to return to the upload dialog."
    93179408"<br>Click ''<strong>{2}</strong>'' to abort uploading and return to map "
    93189409"editing.<br>"
    93199410msgstr ""
    93209411"Click ''<strong>{0}</strong>'' to continue uploading to additional new "
    9321 "changsets.<br>Click ''<strong>{1}</strong>'' to return to the upload dialog."
     9412"changesets.<br>Click ''<strong>{1}</strong>'' to return to the upload dialog."
    93229413"<br>Click ''<strong>{2}</strong>'' to abort uploading and return to map "
    93239414"editing.<br>"
    … …  
    93549445"Ignoring caught exception because upload is canceled. Exception is: {0}"
    93559446
    9356 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63
     9447#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:60
    93579448msgid ""
    93589449"<html>Mark modified objects <strong>from the current selection</strong> to "
    … …  
    93629453"be uploaded to the server.</html>"
    93639454
    9364 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73
     9455#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:70
    93659456msgid ""
    93669457"<html>Mark <strong>locally deleted objects</strong> to be deleted on the "
    … …  
    93709461"server.</html>"
    93719462
    9372 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113
     9463#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:112
    93739464msgid "Select objects to upload"
    93749465msgstr "Select objects to upload"
    93759466
    9376 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266
     9467#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:261
    93779468msgid "Cancel uploading"
    93789469msgstr "Cancel uploading"
    … …  
    96849775
    96859776#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
    9686 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
     9777#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:637
    96879778#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
    96889779#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
    … …  
    98299920msgstr "API version: {0}"
    98309921
    9831 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
     9922#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
    98329923#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
    98339924msgid "Convert to GPX layer"
    98349925msgstr "Convert to GPX layer"
    98359926
    9836 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
     9927#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727
    98379928msgid "Dataset consistency test"
    98389929msgstr "Dataset consistency test"
    98399930
    9840 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
     9931#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733
    98419932msgid "No problems found"
    98429933msgstr "No problems found"
    98439934
    9844 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
     9935#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736
    98459936msgid "Following problems found:"
    98469937msgstr "Following problems found:"
    … …  
    98929983msgstr "GPS point"
    98939984
    9894 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
     9985#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
    98959986msgid "GPX Files (*.gpx *.gpx.gz)"
    98969987msgstr "GPX Files (*.gpx *.gpx.gz)"
    98979988
    9898 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
     9989#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
    98999990#, java-format
    99009991msgid "File {0} is loaded yet under the name \"{1}\""
    99019992msgstr "File {0} is loaded yet under the name \"{1}\""
    99029993
    9903 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
     9994#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190
    99049995#, java-format
    99059996msgid "Error while parsing {0}"
    99069997msgstr "Error while parsing {0}"
    99079998
    9908 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
     9999#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
    990910000#, java-format
    991010001msgid "Could not read \"{0}\""
    991110002msgstr "Could not read \"{0}\""
    991210003
    9913 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
     10004#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
    991410005msgid ""
    991510006"<html>Take a photo of your GPS receiver while it displays the time."
    … …  
    992110012"on the photo and select a timezone<hr></html>"
    992210013
    9923 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
     10014#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
    992410015msgid "Photo time (from exif):"
    992510016msgstr "Photo time (from exif):"
    992610017
    9927 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
     10018#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
    992810019msgid "Gps time (read from the above photo): "
    992910020msgstr "Gps time (read from the above photo): "
    993010021
    9931 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
     10022#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283
    993210023msgid " [dd/mm/yyyy hh:mm:ss]"
    993310024msgstr " [dd/mm/yyyy hh:mm:ss]"
    993410025
    9935 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
     10026#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
    993610027msgid "I am in the timezone of: "
    993710028msgstr "I am in the timezone of: "
    993810029
    9939 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
    9940 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
     10030#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
     10031#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
    994110032msgid "No date"
    994210033msgstr "No date"
    994310034
    9944 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
     10035#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
    994510036msgid "Open another photo"
    994610037msgstr "Open another photo"
    994710038
    9948 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
     10039#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
    994910040msgid "Synchronize time from a photo of the GPS receiver"
    995010041msgstr "Synchronise time from a photo of the GPS receiver"
    995110042
    9952 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
     10043#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
    995310044msgid ""
    995410045"Error while parsing the date.\n"
    … …  
    995810049"Please use the requested format"
    995910050
    9960 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
     10051#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
    996110052msgid "Invalid date"
    996210053msgstr "Invalid date"
    996310054
    9964 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
     10055#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
    996510056msgid "<No GPX track loaded yet>"
    996610057msgstr "<No GPX track loaded yet>"
    996710058
    9968 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
     10059#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
    996910060msgid "GPX track: "
    997010061msgstr "GPX track: "
    997110062
    9972 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
     10063#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
    997310064msgid "Open another GPX trace"
    997410065msgstr "Open another GPX trace"
    997510066
    9976 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
     10067#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
    997710068msgid ""
    997810069"<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
    … …  
    998010071"<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
    998110072
    9982 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
     10073#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
    998310074msgid "Auto-Guess"
    998410075msgstr "Auto-Guess"
    998510076
    9986 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
     10077#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
    998710078msgid "Manual adjust"
    998810079msgstr "Manual adjust"
    998910080
    9990 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
     10081#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
    999110082msgid "Override position for: "
    999210083msgstr "Override position for: "
    999310084
    9994 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
     10085#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
    999510086#, java-format
    999610087msgid "Images with geo location in exif data ({0}/{1})"
    999710088msgstr "Images with geo location in exif data ({0}/{1})"
    999810089
    9999 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
     10090#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
    1000010091#, java-format
    1000110092msgid "Images that are already tagged ({0}/{1})"
    1000210093msgstr "Images that are already tagged ({0}/{1})"
    1000310094
    10004 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
     10095#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
    1000510096msgid "Show Thumbnail images on the map"
    1000610097msgstr "Show Thumbnail images on the map"
    1000710098
    10008 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
     10099#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
    1000910100msgid "Timezone: "
    1001010101msgstr "Timezone: "
    1001110102
    10012 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
     10103#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
    1001310104msgid "Offset:"
    1001410105msgstr "Offset:"
    1001510106
    10016 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
     10107#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
    1001710108msgid "No gpx selected"
    1001810109msgstr "No gpx selected"
    … …  
    1011710208msgstr "No selected GPX track"
    1011810209
    10119 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
     10210#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1265
    1012010211#, java-format
    1012110212msgid ""
    … …  
    1012610217"Expected format: {0}"
    1012710218
    10128 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
     10219#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1335
    1012910220#, java-format
    1013010221msgid ""
    … …  
    1017810269
    1017910270#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
    10180 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
     10271#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:63
    1018110272msgid "Geotagged Images"
    1018210273msgstr "Geotagged Images"
    … …  
    1018610277msgstr "Correlate to GPX"
    1018710278
    10188 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
     10279#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:334
    1018910280#, java-format
    1019010281msgid "{0} image loaded."
    … …  
    1019310284msgstr[1] "{0} images loaded."
    1019410285
    10195 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
     10286#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:335
    1019610287#, java-format
    1019710288msgid "{0} was found to be GPS tagged."
    … …  
    1020010291msgstr[1] "{0} were found to be GPS tagged."
    1020110292
    10202 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
    10203 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
     10293#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
     10294#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:105
    1020410295msgid "Delete image file from disk"
    1020510296msgstr "Delete image file from disk"
    1020610297
    10207 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
     10298#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:610
    1020810299#, java-format
    1020910300msgid ""
    … …  
    1021410305"permanently lost!</h3></html>"
    1021510306
    10216 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
     10307#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
    1021710308msgid "Image file could not be deleted."
    1021810309msgstr "Image file could not be deleted."
    … …  
    1023310324msgstr "Error on file {0}"
    1023410325
    10235 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
     10326#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:63
    1023610327msgid "Display geotagged images"
    1023710328msgstr "Display geotagged images"
    1023810329
    10239 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
     10330#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:83
    1024010331#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
    1024110332msgid "Previous"
    1024210333msgstr "Previous"
    1024310334
    10244 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88
     10335#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:87
    1024510336msgid "Show previous Image"
    1024610337msgstr "Show previous Image"
    1024710338
    10248 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88
    10249 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
    10250 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
    10251 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121
     10339#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:87
     10340#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:99
     10341#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:109
     10342#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
    1025210343#, java-format
    1025310344msgid "Geoimage: {0}"
    1025410345msgstr "Geoimage: {0}"
    1025510346
    10256 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
     10347#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:94
    1025710348msgid "Remove photo from layer"
    1025810349msgstr "Remove photo from layer"
    1025910350
    10260 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
     10351#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:109
    1026110352msgid "Delete File from disk"
    1026210353msgstr "Delete File from disk"
    1026310354
    10264 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117
     10355#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:116
    1026510356#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
    1026610357msgid "Next"
    1026710358msgstr "Next"
    1026810359
    10269 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121
     10360#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
    1027010361msgid "Show next Image"
    1027110362msgstr "Show next Image"
    1027210363
    10273 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
     10364#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:127
    1027410365msgid "Center view"
    1027510366msgstr "Centre view"
    1027610367
    10277 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
     10368#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:130
    1027810369msgid "Zoom best fit and 1:1"
    1027910370msgstr "Zoom best fit and 1:1"
    1028010371
    10281 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134
     10372#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:133
    1028210373msgid "Move dialog to the side pane"
    1028310374msgstr "Move dialog to the side pane"
    1028410375
    10285 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
     10376#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:243
    1028610377#, java-format
    1028710378msgid ""
    … …  
    1029210383"Altitude: {0} m"
    1029310384
    10294 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:247
     10385#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:246
    1029510386#, java-format
    1029610387msgid ""
    … …  
    1056010651
    1056110652#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:237
    10562 #, java-format
    10563 msgid ""
    10564 "<html>You have sucessfully retrieved an OAuth Access Token from the OSM "
     10653#, fuzzy, java-format
     10654msgid ""
     10655"<html>You have successfully retrieved an OAuth Access Token from the OSM "
    1056510656"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
    1056610657"in subsequent requests to gain access to the OSM API.</html>"
    … …  
    1159611687
    1159711688#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
    11598 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
     11689#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:42
    1159911690msgid "Enable built-in defaults"
    1160011691msgstr "Enable built-in defaults"
    … …  
    1161211703msgstr "Map Paint Styles"
    1161311704
    11614 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:68
     11705#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:69
    1161511706#, java-format
    1161611707msgid "The following plugin has been downloaded <strong>successfully</strong>:"
    … …  
    1162011711msgstr[1] "The following {0} plugins have been downloaded successfully:"
    1162111712
    11622 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
     11713#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
    1162311714#, java-format
    1162411715msgid "Downloading the following plugin has <strong>failed</strong>:"
    … …  
    1162811719msgstr[1] "Downloading the following {0} plugins has <strong>failed</strong>:"
    1162911720
    11630 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
     11721#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:117
    1163111722msgid "Search:"
    1163211723msgstr "Search:"
    1163311724
    11634 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:119
     11725#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:122
    1163511726msgid "Enter a search expression"
    1163611727msgstr "Enter a search expression"
    1163711728
    11638 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:172
    11639 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:184
     11729#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:168
     11730#, fuzzy
     11731msgid "Plugin update policy"
     11732msgstr "Plugin update failed"
     11733
     11734#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:187
     11735#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:199
    1164011736msgid "Add JOSM Plugin description URL."
    1164111737msgstr "Add JOSM Plugin description URL."
    1164211738
    11643 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:185
     11739#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:200
    1164411740msgid "Enter URL"
    1164511741msgstr "Enter URL"
    1164611742
    11647 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
    11648 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:221
     11743#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:213
     11744#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:236
    1164911745msgid "Please select an entry."
    1165011746msgstr "Please select an entry."
    1165111747
    11652 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:206
     11748#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:221
    1165311749msgid "Edit JOSM Plugin description URL."
    1165411750msgstr "Edit JOSM Plugin description URL."
    1165511751
    11656 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:207
     11752#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:222
    1165711753msgid "JOSM Plugin description URL"
    1165811754msgstr "JOSM Plugin description URL"
    1165911755
    11660 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:234
     11756#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:249
    1166111757msgid "Configure Plugin Sites"
    1166211758msgstr "Configure Plugin Sites"
    1166311759
    11664 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:296
     11760#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:312
    1166511761msgid "Download list"
    1166611762msgstr "Download list"
    1166711763
    11668 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:297
     11764#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:313
    1166911765msgid "Download the list of available plugins"
    1167011766msgstr "Download the list of available plugins"
    1167111767
    11672 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:326
    11673 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:344
    11674 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:356
     11768#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:342
     11769#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:360
     11770#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:372
    1167511771#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
    11676 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:217
    11677 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
    11678 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:745
     11772#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
     11773#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:621
     11774#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:777
    1167911775msgid "Update plugins"
    1168011776msgstr "Update plugins"
    1168111777
    11682 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:327
     11778#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:343
    1168311779msgid "Update the selected plugins"
    1168411780msgstr "Update the selected plugins"
    1168511781
    11686 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:379
     11782#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:395
    1168711783msgid "Configure sites..."
    1168811784msgstr "Configure sites..."
    1168911785
    11690 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:380
     11786#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:396
    1169111787msgid "Configure the list of sites where plugins are downloaded from"
    1169211788msgstr "Configure the list of sites where plugins are downloaded from"
    … …  
    1206412160msgstr "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
    1206512161
    12066 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
     12162#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
    1206712163msgid "Sort presets menu"
    1206812164msgstr "Sort presets menu"
    1206912165
    12070 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
     12166#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:52
    1207112167msgid "Tagging Presets"
    1207212168msgstr "Tagging Presets"
    … …  
    1209312189msgstr "Customise the elements on the toolbar."
    1209412190
     12191#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:65
    1209512192#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:65
    1209612193msgid "Plugin bundled with JOSM"
    1209712194msgstr "Plugin bundled with JOSM"
    1209812195
     12196#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:84
    1209912197#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:84
    1210012198msgid ""
    … …  
    1210512203"list of available plugins."
    1210612204
     12205#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:112
    1210712206#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:112
    1210812207#, java-format
    1210912208msgid "{0}: Version {1} (local: {2})"
    1211012209msgstr "{0}: Version {1} (local: {2})"
     12210
     12211#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:72
     12212#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:113
     12213msgid "Ask before updating"
     12214msgstr ""
     12215
     12216#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
     12217#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
     12218msgid "Always update withouth asking"
     12219msgstr ""
     12220
     12221#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80
     12222#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:123
     12223#, fuzzy
     12224msgid "Never update"
     12225msgstr "Reverse route"
     12226
     12227#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:84
     12228msgid ""
     12229"Please decide whether JOSM shall automatically update active plugins at "
     12230"startup after an update of JOSM itself."
     12231msgstr ""
     12232
     12233#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:96
     12234msgid "Update interval (in days):"
     12235msgstr ""
     12236
     12237#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:128
     12238msgid ""
     12239"Please decide whether JOSM shall automatically update active plugins after a "
     12240"certain periode of time."
     12241msgstr ""
    1211112242
    1211212243#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
    … …  
    1240112532msgstr "Delete the selection in the tag table"
    1240212533
    12403 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
     12534#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:337
    1240412535#, java-format
    1240512536msgid ""
    … …  
    1240712538"be the same as in values"
    1240812539msgstr ""
    12409 
    12410 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
     12540"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
     12541"be the same as in values"
     12542
     12543#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:463
    1241112544#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
    1241212545msgid "More information about this feature"
    … …  
    1241412547
    1241512548#. space
    12416 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
     12549#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:486
    1241712550msgid "Optional Attributes:"
    1241812551msgstr "Optional Attributes:"
    1241912552
    12420 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
     12553#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:577
    1242112554msgid "closedway"
    1242212555msgstr "closed way"
    1242312556
    12424 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
     12557#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
    1242512558#, java-format
    1242612559msgid "Unknown type: {0}"
    1242712560msgstr "Unknown type: {0}"
    1242812561
    12429 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
     12562#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:665
    1243012563#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
    1243112564#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
    … …  
    1243612569msgstr "Could not read tagging preset source: {0}"
    1243712570
    12438 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
     12571#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673
    1243912572#, java-format
    1244012573msgid "Error parsing {0}: "
    1244112574msgstr "Error parsing {0}: "
    1244212575
    12443 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
     12576#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:704
    1244412577#, java-format
    1244512578msgid "Elements of type {0} are supported."
    1244612579msgstr "Elements of type {0} are supported."
    1244712580
    12448 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
     12581#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
    1244912582#: ../plugins/terracer/src/terracer/TerracerAction.java:146
    1245012583#, java-format
    … …  
    1245412587msgstr[1] "Change {0} objects"
    1245512588
    12456 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
     12589#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:770
    1245712590msgid "Nothing selected!"
    1245812591msgstr "Nothing selected!"
    1245912592
    12460 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
     12593#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:772
    1246112594msgid "Selection unsuitable!"
    1246212595msgstr "Selection unsuitable!"
    1246312596
    12464 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
     12597#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
    1246512598msgid "Apply Preset"
    1246612599msgstr "Apply Preset"
    1246712600
    12468 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
     12601#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:855
    1246912602msgid "Change Properties"
    1247012603msgstr "Change Properties"
    … …  
    1250312636"URL from www.openstreetmap.org (you can paste a download URL here to specify "
    1250412637"a bounding box)"
     12638
     12639#: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:46
     12640#, fuzzy
     12641msgid ""
     12642"The current value is not a valid OSM ID. Please enter an integer value > 0"
     12643msgstr ""
     12644"The current value is not a valid user ID. Please enter an integer value > 0"
    1250512645
    1250612646#: ../core/src/org/openstreetmap/josm/io/AllFormatsImporter.java:15
    … …  
    1281712957#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
    1281812958#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
    12819 #, fuzzy, java-format
     12959#, java-format
    1282012960msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
    12821 msgstr "Warning: failed to read MOTD from ''{0}''. Exception was: {1}"
     12961msgstr "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
    1282212962
    1282312963#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
    … …  
    1307313213#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
    1307413214#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
    13075 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:196
     13215#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:129
    1307613216#, java-format
    1307713217msgid "Missing mandatory attribute ''{0}''."
    … …  
    1318013320
    1318113321#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:160
    13182 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
     13322#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:125
    1318313323#, java-format
    1318413324msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
    … …  
    1318613326
    1318713327#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:167
    13188 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
     13328#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
    1318913329#, java-format
    1319013330msgid "Unsupported version: {0}"
    … …  
    1325313393msgstr "File \"{0}\" does not exist"
    1325413394
    13255 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:112
    13256 #, java-format
    13257 msgid ""
    13258 "Warning: ignoring changeset id {0} for new object with external id {1} and "
    13259 "internal id {2}"
    13260 msgstr ""
    13261 "Warning: ignoring changeset id {0} for new object with external id {1} and "
    13262 "internal id {2}"
    13263 
    13264 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
     13395#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:156
    1326513396#, java-format
    1326613397msgid ""
    … …  
    1327113402"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
    1327213403
    13273 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
     13404#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:185
    1327413405msgid "Found XML element <nd> not as direct child of element <way>."
    1327513406msgstr "Found XML element <nd> not as direct child of element <way>."
    1327613407
    13277 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
     13408#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190
    1327813409#, java-format
    1327913410msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
    1328013411msgstr "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
    1328113412
    13282 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
     13413#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:196
    1328313414#, java-format
    1328413415msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
    1328513416msgstr "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
    1328613417
    13287 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
     13418#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
     13419#, fuzzy, java-format
     13420msgid "Deleted way {0} contains nodes"
     13421msgstr "Delete {0} node"
     13422
     13423#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:220
    1328813424msgid "Found XML element <member> not as direct child of element <relation>."
    1328913425msgstr "Found XML element <member> not as direct child of element <relation>."
    1329013426
    13291 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:280
     13427#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226
    1329213428#, java-format
    1329313429msgid "Missing attribute ''ref'' on member in relation {0}."
    1329413430msgstr "Missing attribute ''ref'' on member in relation {0}."
    1329513431
    13296 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:285
     13432#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
    1329713433#, java-format
    1329813434msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
    1329913435msgstr "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
    1330013436
    13301 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:289
     13437#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
    1330213438#, java-format
    1330313439msgid "Missing attribute ''type'' on member {0} in relation {1}."
    1330413440msgstr "Missing attribute ''type'' on member {0} in relation {1}."
    1330513441
    13306 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:292
     13442#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
    1330713443#, java-format
    1330813444msgid ""
    … …  
    1331113447"Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
    1331213448
    13313 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:299
     13449#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
    1331413450msgid "Incomplete <member> specification with ref=0"
    1331513451msgstr "Incomplete <member> specification with ref=0"
    1331613452
    13317 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
     13453#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
     13454#, fuzzy, java-format
     13455msgid "Deleted relation {0} contains members"
     13456msgstr "Delete relation {0}"
     13457
     13458#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
    1331813459#, java-format
    1331913460msgid "Undefined element ''{0}'' found in input stream. Skipping."
    1332013461msgstr "Undefined element ''{0}'' found in input stream. Skipping."
    1332113462
    13322 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
     13463#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290
    1332313464msgid "Illegal object with ID=0."
    1332413465msgstr "Illegal object with id=0"
    1332513466
    13326 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:365
    13327 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369
     13467#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
     13468#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:320
    1332813469#, java-format
    1332913470msgid ""
    … …  
    1333513476
    1333613477#. default version in 0.5 files for existing primitives
    13337 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:371
    13338 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
    13339 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379
    13340 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
     13478#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
     13479#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327
     13480#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
     13481#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
    1334113482#, java-format
    1334213483msgid ""
    … …  
    1334813489
    1334913490#. should not happen. API version has been checked before
    13350 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:384
     13491#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:335
    1335113492#, java-format
    1335213493msgid "Unknown or unsupported API version. Got {0}."
    1335313494msgstr "Unknown or unsupported API version. Got {0}."
    1335413495
    13355 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:390
     13496#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:341
    1335613497#, java-format
    1335713498msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
    … …  
    1335913500
    1336013501#. for a new primitive we just log a warning
    13361 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:420
    13362 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:430
     13502#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
     13503#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382
    1336313504#, java-format
    1336413505msgid ""
    … …  
    1337013511
    1337113512#. for an existing primitive this is a problem
    13372 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:424
    13373 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:434
     13513#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
     13514#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:386
    1337413515#, java-format
    1337513516msgid "Illegal value for attribute ''changeset''. Got {0}."
    1337613517msgstr "Illegal value for attribute ''changeset''. Got {0}."
    1337713518
    13378 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:443
     13519#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
    1337913520#, java-format
    1338013521msgid "Missing required attribute ''{0}''."
    1338113522msgstr "Missing required attribute ''{0}''."
    1338213523
    13383 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:448
     13524#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400
    1338413525#, java-format
    1338513526msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
    1338613527msgstr "Illegal long value for attribute ''{0}''. Got ''{1}''."
    1338713528
    13388 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:470
     13529#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:421
    1338913530#, java-format
    1339013531msgid ""
    … …  
    1339313534"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
    1339413535
    13395 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
    13396 #, java-format
    13397 msgid ""
     13536#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:433
     13537#, fuzzy, java-format
     13538msgid "Deleted node {0} is part of way {1}"
     13539msgstr "Delete nodes or ways."
     13540
     13541#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441
     13542#, fuzzy, java-format
     13543msgid ""
     13544"Way {0} with {1} nodes has incomplete nodes because at least one node was "
     13545"missing in the loaded data."
     13546msgstr ""
    1339813547"Marked way {0} with {1} nodes incomplete because at least one node was "
    1339913548"missing in the loaded data and is therefore incomplete too."
    13400 msgstr ""
    13401 "Marked way {0} with {1} nodes incomplete because at least one node was "
    13402 "missing in the loaded data and is therefore incomplete too."
    13403 
    13404 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:534
    13405 #, java-format
    13406 msgid ""
    13407 "Unknown relation member type ''{0}'' in relation with external id ''{1}''."
    13408 msgstr ""
    13409 "Unknown relation member type ''{0}'' in relation with external id ''{1}''."
    13410 
    13411 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:546
     13549
     13550#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
    1341213551#, java-format
    1341313552msgid ""
    … …  
    1341813557"external id ''{1}''."
    1341913558
    13420 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
     13559#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:512
     13560#, fuzzy, java-format
     13561msgid "Deleted member {0} is used by relation {1}"
     13562msgstr "Deleted member ''{0}'' in relation."
     13563
     13564#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:539
    1342113565msgid "Prepare OSM data..."
    1342213566msgstr "Prepare OSM data..."
    1342313567
    13424 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:594
     13568#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:540
    1342513569msgid "Parsing OSM data..."
    1342613570msgstr "Parsing OSM data..."
    1342713571
    13428 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:599
     13572#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:545
    1342913573msgid "Preparing data set..."
    1343013574msgstr "Preparing data set..."
    … …  
    1366313807msgstr "Click to skip updating the activated plugins"
    1366413808
    13665 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
     13809#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:215
     13810msgid ""
     13811"Skipping plugin update after JOSM upgrade. Automatic update at startup is "
     13812"disabled."
     13813msgstr ""
     13814
     13815#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:217
     13816msgid ""
     13817"Skipping plugin update after elapsed update interval. Automatic update at "
     13818"startup is disabled."
     13819msgstr ""
     13820
     13821#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
     13822msgid ""
     13823"Running plugin update after JOSM upgrade. Automatic update at startup is "
     13824"enabled."
     13825msgstr ""
     13826
     13827#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:226
     13828msgid ""
     13829"Running plugin update after elapsed update interval. Automatic update at "
     13830"startup is disabled."
     13831msgstr ""
     13832
     13833#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:232
     13834#, fuzzy, java-format
     13835msgid ""
     13836"Unexpected value ''{0}'' for preference ''{1}''. Assuming value ''ask''."
     13837msgstr "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
     13838
     13839#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
    1366613840#, java-format
    1366713841msgid ""
    … …  
    1367613850"are:\""
    1367713851
    13678 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
     13852#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
    1367913853#, java-format
    1368013854msgid ""
    … …  
    1368513859"<br>You have to update JOSM in order to use this plugin.</html>"
    1368613860
    13687 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
     13861#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
    1368813862#, java-format
    1368913863msgid "loading plugin ''{0}''"
    1369013864msgstr "loading plugin ''{0}''"
    1369113865
    13692 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:354
     13866#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:386
    1369313867#, java-format
    1369413868msgid "Could not load plugin {0}. Delete from preferences?"
    1369513869msgstr "Could not load plugin {0}. Delete from preferences?"
    1369613870
    13697 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:373
     13871#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:405
    1369813872msgid "Loading plugins ..."
    1369913873msgstr "Loading plugins ..."
    1370013874
    13701 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:374
     13875#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:406
    1370213876msgid "Checking plugin preconditions..."
    1370313877msgstr "Checking plugin preconditions..."
    1370413878
    13705 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:401
     13879#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:433
    1370613880#, java-format
    1370713881msgid "Loading plugin ''{0}''..."
    1370813882msgstr "Loading plugin ''{0}''..."
    1370913883
    13710 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:482
     13884#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:514
    1371113885msgid "JOSM could not find information about the following plugin:"
    1371213886msgid_plural "JOSM could not find information about the following plugins:"
    … …  
    1371413888msgstr[1] "JOSM could not find information about the following plugins:"
    1371513889
    13716 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:490
     13890#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:522
    1371713891msgid "The plugin is not going to be loaded."
    1371813892msgid_plural "The plugins are not going to be loaded."
    … …  
    1372013894msgstr[1] "The plugins are not going to be loaded."
    1372113895
    13722 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:516
     13896#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:548
    1372313897msgid "Determine plugins to load..."
    1372413898msgstr "Determine plugins to load..."
    1372513899
    13726 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:522
     13900#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
    1372713901msgid "Removing deprecated plugins..."
    1372813902msgstr "Removing deprecated plugins..."
    1372913903
    13730 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:524
     13904#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:556
    1373113905msgid "Removing umaintained plugins..."
    1373213906msgstr "Removing umaintained plugins..."
    1373313907
    13734 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:548
     13908#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:580
    1373513909msgid "Updating the following plugin has failed:"
    1373613910msgid_plural "Updating the following plugins has failed:"
    … …  
    1373813912msgstr[1] "Updating the following plugins has failed:"
    1373913913
    13740 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:559
     13914#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:591
    1374113915msgid ""
    1374213916"Please open the Preference Dialog after JOSM has started and try to update "
    … …  
    1375213926"them manually."
    1375313927
    13754 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:567
     13928#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:599
    1375513929msgid "Plugin update failed"
    1375613930msgstr "Plugin update failed"
    1375713931
    13758 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:623
    13759 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:638
    13760 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
     13932#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:655
     13933#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:670
     13934#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:748
    1376113935msgid "Disable plugin"
    1376213936msgstr "Disable plugin"
    1376313937
    13764 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:625
     13938#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:657
    1376513939#, java-format
    1376613940msgid "Click to delete the plugin ''{0}''"
    1376713941msgstr "Click to delete the plugin ''{0}''"
    1376813942
    13769 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
    13770 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
     13943#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:661
     13944#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:754
    1377113945msgid "Keep plugin"
    1377213946msgstr "Keep plugin"
    1377313947
    13774 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:631
    13775 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:724
     13948#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:663
     13949#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:756
    1377613950#, java-format
    1377713951msgid "Click to keep the plugin ''{0}''"
    1377813952msgstr "Click to keep the plugin ''{0}''"
    1377913953
    13780 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:700
     13954#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:732
    1378113955#, java-format
    1378213956msgid "Warning: failed to delete outdated plugin ''{0}''."
    1378313957msgstr "Warning: failed to delete outdated plugin ''{0}''."
    1378413958
    13785 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:701
    13786 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
     13959#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:733
     13960#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:739
    1378713961#, java-format
    1378813962msgid ""
    … …  
    1379313967"installation. JOSM still going to load the old plugin version."
    1379413968
    13795 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:706
     13969#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:738
    1379613970#, java-format
    1379713971msgid ""
    … …  
    1380213976"''{1}''. Renaming failed."
    1380313977
    13804 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
     13978#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:750
    1380513979#, java-format
    1380613980msgid "Click to disable the plugin ''{0}''"
    1380713981msgstr "Click to disable the plugin ''{0}''"
    1380813982
    13809 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:731
     13983#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:763
    1381013984#, java-format
    1381113985msgid ""
    … …  
    1381413988"An unexpected exception occurred that may have come from the ''{0}'' plugin."
    1381513989
    13816 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:734
     13990#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:766
    1381713991#, java-format
    1381813992msgid "According to the information within the plugin, the author is {0}."
    1381913993msgstr "According to the information within the plugin, the author is {0}."
    1382013994
    13821 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:737
     13995#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:769
    1382213996msgid ""
    1382313997"Try updating to the newest version of this plugin before reporting a bug."
    … …  
    1382513999"Try updating to the newest version of this plugin before reporting a bug."
    1382614000
    13827 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:739
     14001#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:771
    1382814002msgid "Should the plugin be disabled?"
    1382914003msgstr "Should the plugin be disabled?"
    1383014004
    13831 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
     14005#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:843
    1383214006msgid ""
    1383314007"The plugin has been removed from the configuration. Please restart JOSM to "
    … …  
    1383714011"unload the plugin."
    1383814012
    13839 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:853
     14013#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:885
    1384014014msgid "Plugin information"
    1384114015msgstr "Plugin information"
    1384214016
    13843 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:858
     14017#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:890
    1384414018#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:179
    1384514019msgid "no description available"
    1384614020msgstr "no description available"
    1384714021
    13848 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:890
    13849 msgid "Do not check and ask again at startup (remembers choice)"
    13850 msgstr "Do not check and ask again at startup (remembers choice)"
     14022#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:922
     14023msgid ""
     14024"Do not ask again and remember my decision (go to Preferences->Plugins to "
     14025"change it later)"
     14026msgstr ""
    1385114027
    1385214028#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:69
    … …  
    1408114257"html>"
    1408214258msgstr ""
     14259"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
     14260"<br>The token is not authorised to access the protected resource<br>''{1}''."
     14261"<br>Please launch the preferences dialogue and retrieve another OAuth token."
     14262"</html>"
    1408314263
    1408414264#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
    … …  
    1422414404#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
    1422514405#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
    14226 #, java-format
    14227 msgid ""
    14228 "Warning: failed to acccess directory ''{0}'' for security reasons. Exception "
     14406#, fuzzy, java-format
     14407msgid ""
     14408"Warning: failed to access directory ''{0}'' for security reasons. Exception "
    1422914409"was: {1}"
    1423014410msgstr ""
    … …  
    1473614916msgstr "Select commune"
    1473714917
    14738 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:155
     14918#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:157
    1473914919msgid "Cadastre"
    1474014920msgstr "Cadastre"
    1474114921
    14742 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164
     14922#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
    1474314923msgid "Auto sourcing"
    1474414924msgstr "Auto sourcing"
    1474514925
    14746 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:219
     14926#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
    1474714927msgid ""
    1474814928"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
    … …  
    1475414934"Would you like to restore F11 for grab action ?"
    1475514935
    14756 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:222
     14936#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:224
    1475714937msgid "Restore grab shortcut F11"
    1475814938msgstr "Restore grab shortcut F11"
    1475914939
    14760 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:227
     14940#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:229
    1476114941msgid "JOSM is stopped for the change to take effect."
    1476214942msgstr "JOSM is stopped for the change to take effect."
    1476314943
    14764 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:289
     14944#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:291
    1476514945#, java-format
    1476614946msgid ""
    … …  
    1476914949"Warning: failed to put option pane dialog always on top. Exception was: {0}"
    1477014950
    14771 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
     14951#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
    1477214952msgid "Replace original background by JOSM background color."
    1477314953msgstr "Replace original background by JOSM background colour."
    1477414954
    14775 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
     14955#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
    1477614956msgid "Reverse grey colors (for black backgrounds)."
    1477714957msgstr "Reverse grey colours (for black backgrounds)."
    1477814958
    14779 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
     14959#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
    1478014960msgid "Set background transparent."
    1478114961msgstr "Set background transparent."
    1478214962
    14783 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
     14963#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
    1478414964msgid "Draw boundaries of downloaded data."
    1478514965msgstr "Draw boundaries of downloaded data."
    1478614966
    14787 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
    14788 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
     14967#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
     14968#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:187
    1478914969msgid "Disable image cropping during georeferencing."
    1479014970msgstr "Disable image cropping during georeferencing."
    1479114971
    14792 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
     14972#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:56
     14973msgid ""
     14974"Automaticly select first WMS layer when grabing if multiple layers exist."
     14975msgstr ""
     14976
     14977#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:61
    1479314978msgid "Enable automatic caching."
    1479414979msgstr "Enable automatic caching."
    1479514980
    14796 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
     14981#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64
    1479714982msgid "Max. cache size (in MB)"
    1479814983msgstr "Max. cache size (in MB)"
    1479914984
    14800 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
     14985#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
    1480114986msgid ""
    1480214987"A special handler of the French cadastre wms at www.cadastre.gouv."
    … …  
    1481414999"by this plugin."
    1481515000
    14816 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
     15001#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
    1481715002msgid "French cadastre WMS"
    1481815003msgstr "French cadastre WMS"
    1481915004
    14820 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
     15005#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
    1482115006msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
    1482215007msgstr "<html>Value of key \"source\" when autosourcing is enabled</html>"
    1482315008
    14824 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
     15009#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84
    1482515010msgid "Source"
    1482615011msgstr "Source"
    1482715012
    14828 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
    14829 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
     15013#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:90
     15014#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:218
    1483015015msgid ""
    1483115016"Replace the original white background by the backgound color defined in JOSM "
    … …  
    1483515020"preferences."
    1483615021
    14837 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
     15022#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95
    1483815023msgid ""
    1483915024"Invert the original black and white colors (and all intermediate greys). "
    … …  
    1484315028"Useful for texts on dark backgrounds."
    1484415029
    14845 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
     15030#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105
    1484615031msgid "Allows multiple layers stacking"
    1484715032msgstr "Allows multiple layers stacking"
    1484815033
    14849 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
     15034#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110
    1485015035msgid "Set WMS layers transparency. Right is opaque, left is transparent."
    1485115036msgstr "Set WMS layers transparency. Right is opaque, left is transparent."
    1485215037
    14853 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
     15038#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
    1485415039msgid "Draw a rectangle around downloaded data from WMS server."
    1485515040msgstr "Draw a rectangle around downloaded data from WMS server."
    1485615041
    1485715042#. the vectorized images multiplier
    14858 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
     15043#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:128
    1485915044msgid "Vector images grab multiplier:"
    1486015045msgstr "Vector images grab multiplier:"
    1486115046
    14862 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
    14863 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
     15047#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143
     15048#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147
    1486415049msgid "Grab smaller images (higher quality but use more memory)"
    1486515050msgstr "Grab smaller images (higher quality but use more memory)"
    1486615051
    14867 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
     15052#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151
    1486815053msgid "Fixed size square (default is 100m)"
    1486915054msgstr "Fixed size square (default is 100m)"
    1487015055
    14871 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
     15056#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:171
    1487215057msgid "Fixed size (from 25 to 1000 meters)"
    1487315058msgstr "Fixed size (from 25 to 1000 metres)"
    1487415059
    14875 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
     15060#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180
    1487615061msgid "Raster images grab multiplier:"
    1487715062msgstr "Raster images grab multiplier:"
    1487815063
    1487915064#. the crosspiece display
    14880 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
     15065#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:190
    1488115066msgid "Display crosspieces:"
    1488215067msgstr "Display crosspieces:"
    1488315068
    14884 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
     15069#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:224
    1488515070msgid "Oldest files are automatically deleted when this size is exceeded"
    1488615071msgstr "Oldest files are automatically deleted when this size is exceeded"
     15072
     15073#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:230
     15074msgid ""
     15075"Automatically selects the first WMS layer if multiple layers exist when "
     15076"grabbing."
     15077msgstr ""
    1488715078
    1488815079#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81
    … …  
    1515915350msgstr "Download WMS tile from {0}"
    1516015351
    15161 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:44
     15352#: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:47
    1516215353msgid ""
    1516315354"More than one WMS layer present\n"
    … …  
    1517315364msgstr "Blank Layer"
    1517415365
    15175 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:212
     15366#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:214
    1517615367#, java-format
    1517715368msgid "WMS layer ({0}), {1} tile(s) loaded"
    1517815369msgstr "WMS layer ({0}), {1} tile(s) loaded"
    1517915370
    15180 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:214
     15371#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:216
    1518115372msgid "Is not vectorized."
    1518215373msgstr "Is not vectorised."
    1518315374
    15184 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:215
     15375#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:217
    1518515376#, java-format
    1518615377msgid "Raster size: {0}"
    1518715378msgstr "Raster size: {0}"
    1518815379
    15189 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:217
     15380#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:219
    1519015381msgid "Is vectorized."
    1519115382msgstr "Is vectorised."
    1519215383
    15193 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:218
     15384#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:220
    1519415385#, java-format
    1519515386msgid "Commune bbox: {0}"
    1519615387msgstr "Commune bbox: {0}"
    1519715388
    15198 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:423
     15389#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:425
    1519915390#, java-format
    1520015391msgid ""
    … …  
    1520515396"Create a new one."
    1520615397
    15207 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
     15398#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:426
    1520815399msgid "Cache Format Error"
    1520915400msgstr "Cache Format Error"
    1521015401
    15211 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:446
     15402#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:448
    1521215403#, java-format
    1521315404msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
    1521415405msgstr "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
    1521515406
    15216 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:448
     15407#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:450
    1521715408msgid "Cache Lambert Zone Error"
    1521815409msgstr "Cache Lambert Zone Error"
    … …  
    1557615767msgstr "Load set of images as a new layer."
    1557715768
     15769#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49
     15770#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49
     15771#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:51
     15772msgid "Josminator - Just do it!"
     15773msgstr ""
     15774
     15775#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49
     15776#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49
     15777#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:51
     15778msgid "Do some stuff"
     15779msgstr ""
     15780
     15781#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49
     15782#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49
     15783#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:51
     15784msgid "Dsdfasdfsdfotos"
     15785msgstr ""
     15786
     15787#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:121
     15788#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:127
     15789#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:129
     15790msgid "Exec"
     15791msgstr ""
     15792
     15793#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:121
     15794#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:127
     15795#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:129
     15796msgid "Execute Script"
     15797msgstr ""
     15798
    1557815799#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
    1557915800msgid "Direction index '{0}' not found"
    … …  
    1560815829
    1560915830#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:146
     15831#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:75
    1561015832msgid "Tracing"
    1561115833msgstr "Tracing"
    … …  
    1563515857
    1563615858#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
     15859#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerException.java:14
    1563715860msgid "An unknown error has occurred"
    1563815861msgstr "An unknown error has occurred"
    … …  
    1626616489msgstr "Firefox executable"
    1626716490
    16268 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
     16491#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
     16492msgid "Read error!"
     16493msgstr "Read error!"
     16494
     16495#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
     16496msgid "Write error!"
     16497msgstr "Write error!"
     16498
     16499#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
     16500msgid "Write position information into the exif header of the following files:"
     16501msgstr ""
     16502"Write position information into the exif header of the following files:"
     16503
     16504#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
    1626916505#, fuzzy
    16270 msgid "Read error!"
    16271 msgstr "Reservoir"
    16272 
    16273 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
    16274 msgid "Write error!"
    16275 msgstr ""
    16276 
    16277 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
     16506msgid "settings"
     16507msgstr "Settings"
     16508
     16509#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
     16510msgid "keep backup files"
     16511msgstr "keep backup files"
     16512
     16513#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
    1627816514#, fuzzy
     16515msgid "change file modification time:"
     16516msgstr "Change location"
     16517
     16518#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
     16519msgid "to gps time"
     16520msgstr ""
     16521
     16522#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
     16523msgid "to previous value (unchanged mtime)"
     16524msgstr ""
     16525
     16526#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
     16527#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
     16528msgid "Photo Geotagging Plugin"
     16529msgstr "Photo Geotagging Plugin"
     16530
     16531#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
     16532msgid "Writing position information to image files..."
     16533msgstr "Writing position information to image files..."
     16534
     16535#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
     16536#, fuzzy
     16537msgid "Could not read mtime."
     16538msgstr "Could not rename file!"
     16539
     16540#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
     16541#, fuzzy
     16542msgid "Could not write mtime."
     16543msgstr "Could not import files."
     16544
     16545#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
     16546msgid "File could not be deleted!"
     16547msgstr "File could not be deleted!"
     16548
     16549#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
     16550#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
     16551msgid "Could not rename file!"
     16552msgstr "Could not rename file!"
     16553
     16554#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
     16555msgid "<html><h3>There are old backup files in the image directory!</h3>"
     16556msgstr "<html><h3>There are old backup files in the image directory!</h3>"
     16557
     16558#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
     16559msgid "Override old backup files?"
     16560msgstr "Override old backup files?"
     16561
     16562#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
     16563msgid "Keep old backups and continue"
     16564msgstr "Keep old backups and continue"
     16565
     16566#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
     16567msgid "Override"
     16568msgstr "Override"
     16569
     16570#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
     16571#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
     16572msgid "Could not delete temporary file!"
     16573msgstr "Could not delete temporary file!"
     16574
     16575#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
     16576#, fuzzy
     16577msgid "Test failed: Could not read mtime."
     16578msgstr "Image file could not be deleted."
     16579
     16580#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
     16581#, fuzzy
     16582msgid "Test failed: Could not write mtime."
     16583msgstr "Image file could not be deleted."
     16584
     16585#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
    1627916586msgid "Write coordinates to image header"
    16280 msgstr "Enter the coordinates for the new node."
    16281 
    16282 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
    16283 msgid "Write position information into the exif header of the following files:"
    16284 msgstr ""
    16285 
    16286 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
    16287 #, fuzzy
    16288 msgid "keep backup files"
    16289 msgstr "Keep backup files"
    16290 
    16291 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
    16292 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
    16293 msgid "Photo Geotagging Plugin"
    16294 msgstr ""
    16295 
    16296 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
    16297 msgid "Writing position information to image files..."
    16298 msgstr ""
    16299 
    16300 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
    16301 #, fuzzy
    16302 msgid "Error: "
    16303 msgstr "Error"
    16304 
    16305 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
    16306 #, fuzzy
    16307 msgid "File could not be deleted!"
    16308 msgstr "Image file could not be deleted."
    16309 
    16310 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
    16311 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
    16312 #, fuzzy
    16313 msgid "Could not rename file!"
    16314 msgstr "Could not rename file ''{0}''"
    16315 
    16316 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
    16317 msgid "<html><h3>There are old backup files in the image directory!</h3>"
    16318 msgstr ""
    16319 
    16320 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
    16321 #, fuzzy
    16322 msgid "Override old backup files?"
    16323 msgstr "Keep backup files"
    16324 
    16325 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
    16326 #, fuzzy
    16327 msgid "Keep old backups and continue"
    16328 msgstr "Keep backup files"
    16329 
    16330 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
    16331 #, fuzzy
    16332 msgid "Override"
    16333 msgstr "Overwrite"
    16334 
    16335 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
    16336 #, fuzzy
    16337 msgid "Could not delete temporary file!"
    16338 msgstr "Could not import files."
     16587msgstr "Write coordinates to image header"
    1633916588
    1634016589#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
    … …  
    1673416983#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
    1673516984msgid "Enter housenumbers or amount of segments"
    16736 msgstr ""
     16985msgstr "Enter housenumbers or amount of segments"
    1673716986
    1673816987#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
    16739 #, fuzzy
    1674016988msgid "Terrace a house"
    16741 msgstr "Terrace a building"
     16989msgstr "Terrace a house"
    1674216990
    1674316991#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
    … …  
    1675116999
    1675217000#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
    16753 #, fuzzy
    1675417001msgid "Street"
    16755 msgstr "Streets"
     17002msgstr "Street"
    1675617003
    1675717004#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
    16758 #, fuzzy
    1675917005msgid "Highest Number"
    16760 msgstr "Highest number"
     17006msgstr "Highest Number"
    1676117007
    1676217008#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
    16763 #, fuzzy
    1676417009msgid "Lowest Number"
    16765 msgstr "Lowest number"
     17010msgstr "Lowest Number"
    1676617011
    1676717012#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
    16768 #, fuzzy
    1676917013msgid "Lowest housenumber of the terraced house"
    16770 msgstr "Lowest housenumber cannot be higher than highest housenumber"
     17014msgstr "Lowest housenumber of the terraced house"
    1677117015
    1677217016#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
    1677317017msgid "add to existing associatedStreet relation"
    16774 msgstr ""
     17018msgstr "add to existing associatedStreet relation"
    1677517019
    1677617020#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
    16777 #, fuzzy
    1677817021msgid "create an associatedStreet relation"
    16779 msgstr "Create a new relation"
     17022msgstr "create an associatedStreet relation"
    1678017023
    1678117024#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
    16782 #, fuzzy
    1678317025msgid "delete outline way"
    16784 msgstr "Delete duplicate ways"
     17026msgstr "delete outline way"
    1678517027
    1678617028#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
    16787 #, fuzzy
    1678817029msgid "Street name: "
    16789 msgstr "Street name"
     17030msgstr "Street name: "
    1679017031
    1679117032#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
    … …  
    1683617077
    1683717078#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:83
    16838 #, fuzzy
    1683917079msgid "Cannot reverse!"
    16840 msgstr "not present"
     17080msgstr "Cannot reverse!"
    1684117081
    1684217082#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:125
    … …  
    1686017100msgid "Terrace"
    1686117101msgstr "Terrace"
     17102
     17103#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
     17104#, fuzzy
     17105msgid "Merge objects nodes"
     17106msgstr "Merge {0} nodes"
     17107
     17108#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
     17109#, fuzzy
     17110msgid "Tracer"
     17111msgstr "Terrace"
     17112
     17113#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
     17114#, fuzzy
     17115msgid "Tracer."
     17116msgstr "Terrace"
     17117
     17118#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:136
     17119#, fuzzy
     17120msgid "Tracer building"
     17121msgstr "Terrace a building"
    1686217122
    1686317123#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37
    … …  
    1821118471"the filename of an image."
    1821218472
     18473#. Plugin JOSM_Script
     18474#: build/trans_plugins.java:29 build/trans_plugins.java:31
     18475#, fuzzy
     18476msgid "nice Plugin"
     18477msgstr "Plugins"
     18478
    1821318479#. Plugin lakewalker
    18214 #: build/trans_plugins.java:29
     18480#: build/trans_plugins.java:33
    1821518481msgid "Helps vectorizing WMS images."
    1821618482msgstr "Helps vectorising WMS images."
    1821718483
    1821818484#. Plugin livegps
    18219 #: build/trans_plugins.java:31
     18485#: build/trans_plugins.java:35
    1822018486msgid ""
    1822118487"Support live GPS input (moving dot) through a connection to gpsd server."
    … …  
    1822418490
    1822518491#. Plugin measurement
    18226 #: build/trans_plugins.java:33
     18492#: build/trans_plugins.java:37
    1822718493msgid ""
    1822818494"Provide a measurement dialog and a layer to measure length and angle of "
    … …  
    1823518501
    1823618502#. Plugin michigan_left
    18237 #: build/trans_plugins.java:35
     18503#: build/trans_plugins.java:39
    1823818504msgid "Adds no left turn for sets of 4 or 5 ways"
    1823918505msgstr "Adds no left turn for sets of 4 or 5 ways"
    1824018506
    1824118507#. Plugin multipoly
    18242 #: build/trans_plugins.java:37
     18508#: build/trans_plugins.java:41
    1824318509msgid ""
    1824418510"Create multipolygons by one click, much easier than standard way with "
    … …  
    1824918515
    1825018516#. Plugin nearclick
    18251 #: build/trans_plugins.java:39
     18517#: build/trans_plugins.java:43
    1825218518msgid ""
    1825318519"Simulates a click when you do a small and short drag. This is useful for "
    … …  
    1826018526
    1826118527#. Plugin openlayers
    18262 #: build/trans_plugins.java:41
     18528#: build/trans_plugins.java:45
    1826318529msgid "Displays an OpenLayers background image"
    1826418530msgstr "Displays an OpenLayers background image"
    1826518531
    1826618532#. Plugin openstreetbugs
    18267 #: build/trans_plugins.java:43
     18533#: build/trans_plugins.java:47
    1826818534msgid "Imports issues from OpenStreetBugs"
    1826918535msgstr "Imports issues from OpenStreetBugs"
    1827018536
    1827118537#. Plugin openvisible
    18272 #: build/trans_plugins.java:45
     18538#: build/trans_plugins.java:49
    1827318539msgid ""
    1827418540"Allows opening gpx/osm files that intersect the currently visible screen area"
    … …  
    1827718543
    1827818544#. Plugin osmarender
    18279 #: build/trans_plugins.java:47
     18545#: build/trans_plugins.java:51
    1828018546msgid ""
    1828118547"Launches FireFox to display the current visible screen as a nice SVG image."
    … …  
    1828418550
    1828518551#. Plugin photo_geotagging
    18286 #: build/trans_plugins.java:49
     18552#: build/trans_plugins.java:53
    1828718553msgid ""
    1828818554"Write gps position info to the image file header. Run this feature from the "
    1828918555"right click menu of the image layer."
    1829018556msgstr ""
     18557"Write gps position info to the image file header. Run this feature from the "
     18558"right click menu of the image layer."
    1829118559
    1829218560#. Plugin PicLayer
    18293 #: build/trans_plugins.java:51
     18561#: build/trans_plugins.java:55
    1829418562msgid ""
    1829518563"This plugin allows to display any picture as a background in the editor and "
    … …  
    1830018568
    1830118569#. Plugin plastic_laf
    18302 #: build/trans_plugins.java:53
     18570#: build/trans_plugins.java:57
    1830318571msgid "The great JGoodies Plastic Look and Feel."
    1830418572msgstr "The great JGoodies Plastic Look and Feel."
    1830518573
    1830618574#. Plugin remotecontrol
    18307 #: build/trans_plugins.java:55
     18575#: build/trans_plugins.java:59
    1830818576msgid "Let other applications send commands to JOSM."
    1830918577msgstr "Let other applications send commands to JOSM."
    1831018578
    1831118579#. Plugin routes
    18312 #: build/trans_plugins.java:57
     18580#: build/trans_plugins.java:61
    1831318581msgid ""
    1831418582"Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
    … …  
    1831918587
    1832018588#. Plugin routing
    18321 #: build/trans_plugins.java:59
     18589#: build/trans_plugins.java:63
    1832218590msgid "Provides routing capabilities."
    1832318591msgstr "Provides routing capabilities."
    1832418592
    1832518593#. Plugin slippymap
    18326 #: build/trans_plugins.java:61
     18594#: build/trans_plugins.java:65
    1832718595msgid ""
    1832818596"Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
    … …  
    1833318601
    1833418602#. Plugin surveyor
    18335 #: build/trans_plugins.java:63
     18603#: build/trans_plugins.java:67
    1833618604msgid "Allow adding markers/nodes on current gps positions."
    1833718605msgstr "Allow adding markers/nodes on current gps positions."
    1833818606
    1833918607#. Plugin tageditor
    18340 #: build/trans_plugins.java:65
     18608#: build/trans_plugins.java:69
    1834118609msgid "Provides a dialog for editing tags in a tabular grid."
    1834218610msgstr "Provides a dialog for editing tags in a tabular grid."
    1834318611
    1834418612#. Plugin tagging-preset-tester
    18345 #: build/trans_plugins.java:67
     18613#: build/trans_plugins.java:71
    1834618614msgid ""
    1834718615"Adds a tagging preset tester to the help menu, which helps you developing of "
    … …  
    1835418622
    1835518623#. Plugin terracer
    18356 #: build/trans_plugins.java:69
     18624#: build/trans_plugins.java:73
    1835718625msgid "Make terraced houses out of single blocks."
    1835818626msgstr "Make terraced houses out of single blocks."
    1835918627
     18628#. Plugin Tracer
     18629#: build/trans_plugins.java:75
     18630msgid ""
     18631"Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
     18632"to be runnign."
     18633msgstr ""
     18634
    1836018635#. Plugin validator
    18361 #: build/trans_plugins.java:71
     18636#: build/trans_plugins.java:77
    1836218637msgid ""
    1836318638"An OSM data validator. It checks for problems in data, and provides fixes "
    … …  
    1836818643
    1836918644#. Plugin walkingpapers
    18370 #: build/trans_plugins.java:73
     18645#: build/trans_plugins.java:79
    1837118646msgid ""
    1837218647"Supports downloading tiled, scanned maps from walking-papers.org. This "
    … …  
    1837718652
    1837818653#. Plugin waydownloader
    18379 #: build/trans_plugins.java:75
     18654#: build/trans_plugins.java:81
    1838018655msgid "Easy downloading along a long set of interconnected ways"
    1838118656msgstr "Easy downloading along a long set of interconnected ways"
    1838218657
    1838318658#. Plugin wmsplugin
    18384 #: build/trans_plugins.java:77
     18659#: build/trans_plugins.java:83
    1838518660msgid ""
    1838618661"Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
    … …  
    1891019185#: build/trans_presets.java:576 build/trans_presets.java:596
    1891119186msgid "Passing Places"
    18912 msgstr ""
     19187msgstr "Passing Places"
    1891319188
    1891419189#. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
    … …  
    1946419739#: build/trans_presets.java:356
    1946519740msgid "Agricultural"
    19466 msgstr ""
     19741msgstr "Agricultural"
    1946719742
    1946819743#: build/trans_presets.java:359
    … …  
    1990020175#: build/trans_presets.java:485
    1990120176msgid "excellent"
    19902 msgstr ""
     20177msgstr "excellent"
    1990320178
    1990420179#: build/trans_presets.java:485
    1990520180msgid "good"
    19906 msgstr ""
     20181msgstr "good"
    1990720182
    1990820183#: build/trans_presets.java:485 build/trans_presets.java:2047
    … …  
    1991220187#: build/trans_presets.java:485
    1991320188msgid "bad"
    19914 msgstr ""
     20189msgstr "bad"
    1991520190
    1991620191#: build/trans_presets.java:485
    1991720192msgid "horrible"
    19918 msgstr ""
     20193msgstr "horrible"
    1991920194
    1992020195#: build/trans_presets.java:489
    … …  
    2021220487#: build/trans_presets.java:671
    2021320488msgid "Traffic Calming"
    20214 msgstr ""
     20489msgstr "Traffic Calming"
    2021520490
    2021620491#. item "Waypoints/Traffic Calming"
    … …  
    2021820493#: build/trans_presets.java:673
    2021920494msgid "Edit Traffic Calming"
    20220 msgstr ""
     20495msgstr "Edit Traffic Calming"
    2022120496
    2022220497#: build/trans_presets.java:674
    2022320498msgid "bump"
    20224 msgstr ""
     20499msgstr "bump"
    2022520500
    2022620501#: build/trans_presets.java:674
    2022720502msgid "chicane"
    20228 msgstr ""
     20503msgstr "chicane"
    2022920504
    2023020505#: build/trans_presets.java:674
    2023120506msgid "choker"
    20232 msgstr ""
     20507msgstr "choker"
    2023320508
    2023420509#: build/trans_presets.java:674
    2023520510msgid "cushion"
    20236 msgstr ""
     20511msgstr "cushion"
    2023720512
    2023820513#: build/trans_presets.java:674
    2023920514msgid "hump"
    20240 msgstr ""
     20515msgstr "hump"
    2024120516
    2024220517#: build/trans_presets.java:674
    2024320518msgid "table"
    20244 msgstr ""
     20519msgstr "table"
    2024520520
    2024620521#: build/trans_presets.java:676
    … …  
    3088231157msgstr "Sicily - Italy"
    3088331158
     31159#~ msgid "Node {0} cannot be added to the way because it was deleted"
     31160#~ msgstr "Node {0} cannot be added to the way because it was deleted"
     31161
     31162#~ msgid ""
     31163#~ "Warning: ignoring changeset id {0} for new object with external id {1} "
     31164#~ "and internal id {2}"
     31165#~ msgstr ""
     31166#~ "Warning: ignoring changeset id {0} for new object with external id {1} "
     31167#~ "and internal id {2}"
     31168
     31169#~ msgid ""
     31170#~ "Unknown relation member type ''{0}'' in relation with external id ''{1}''."
     31171#~ msgstr ""
     31172#~ "Unknown relation member type ''{0}'' in relation with external id ''{1}''."
     31173
     31174#~ msgid "Do not check and ask again at startup (remembers choice)"
     31175#~ msgstr "Do not check and ask again at startup (remembers choice)"
     31176
     31177#~ msgid "Error: "
     31178#~ msgstr "Error: "
     31179
    3088431180#~ msgid "Move"
    3088531181#~ msgstr "Move"
    … …  
    3090631202#~ msgstr "Contact {0}..."
    3090731203
    30908 #~ msgid "Downloading..."
    30909 #~ msgstr "Downloading..."
    30910 
    3091131204#~ msgid "Refresh the selection list."
    3091231205#~ msgstr "Refresh the selection list."
    … …  
    3092031213#~ msgid "Delete the selected layer."
    3092131214#~ msgstr "Delete the selected layer."
    30922 
    30923 #~ msgid "Object"
    30924 #~ msgstr "Object"
    3092531215
    3092631216#~ msgid "There were conflicts during import."
    … …  
    3157931869#~ msgstr "Portcullis"
    3158031870
    31581 #~ msgid "Deleted member ''{0}'' in relation."
    31582 #~ msgstr "Deleted member ''{0}'' in relation."
    31583 
    3158431871#~ msgid "Empty member in relation."
    3158531872#~ msgstr "Empty member in relation."
    … …  
    3168131968#~ msgid "History of Element"
    3168231969#~ msgstr "History of Element"
    31683 
    31684 #~ msgid "Conflicts: {0}"
    31685 #~ msgstr "Conflicts: {0}"
    3168631970
    3168731971#~ msgid "viaduct"
    … …  
    3218732471#~ msgstr "Download referrers from OSM..."
    3218832472
    32189 #~ msgid "Download referrers..."
    32190 #~ msgstr "Download referrers..."
    32191 
    3219232473#~ msgid ""
    3219332474#~ "Enable to upload all changes in one request, disable to use one request "
    … …  
    3246432745#~ msgstr "Exactly four doubles expected in string, got {0}"
    3246532746
     32747#~ msgid "Enter a changset id"
     32748#~ msgstr "Enter a changset id"
     32749
     32750#~ msgid ""
     32751#~ "<html>Select to restrict the query to your changsets only.<br>Unselect to "
     32752#~ "include all changesets in the query.</html>"
     32753#~ msgstr ""
     32754#~ "<html>Select to restrict the query to your changsets only.<br>Unselect to "
     32755#~ "include all changesets in the query.</html>"
     32756
     32757#~ msgid ""
     32758#~ "Click to to return to the relation editor and to resume relation editing"
     32759#~ msgstr ""
     32760#~ "Click to to return to the relation editor and to resume relation editing"
     32761
     32762#~ msgid ""
     32763#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
     32764#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
     32765#~ "strong> is not available yet. It is missing both in your local language "
     32766#~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
     32767#~ "and fill in the missing information.You can both edit the <a href=\"{2}"
     32768#~ "\">help topic in your local language ({1})</a> and the <a href=\"{3}"
     32769#~ "\">help topic in english</a>.</p></html>"
     32770#~ msgstr ""
     32771#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
     32772#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
     32773#~ "strong> is not available yet. It is missing both in your local language "
     32774#~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
     32775#~ "and fill in the missing information.You can both edit the <a href=\"{2}"
     32776#~ "\">help topic in your local language ({1})</a> and the <a href=\"{3}"
     32777#~ "\">help topic in english</a>.</p></html>"
     32778
     32779#~ msgid ""
     32780#~ "<html>Failed to open help page for url {0}.<br>This is most likely due to "
     32781#~ "a network problem, please check your<br>your internet connection</html>"
     32782#~ msgstr ""
     32783#~ "<html>Failed to open help page for url {0}.<br>This is most likely due to "
     32784#~ "a network problem, please check your<br>your internet connection</html>"
     32785
     32786#~ msgid "Please enter the password name of your OSM account"
     32787#~ msgstr "Please enter the password name of your OSM account"
     32788
     32789#~ msgid ""
     32790#~ "Warning: Failed to retrieve user infos for the current JOSM user. "
     32791#~ "Exceptions was: {0}"
     32792#~ msgstr ""
     32793#~ "Warning: Failed to retrieve user infos for the current JOSM user. "
     32794#~ "Exceptions was: {0}"
     32795
     32796#~ msgid ""
     32797#~ "The server reported that the current changset was closed.<br>This is most "
     32798#~ "likely because the changesets size exceeded the max. size<br>of {0} "
     32799#~ "objects on the server ''{1}''."
     32800#~ msgstr ""
     32801#~ "The server reported that the current changset was closed.<br>This is most "
     32802#~ "likely because the changesets size exceeded the max. size<br>of {0} "
     32803#~ "objects on the server ''{1}''."
     32804
     32805#~ msgid ""
     32806#~ "Click ''<strong>{0}</strong>'' to continue uploading to additional new "
     32807#~ "changsets.<br>Click ''<strong>{1}</strong>'' to return to the upload "
     32808#~ "dialog.<br>Click ''<strong>{2}</strong>'' to abort uploading and return "
     32809#~ "to map editing.<br>"
     32810#~ msgstr ""
     32811#~ "Click ''<strong>{0}</strong>'' to continue uploading to additional new "
     32812#~ "changsets.<br>Click ''<strong>{1}</strong>'' to return to the upload "
     32813#~ "dialog.<br>Click ''<strong>{2}</strong>'' to abort uploading and return "
     32814#~ "to map editing.<br>"
     32815
    3246632816#~ msgid ""
    3246732817#~ "Failed to add an OAuth authentication header. There is currently no OAuth "
Note: See TracChangeset for help on using the changeset viewer.