Ignore:
Timestamp:
2011-07-04T00:57:26+02:00 (15 years ago)
Author:
stoecker
Message:

i18n update

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r26224 r26254  
    44#
    55# Bruce Cowan <bcowan@fastmail.co.uk>, 2006 - 2009.
    6 # Dirk Stöcker <openstreetmap@dstoecker.de>, 2008.
     6# Dirk Stöcker <openstreetmap@dstoecker.de>, 2008.
    77# Bruce Cowan <bcowan@fastmail.co.uk>, 2009.
    88# Matthias Julius <mdeb@julius-net.net>, 2010.
    … …  
    1111"Project-Id-Version: JOSM\n"
    1212"Report-Msgid-Bugs-To: \n"
    13 "POT-Creation-Date: 2011-06-30 17:14+0200\n"
     13"POT-Creation-Date: 2011-07-04 00:04+0200\n"
    1414"PO-Revision-Date: 2010-12-16 01:17+0000\n"
    1515"Last-Translator: bastik <Unknown>\n"
    … …  
    2020"Content-Transfer-Encoding: 8bit\n"
    2121"Plural-Forms: nplurals=2; plural=n != 1;\n"
    22 "X-Launchpad-Export-Date: 2011-06-30 14:32+0000\n"
     22"X-Launchpad-Export-Date: 2011-07-03 22:00+0000\n"
    2323"X-Generator: Launchpad (build 13333)\n"
    2424
    2525#. FIXME why is help not a JosmAction?
    2626#. Strings in JFileChooser
    27 #: ../core/src/org/openstreetmap/josm/Main.java:234
     27#: ../core/src/org/openstreetmap/josm/Main.java:244
    2828#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
    2929#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609
    … …  
    3131#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:188
    3232#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:360
    33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209
     33#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:154
    3434#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
    3535#: build/specialmessages.java:63
    … …  
    3838msgstr "Help"
    3939
    40 #: ../core/src/org/openstreetmap/josm/Main.java:474
     40#: ../core/src/org/openstreetmap/josm/Main.java:482
    4141#, java-format
    4242msgid "Ignoring malformed file URL: \"{0}\""
    4343msgstr "Ignoring malformed file URL: \"{0}\""
    4444
    45 #: ../core/src/org/openstreetmap/josm/Main.java:475
    46 #: ../core/src/org/openstreetmap/josm/Main.java:508
    47 #: ../core/src/org/openstreetmap/josm/Main.java:595
     45#: ../core/src/org/openstreetmap/josm/Main.java:483
     46#: ../core/src/org/openstreetmap/josm/Main.java:516
     47#: ../core/src/org/openstreetmap/josm/Main.java:603
    4848#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
    4949#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
    … …  
    6666#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:444
    6767#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
    68 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
    69 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
    70 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:189
    71 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
    72 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
    73 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:317
    74 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
     68#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
     69#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
     70#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
     71#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:98
     72#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:115
     73#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:315
     74#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:234
    7575#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
    7676#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
    77 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607
    78 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:710
    79 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104
     77#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:603
     78#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:706
     79#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
    8080#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
    81 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425
     81#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
    8282#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
    8383#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:396
    84 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:660
     84#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
    8585#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
    86 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:326
     86#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
    8787#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
    8888#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:490
    … …  
    9191#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
    9292#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
    93 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
    94 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
    95 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
     93#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:485
     94#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:510
     95#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:182
    9696#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:179
    9797#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:213
    … …  
    121121msgstr "Warning"
    122122
    123 #: ../core/src/org/openstreetmap/josm/Main.java:507
     123#: ../core/src/org/openstreetmap/josm/Main.java:515
    124124msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
    125125msgstr "Parameter \"downloadgps\" does not accept file names or file URLs"
    126126
    127 #: ../core/src/org/openstreetmap/josm/Main.java:594
     127#: ../core/src/org/openstreetmap/josm/Main.java:602
    128128#, java-format
    129129msgid "Ignoring malformed URL: \"{0}\""
    130130msgstr "Ignoring malformed URL: \"{0}\""
    131131
    132 #: ../core/src/org/openstreetmap/josm/Main.java:745
     132#: ../core/src/org/openstreetmap/josm/Main.java:753
    133133#, java-format
    134134msgid ""
    … …  
    138138msgstr ""
    139139
    140 #: ../core/src/org/openstreetmap/josm/Main.java:760
     140#: ../core/src/org/openstreetmap/josm/Main.java:768
    141141msgid "Exit JOSM"
    142142msgstr ""
    143143
    144 #: ../core/src/org/openstreetmap/josm/Main.java:761
     144#: ../core/src/org/openstreetmap/josm/Main.java:769
    145145msgid "Continue, try anyway"
    146146msgstr ""
    147147
    148 #: ../core/src/org/openstreetmap/josm/Main.java:762
     148#: ../core/src/org/openstreetmap/josm/Main.java:770
    149149#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
    150150#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
    151151#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:335
    152152#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:378
    153 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
    154 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:466
    155 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
    156 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
    157 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
    158 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:130
     153#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
     154#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
     155#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
     156#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
     157#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
     158#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:127
    159159#: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:267
    160160#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
    … …  
    162162#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
    163163#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
    164 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
    165 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
     164#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
     165#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
    166166#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
    167 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
    168 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:855
     167#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
     168#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
    169169#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:569
    170170#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:765
    … …  
    312312
    313313#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
    314 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:171
    315 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:66
     314#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:167
     315#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:62
    316316msgid "Plugins"
    317317msgstr "Plug-ins"
    … …  
    363363#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
    364364#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:116
    365 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:157
    366 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:224
     365#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:158
     366#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:225
    367367#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:99
    368368#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:158
    … …  
    382382#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
    383383#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:346
    384 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
    385 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
     384#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
     385#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:138
    386386#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
    387387#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
    388388#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
    389389#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
    390 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1271
     390#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1267
    391391#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
    392 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376
    393 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112
    394 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160
    395 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220
     392#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372
     393#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:109
     394#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:157
     395#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:217
    396396#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142
    397397#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:341
    398398#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:292
    399 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:381
    400 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:446
     399#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378
     400#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:443
    401401#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
    402402#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
    … …  
    406406#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
    407407#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
    408 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
     408#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
    409409#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
    410 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
     410#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:194
    411411#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
    412412#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
    … …  
    465465#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
    466466#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
    467 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
     467#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:639
    468468msgid "Merge"
    469469msgstr "Merge"
    … …  
    488488msgstr ""
    489489
    490 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:28
    491 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
    492 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38
     490#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26
     491#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:27
     492#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:36
    493493msgid "Add Node..."
    494494msgstr "Add Node..."
    495495
    496 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:28
     496#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26
    497497msgid "Add a node by entering latitude and longitude."
    498498msgstr "Add a node by entering latitude and longitude."
    … …  
    507507#. * for now this is a reasonable approximation.
    508508#.
    509 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
     509#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:27
    510510#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
    511511#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
    … …  
    522522#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
    523523#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
    524 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1579
     524#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1575
    525525#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
    526526#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:63
    … …  
    626626#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
    627627#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:83
    628 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:106
     628#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
    629629#: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:625
    630630#: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
    … …  
    725725
    726726#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
    727 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:384
     727#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:382
    728728msgid "Close open changesets"
    729729msgstr "Close open changesets"
    … …  
    735735
    736736#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39
    737 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
     737#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:30
    738738#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:55
    739739#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:30
    … …  
    743743#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
    744744#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
    745 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91
     745#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:88
    746746#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:53
    747747#: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:19
    … …  
    878878#: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:643
    879879#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
    880 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
     880#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:320
    881881#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
    882 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
     882#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
    883883#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
    884884#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
    885885#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:741
    886 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:508
     886#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
    887887#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
    888888#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
    … …  
    907907#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
    908908#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
    909 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:223
    910909#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:224
     910#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:225
    911911#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
    912912#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
    … …  
    935935msgstr "Distribute the selected nodes to equal distances along a line."
    936936
    937 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
    938 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
     937#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:29
     938#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:30
    939939msgid "Download from OSM..."
    940940msgstr "Download from OSM..."
    941941
    942 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
     942#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:29
    943943msgid "Download map data from the OSM server."
    944944msgstr "Download map data from the OSM server."
    … …  
    10811081#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22
    10821082#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
    1083 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695
    1084 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
     1083#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:693
     1084#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1437
    10851085#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:524
    10861086msgid "Duplicate"
    … …  
    11001100
    11011101#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
    1102 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
     1102#: ../core/src/org/openstreetmap/josm/data/Preferences.java:556
    11031103#, java-format
    11041104msgid "Layer: {0}"
    … …  
    11891189msgstr ""
    11901190
    1191 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:156
     1191#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:157
    11921192#: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:31
    11931193msgid "Adjust imagery offset"
    … …  
    11951195
    11961196#. Strings in JFileChooser
    1197 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:157
     1197#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:158
    11981198#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
    11991199#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
    12001200#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
    12011201#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:266
    1202 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
     1202#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1232
    12031203#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
    1204 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:358
     1204#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
    12051205#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
    12061206#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
    12071207#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
    12081208#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
    1209 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
     1209#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:188
    12101210#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
    12111211#: build/specialmessages.java:71
    … …  
    12281228msgstr "OK"
    12291229
    1230 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:162
     1230#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:163
    12311231#, java-format
    12321232msgid ""
    … …  
    12371237msgstr ""
    12381238
    1239 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:165
     1239#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:166
    12401240msgid "Offset: "
    12411241msgstr ""
    12421242
    1243 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:167
     1243#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:168
    12441244msgid "Bookmark name: "
    12451245msgstr ""
    12461246
    1247 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:228
     1247#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:229
    12481248msgid "Offset bookmark already exists. Overwrite?"
    12491249msgstr ""
    … …  
    16101610
    16111611#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:130
    1612 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:235
     1612#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:233
    16131613msgid "Cannot move objects outside of the world."
    16141614msgstr "Cannot move objects outside of the world."
    … …  
    18421842#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
    18431843#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:36
    1844 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1579
     1844#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1575
    18451845msgid "Paste Tags"
    18461846msgstr "Paste Tags"
    … …  
    24482448msgstr "Selection empty"
    24492449
    2450 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90
    2451 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91
     2450#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87
     2451#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:88
    24522452msgid "Upload data"
    24532453msgstr "Upload data"
    24542454
    2455 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90
     2455#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87
    24562456msgid "Upload all changes in the active data layer to the OSM server"
    24572457msgstr "Upload all changes in the active data layer to the OSM server"
    24582458
    2459 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
     2459#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
    24602460#, java-format
    24612461msgid ""
    … …  
    24662466"''{0}''.<br>You have to resolve them first.</html>"
    24672467
    2468 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
    2469 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:99
    2470 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:116
     2468#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:153
     2469#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:97
     2470#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:114
    24712471msgid "No changes to upload."
    24722472msgstr "No changes to upload."
    24732473
    2474 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188
     2474#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
    24752475msgid "Nothing to upload. Get some data first."
    24762476msgstr "Nothing to upload. Get some data first."
    24772477
    2478 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
     2478#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:43
    24792479msgid "Upload selection"
    24802480msgstr "Upload selection"
    24812481
    2482 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
     2482#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
    24832483msgid "Upload all changes in the current selection to the OSM server."
    24842484msgstr "Upload all changes in the current selection to the OSM server."
    24852485
    2486 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:256
     2486#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:254
    24872487msgid "Checking parents for deleted objects"
    24882488msgstr "Checking parents for deleted objects"
    24892489
    2490 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:315
     2490#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:313
    24912491#, java-format
    24922492msgid "Reading parents of ''{0}''"
    24932493msgstr "Reading parents of ''{0}''"
    24942494
    2495 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:321
     2495#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:319
    24962496msgid "Checking for deleted parents in the local dataset"
    24972497msgstr "Checking for deleted parents in the local dataset"
    … …  
    26512651msgstr "Downloaded GPX Data"
    26522652
    2653 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82
     2653#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:79
    26542654msgid "Downloading data"
    26552655msgstr "Downloading data"
    26562656
    2657 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94
     2657#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:91
    26582658#, java-format
    26592659msgid ""
    … …  
    26622662"Ignoring exception because download has been cancelled. Exception was: {0}"
    26632663
    2664 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:142
     2664#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
    26652665msgid "No data found in this area."
    26662666msgstr "No data found in this area."
    … …  
    27382738
    27392739#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:179
    2740 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:328
    2741 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:474
     2740#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:326
     2741#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:472
    27422742#, java-format
    27432743msgid "There was {0} conflict during import."
    … …  
    27802780
    27812781#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:93
    2782 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90
     2782#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:88
    27832783#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:129
    27842784#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:129
    2785 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:105
     2785#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
    27862786#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
    27872787#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:99
    … …  
    28032803"when deleting a way. Ctrl: delete referring objects."
    28042804
    2805 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:89
    2806 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90
     2805#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:87
     2806#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:88
    28072807msgid "Draw"
    28082808msgstr "Draw"
    28092809
    2810 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:89
     2810#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:87
    28112811msgid "Draw nodes"
    28122812msgstr "Draw nodes"
    28132813
    28142814#. Add extra shortcut N
    2815 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
     2815#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
    28162816msgid "Mode: Draw Focus"
    28172817msgstr "Mode: Draw Focus"
    28182818
    2819 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:316
     2819#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:314
    28202820msgid "Cannot add a node outside of the world."
    28212821msgstr "Cannot add a node outside of the world."
    28222822
    2823 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:491
     2823#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:489
    28242824msgid "Add node"
    28252825msgstr "Add node"
    28262826
    2827 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493
     2827#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:491
    28282828msgid "Add node into way"
    28292829msgstr "Add node into way"
    28302830
    2831 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
     2831#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:499
    28322832msgid "Connect existing way to node"
    28332833msgstr "Connect existing way to node"
    28342834
    2835 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:503
     2835#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
    28362836#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:368
    28372837msgid "Add a new node to an existing way"
    28382838msgstr "Add a new node to an existing way"
    28392839
    2840 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:505
     2840#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:503
    28412841msgid "Add node into way and connect"
    28422842msgstr "Add node into way and connect"
    28432843
    2844 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:907
     2844#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:905
    28452845msgid "Create new node."
    28462846msgstr "Create new node."
    28472847
    2848 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
    2849 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
     2848#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910
     2849#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934
    28502850msgid "Select node under cursor."
    28512851msgstr "Select node under cursor."
    28522852
    2853 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914
     2853#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
    28542854#, java-format
    28552855msgid "Insert new node into way."
    … …  
    28582858msgstr[1] "Insert new node into {0} ways."
    28592859
    2860 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924
     2860#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922
    28612861msgid "Start new way from last node."
    28622862msgstr "Start new way from last node."
    28632863
    2864 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:926
     2864#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924
    28652865msgid "Continue way from last node."
    28662866msgstr "Continue way from last node."
    28672867
    2868 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
    2869 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
     2868#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
     2869#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
    28702870msgid "Finish drawing."
    28712871msgstr "Finish drawing."
    … …  
    29422942"+release to synchronise audio at that point."
    29432943
    2944 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:104
    2945 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:105
    2946 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
     2944#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:102
     2945#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
     2946#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:297
    29472947#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
    29482948#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361
    2949 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
     2949#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326
    29502950#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
    29512951#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
    … …  
    29582958msgstr "Select"
    29592959
    2960 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:104
     2960#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:102
    29612961msgid "Select, move, scale and rotate objects"
    29622962msgstr ""
    29632963
    2964 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:197
     2964#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
    29652965#, java-format
    29662966msgid "Add and move a virtual new node to way"
    … …  
    29692969msgstr[1] "Add and move a virtual new node to {0} ways"
    29702970
    2971 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:529
     2971#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:523
    29722972msgid "Move elements"
    29732973msgstr "Move elements"
    29742974
    2975 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:530
     2975#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
    29762976msgid "Move them"
    29772977msgstr "Move them"
    29782978
    2979 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:530
     2979#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
    29802980msgid "Undo move"
    29812981msgstr "Undo move"
    29822982
    2983 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:532
     2983#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
    29842984#, java-format
    29852985msgid ""
    … …  
    29922992"Really move them?"
    29932993
    2994 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:687
     2994#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:669
    29952995msgid "Release the mouse button to select the objects in the rectangle."
    29962996msgstr "Release the mouse button to select the objects in the rectangle."
    29972997
    2998 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:689
     2998#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:671
    29992999msgid ""
    30003000"Release the mouse button to stop moving. Ctrl to merge with nearest node."
    … …  
    30023002"Release the mouse button to stop moving. Ctrl to merge with nearest node."
    30033003
    3004 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:691
     3004#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:673
    30053005msgid "Release the mouse button to stop rotating."
    30063006msgstr "Release the mouse button to stop rotating."
    30073007
    3008 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:693
     3008#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:675
    30093009msgid "Release the mouse button to stop scaling."
    30103010msgstr ""
    30113011
    3012 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:695
     3012#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:677
    30133013msgid ""
    30143014"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
    … …  
    32283228#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
    32293229msgid ""
    3230 "<b>areasize:</b>... - closed ways with area between MIN and MAX m². "
     3230"<b>areasize:</b>... - closed ways with area between MIN and MAX m². "
    32313231"(areasize:MIN-MAX or areasize:MAX)"
    32323232msgstr ""
    … …  
    32963296
    32973297#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:223
    3298 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
     3298#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:300
    32993299msgid "Search"
    33003300msgstr "Search"
    … …  
    36233623msgstr "Set {0}={1} for {2} objects"
    36243624
    3625 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
     3625#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
    36263626#, java-format
    36273627msgid "Change relation member role for {0} {1}"
    … …  
    36363636
    36373637#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36
    3638 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193
     3638#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
    36393639msgid "Double conflict"
    36403640msgstr "Double conflict"
    … …  
    36523652msgstr "Add conflict for ''{0}''"
    36533653
    3654 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67
    3655 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212
    3656 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84
     3654#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:63
     3655#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:81
    36573656#, java-format
    36583657msgid ""
    … …  
    37803779
    37813780#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
    3782 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
    37833781#, java-format
    37843782msgid "Purged {0} object"
    … …  
    37873785msgstr[1] "Purged {0} objects"
    37883786
    3789 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
    3790 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
    3791 #, java-format
    3792 msgid "Purged object ''{0}''"
    3793 msgstr "Purged object ''{0}''"
    3794 
    3795 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
    3796 #, java-format
    3797 msgid ""
    3798 "Warning: Purging way {0} because number of nodes dropped below 2. Current is "
    3799 "{1}"
    3800 msgstr ""
    3801 "Warning: Purging way {0} because number of nodes dropped below 2. Current is "
    3802 "{1}"
    3803 
    3804 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173
    3805 #, java-format
    3806 msgid "Removing reference from relation {0}"
    3807 msgstr "Removing reference from relation {0}"
    3808 
    3809 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:53
     3787#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:50
    38103788#, java-format
    38113789msgid "Resolve conflicts in member list of relation {0}"
    … …  
    38263804msgstr[1] ""
    38273805
    3828 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:93
     3806#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:90
    38293807msgid "Sequence"
    38303808msgstr "Sequence"
    38313809
    3832 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:64
     3810#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:60
    38333811#, java-format
    38343812msgid "Resolve {0} tag conflicts in node {1}"
    38353813msgstr "Resolve {0} tag conflicts in node {1}"
    38363814
    3837 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:65
     3815#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61
    38383816#, java-format
    38393817msgid "Resolve {0} tag conflicts in way {1}"
    38403818msgstr "Resolve {0} tag conflicts in way {1}"
    38413819
    3842 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66
     3820#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62
    38433821#, java-format
    38443822msgid "Resolve {0} tag conflicts in relation {1}"
    … …  
    38523830msgstr[1] ""
    38533831
    3854 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65
     3832#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:63
    38553833#, java-format
    38563834msgid "Undelete {0} object"
    … …  
    38743852msgstr "Resolve version conflict for relation {0}"
    38753853
    3876 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:49
     3854#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:45
    38773855#, java-format
    38783856msgid "Resolve conflicts in node list of way {0}"
    38793857msgstr "Resolve conflicts in node list of way {0}"
    38803858
    3881 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:66
     3859#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:62
    38823860#, java-format
    38833861msgid "Main dataset does not include node {0}"
    … …  
    39903968msgstr "Illegal longitude value ''{0}''"
    39913969
    3992 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:330
     3970#: ../core/src/org/openstreetmap/josm/data/Preferences.java:328
    39933971#, java-format
    39943972msgid "Warning: failed to persist preferences to ''{0}''"
    39953973msgstr "Warning: failed to persist preferences to ''{0}''"
    39963974
    3997 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:439
     3975#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451
    39983976#, java-format
    39993977msgid "Malformed config file at lines {0}"
    40003978msgstr "Malformed config file at lines {0}"
    40013979
    4002 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:451
     3980#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
    40033981#, java-format
    40043982msgid ""
    … …  
    40093987"not a directory."
    40103988
    4011 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
     3989#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466
    40123990#, java-format
    40133991msgid ""
    … …  
    40183996"not a directory.</html>"
    40193997
    4020 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
     3998#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
    40213999#, java-format
    40224000msgid ""
    … …  
    40274005"preference directory: {0}"
    40284006
    4029 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:465
     4007#: ../core/src/org/openstreetmap/josm/data/Preferences.java:477
    40304008#, java-format
    40314009msgid ""
    … …  
    40364014"preference directory: {0}</html>"
    40374015
    4038 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:476
     4016#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488
    40394017#, java-format
    40404018msgid ""
    … …  
    40434021"Warning: Missing preference file ''{0}''. Creating a default preference file."
    40444022
    4045 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:480
     4023#: ../core/src/org/openstreetmap/josm/data/Preferences.java:492
    40464024#, java-format
    40474025msgid ""
    … …  
    40524030"file."
    40534031
    4054 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:488
     4032#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
    40554033#, java-format
    40564034msgid ""
    … …  
    40614039"to default: {0}</html>"
    40624040
    4063 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
     4041#: ../core/src/org/openstreetmap/josm/data/Preferences.java:513
    40644042#, java-format
    40654043msgid ""
    … …  
    40704048"<br> and creating a new default preference file.</html>"
    40714049
    4072 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:511
     4050#: ../core/src/org/openstreetmap/josm/data/Preferences.java:523
    40734051#, java-format
    40744052msgid ""
    … …  
    40794057"default: {0}"
    40804058
    4081 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:537
     4059#: ../core/src/org/openstreetmap/josm/data/Preferences.java:549
    40824060#, java-format
    40834061msgid "Paint style {0}: {1}"
    40844062msgstr "Paint style {0}: {1}"
    40854063
    4086 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:105
     4064#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
    40874065#, java-format
    40884066msgid "Preferences stored on {0}"
    40894067msgstr "Preferences stored on {0}"
    40904068
    4091 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
     4069#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:110
    40924070#, java-format
    40934071msgid "Could not upload preferences. Reason: {0}"
    40944072msgstr "Could not upload preferences. Reason: {0}"
    40954073
    4096 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:129
     4074#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:126
    40974075msgid "Could not load preferences from server."
    40984076msgstr "Could not load preferences from server."
    … …  
    41354113#.
    41364114#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
    4137 msgid "deg° min'' sec\""
     4115msgid "deg° min'' sec\""
    41384116msgstr ""
    41394117
    … …  
    41424120#.
    41434121#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
    4144 msgid "deg° min'' (Nautical)"
     4122msgid "deg° min'' (Nautical)"
    41454123msgstr ""
    41464124
    … …  
    44544432#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27
    44554433#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180
    4456 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
     4434#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
    44574435msgid "background"
    44584436msgstr "background"
    … …  
    51635141#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
    51645142#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:731
    5165 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:470
     5143#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:466
    51665144#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
    51675145#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:790
    … …  
    51845162#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
    51855163#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
    5186 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
     5164#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
    51875165#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
    51885166#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
    5189 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:483
     5167#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:479
    51905168#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:804
    51915169#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1056
    … …  
    56905668#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
    56915669#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:517
    5692 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
    5693 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:819
    5694 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:269
    5695 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:424
     5670#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
     5671#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
     5672#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
     5673#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422
    56965674#, java-format
    56975675msgid "{0} node"
    … …  
    57835761#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
    57845762#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:111
    5785 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
     5763#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:153
    57865764#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
    57875765msgid "Show help information"
    … …  
    64636441msgstr "role {0} is not participating in compare pair {1}"
    64646442
    6465 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104
    6466 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208
     6443#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:102
     6444#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:206
    64676445#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178
    64686446msgid "Properties"
    64696447msgstr "Properties"
    64706448
    6471 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109
    6472 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172
     6449#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:107
     6450#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
    64736451#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180
    6474 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:258
     6452#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
    64756453#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132
    64766454#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:434
    … …  
    64796457msgstr "Tags"
    64806458
    6481 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114
    6482 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253
     6459#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:112
     6460#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:251
    64836461#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139
    64846462#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
    … …  
    64866464msgstr "Nodes"
    64876465
    6488 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119
    6489 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248
    6490 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294
     6466#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:117
     6467#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:246
     6468#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:290
    64916469#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
    64926470msgid "Members"
    64936471msgstr "Members"
    64946472
    6495 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173
     6473#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:171
    64966474msgid "No pending tag conflicts to be resolved"
    64976475msgstr "No pending tag conflicts to be resolved"
    64986476
    6499 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
     6477#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174
    65006478#, java-format
    65016479msgid "Tags({0} conflict)"
    … …  
    65046482msgstr[1] "Tags({0} conflicts)"
    65056483
    6506 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
     6484#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175
    65076485#, java-format
    65086486msgid "{0} pending tag conflict to be resolved"
    … …  
    65116489msgstr[1] "{0} pending tag conflicts to be resolved"
    65126490
    6513 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
     6491#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:183
    65146492msgid "Nodes(resolved)"
    65156493msgstr "Nodes(resolved)"
    65166494
    6517 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
     6495#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184
    65186496msgid ""
    65196497"Merged node list frozen. No pending conflicts in the node list of this way"
    … …  
    65216499"Merged node list frozen. No pending conflicts in the node list of this way"
    65226500
    6523 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
     6501#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187
    65246502msgid "Nodes(with conflicts)"
    65256503msgstr "Nodes(with conflicts)"
    65266504
    6527 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
     6505#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188
    65286506msgid "Pending conflicts in the node list of this way"
    65296507msgstr "Pending conflicts in the node list of this way"
    65306508
    6531 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195
     6509#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:193
    65326510msgid "Members(resolved)"
    65336511msgstr "Members(resolved)"
    65346512
    6535 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196
     6513#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:194
    65366514msgid ""
    65376515"Merged member list frozen. No pending conflicts in the member list of this "
    … …  
    65416519"relation"
    65426520
    6543 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199
     6521#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
    65446522msgid "Members(with conflicts)"
    65456523msgstr "Members(with conflicts)"
    65466524
    6547 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200
     6525#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
    65486526msgid "Pending conflicts in the member list of this relation"
    65496527msgstr "Pending conflicts in the member list of this relation"
    65506528
    6551 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209
     6529#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:207
    65526530msgid "No pending property conflicts"
    65536531msgstr "No pending property conflicts"
    65546532
    6555 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212
     6533#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210
    65566534msgid "Properties(with conflicts)"
    65576535msgstr "Properties(with conflicts)"
    65586536
    6559 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213
     6537#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:211
    65606538msgid "Pending property conflicts to be resolved"
    65616539msgstr "Pending property conflicts to be resolved"
    65626540
    6563 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284
     6541#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:282
    65646542msgid "Conflict Resolution"
    65656543msgstr "Conflict Resolution"
    65666544
    6567 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321
     6545#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:319
    65686546#, java-format
    65696547msgid "{0} more..."
    65706548msgstr "{0} more..."
    65716549
    6572 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
     6550#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:323
    65736551msgid ""
    65746552"The following objects could not be copied to the target object<br>because "
    … …  
    65766554msgstr ""
    65776555
    6578 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335
     6556#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:333
    65796557msgid "Merging deleted objects failed"
    65806558msgstr ""
    65816559
    6582 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:628
    6583 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:652
     6560#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:626
     6561#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:650
    65846562#, java-format
    65856563msgid "List in role {0} is currently not participating in a compare pair."
    65866564msgstr "list in role {0} is currently not participating in a compare pair"
    65876565
    6588 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:801
     6566#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:799
    65896567#, java-format
    65906568msgid "Unexpected value of parameter ''index''. Got {0}."
    65916569msgstr "unexpected value of parameter \"index\". Got {0}"
    65926570
    6593 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:815
     6571#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:813
    65946572#, java-format
    65956573msgid "Item {0} not found in list."
    65966574msgstr "item {0} not found in list"
    65976575
    6598 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:238
     6576#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:236
    65996577msgid "lock scrolling"
    66006578msgstr "lock scrolling"
    66016579
    6602 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:246
     6580#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:244
    66036581msgid "Compare "
    66046582msgstr "Compare "
    66056583
    6606 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:281
     6584#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:279
    66076585#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:77
    66086586msgid "My version"
    66096587msgstr "My version"
    66106588
    6611 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:282
     6589#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280
    66126590msgid "List of elements in my dataset, i.e. the local dataset"
    66136591msgstr "List of elements in my dataset, i.e. the local dataset"
    66146592
    6615 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:287
     6593#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:285
    66166594#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
    66176595#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140
    … …  
    66196597msgstr "Merged version"
    66206598
    6621 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:288
     6599#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
    66226600msgid ""
    66236601"List of merged elements. They will replace the my elements when the merge "
    … …  
    66276605"decisions are applied."
    66286606
    6629 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:293
     6607#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:291
    66306608#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
    66316609msgid "Their version"
    66326610msgstr "Their version"
    66336611
    6634 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:294
     6612#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292
    66356613msgid "List of elements in their dataset, i.e. the server dataset"
    66366614msgstr "List of elements in their dataset, i.e. the server dataset"
    66376615
    6638 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:426
     6616#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:424
    66396617msgid "> top"
    66406618msgstr "> top"
    66416619
    6642 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:428
     6620#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:426
    66436621msgid "Copy my selected nodes to the start of the merged node list"
    66446622msgstr "Copy my selected nodes to the start of the merged node list"
    66456623
    6646 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:453
     6624#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:451
    66476625msgid "> bottom"
    66486626msgstr "> bottom"
    66496627
    6650 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:455
     6628#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:453
    66516629msgid "Copy my selected elements to the end of the list of merged elements."
    66526630msgstr "Copy my selected elements to the end of the list of merged elements"
    66536631
    6654 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:482
     6632#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:480
    66556633msgid ""
    66566634"Copy my selected elements before the first selected element in the list of "
    … …  
    66606638"merged elements"
    66616639
    6662 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:516
     6640#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:514
    66636641msgid ""
    66646642"Copy my selected elements after the first selected element in the list of "
    … …  
    66686646"merged elements"
    66696647
    6670 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:545
     6648#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:543
    66716649msgid ""
    66726650"Copy their selected element to the start of the list of merged elements."
    … …  
    66746652"Copy their selected element to the start of the list of merged elements"
    66756653
    6676 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:567
     6654#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:565
    66776655msgid "Copy their selected elements to the end of the list of merged elements."
    66786656msgstr "Copy their selected elements to the end of the list of merged elements"
    66796657
    6680 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:589
     6658#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:587
    66816659msgid ""
    66826660"Copy their selected elements before the first selected element in the list "
    … …  
    66866664"of merged elements"
    66876665
    6688 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:618
     6666#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:616
    66896667msgid ""
    66906668"Copy their selected element after the first selected element in the list of "
    … …  
    66946672"merged elements"
    66956673
    6696 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:644
     6674#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:642
    66976675msgid "Copy all my elements to the target"
    66986676msgstr "Copy all my elements to the target"
    66996677
    6700 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:670
     6678#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:668
    67016679msgid "Copy all their elements to the target"
    67026680msgstr "Copy all their elements to the target"
    67036681
    67046682#. Strings in JFileChooser
    6705 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:697
     6683#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:695
    67066684#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
    67076685#: build/specialmessages.java:85
    … …  
    67096687msgstr "Up"
    67106688
    6711 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:699
     6689#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:697
    67126690msgid "Move up the selected elements by one position."
    67136691msgstr "Move up the selected elements by one position"
    67146692
    6715 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:729
     6693#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
    67166694#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
    67176695msgid "Down"
    67186696msgstr "Down"
    67196697
    6720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:731
     6698#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:729
    67216699msgid "Move down the selected entries by one position."
    67226700msgstr "Move down the selected entries by one position"
    67236701
    6724 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
     6702#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:759
    67256703#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
    67266704#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:181
    … …  
    67346712msgstr "Remove"
    67356713
    6736 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:763
     6714#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
    67376715msgid "Remove the selected entries from the list of merged elements."
    67386716msgstr "Remove the selected entries from the list of merged elements"
    67396717
    6740 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:792
    6741 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:829
     6718#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:790
     6719#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:827
    67426720msgid "Freeze"
    67436721msgstr "Freeze"
    67446722
    6745 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
    6746 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:830
     6723#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:791
     6724#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:828
    67476725msgid "Freeze the current list of merged elements."
    67486726msgstr "Freeze the current list of merged elements"
    67496727
    6750 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:825
     6728#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:823
    67516729msgid "Unfreeze"
    67526730msgstr "Unfreeze"
    67536731
    6754 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:826
     6732#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:824
    67556733msgid "Unfreeze the list of merged elements and start merging."
    67566734msgstr "Unfreeze the list of merged elements and start merging"
    67576735
    6758 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:851
     6736#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:849
    67596737#, java-format
    67606738msgid ""
    … …  
    67646742"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
    67656743
    6766 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:856
     6744#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:854
    67676745#, java-format
    67686746msgid ""
    … …  
    67736751"html>"
    67746752
    6775 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:874
     6753#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872
    67766754#, java-format
    67776755msgid "My version ({0} entry)"
    … …  
    67806758msgstr[1] "My version ({0} entries)"
    67816759
    6782 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:877
     6760#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875
    67836761#, java-format
    67846762msgid "Merged version ({0} entry)"
    … …  
    67876765msgstr[1] "Merged version ({0} entries)"
    67886766
    6789 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:880
     6767#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:878
    67906768#, java-format
    67916769msgid "Their version ({0} entry)"
    … …  
    67946772msgstr[1] "Their version ({0} entries)"
    67956773
    6796 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:943
     6774#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:941
    67976775#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79
    67986776#, java-format
    … …  
    68046782"adjustment."
    68056783
    6806 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:958
     6784#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:956
    68076785#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94
    68086786#, java-format
    … …  
    68146792msgstr "Node"
    68156793
    6816 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68
     6794#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66
    68176795msgid "Merged nodes not frozen yet. Cannot build resolution command."
    68186796msgstr "Merged nodes not frozen yet. Cannot build resolution command."
    … …  
    68936871msgstr "Primitive"
    68946872
    6895 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:121
     6873#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:119
    68966874msgid "Merged nodes not frozen yet. Cannot build resolution command"
    68976875msgstr "Merged nodes not frozen yet. Cannot build resolution command"
    … …  
    69306908#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
    69316909#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
    6932 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
     6910#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72
    69336911#: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:52
    69346912#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:147
    … …  
    69506928#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
    69516929#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
    6952 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
     6930#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:79
    69536931#: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:52
    69546932#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:147
    … …  
    70186996
    70196997#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345
    7020 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
     6998#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:268
    70216999msgid "Cancel conflict resolution"
    70227000msgstr "Cancel conflict resolution"
    70237001
    70247002#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
    7025 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284
     7003#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:283
    70267004msgid "Apply resolved conflicts"
    70277005msgstr "Apply resolved conflicts"
    70287006
    70297007#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:361
    7030 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
     7008#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284
    70317009#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
    7032 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203
     7010#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
    70337011#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ApplyAllGuessesAction.java:46
    70347012#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
    … …  
    70387016
    70397017#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
    7040 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
     7018#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:162
    70417019#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
    70427020#: ../plugins/smed/src/smed/menu/file/TabManager.java:308
    … …  
    70877065msgstr "Not decided yet"
    70887066
    7089 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
     7067#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:48
    70907068msgid "Tags from nodes"
    70917069msgstr "Tags from nodes"
    70927070
    7093 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
     7071#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
    70947072msgid "Tags from ways"
    70957073msgstr "Tags from ways"
    70967074
    7097 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
     7075#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
    70987076msgid "Tags from relations"
    70997077msgstr "Tags from relations"
    71007078
    7101 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
     7079#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:77
    71027080msgid "Conflicts in pasted tags"
    71037081msgstr "Conflicts in pasted tags"
    71047082
    7105 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370
    7106 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392
     7083#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
     7084#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:391
    71077085msgid "Paste ..."
    71087086msgstr "Paste ..."
    71097087
    7110 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
    7111 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392
     7088#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:376
     7089#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:391
    71127090msgid "From ..."
    71137091msgstr "From ..."
    71147092
    7115 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384
    7116 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392
     7093#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:383
     7094#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:391
    71177095msgid "To ..."
    71187096msgstr "To ..."
    71197097
    71207098#. minimum size is relevant for multisplit layout
    7121 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441
     7099#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:437
    71227100#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498
    71237101#, java-format
    … …  
    71277105msgstr[1] "{0} tags"
    71287106
    7129 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
    7130 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
    7131 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:270
    7132 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:429
     7107#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:457
     7108#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811
     7109#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
     7110#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427
    71337111#, java-format
    71347112msgid "{0} way"
    … …  
    71377115msgstr[1] "{0} ways"
    71387116
    7139 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
    7140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:823
    7141 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434
     7117#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:458
     7118#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:819
     7119#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432
    71427120#, java-format
    71437121msgid "{0} relation"
    … …  
    72697247msgstr "Show tags with multiple values only"
    72707248
    7271 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:161
     7249#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:159
    72727250msgid "For selected objects only"
    72737251msgstr "For selected objects only"
    72747252
    7275 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:162
     7253#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:160
    72767254msgid ""
    72777255"<html>Select to show changesets for the currently selected objects only."
    … …  
    72837261"html>"
    72847262
    7285 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
    7286 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:134
     7263#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:251
     7264#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
    72877265msgid "Changesets"
    72887266msgstr "Changesets"
    72897267
    7290 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:255
     7268#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
    72917269msgid "Open the list of changesets in the current layer."
    72927270msgstr "Open the list of changesets in the current layer."
    72937271
    7294 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:300
     7272#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:298
    72957273msgid "Select all objects assigned to the currently selected changesets"
    72967274msgstr "Select all objects assigned to the currently selected changesets"
    72977275
    7298 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:349
    7299 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:179
    7300 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:393
     7276#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:347
     7277#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175
     7278#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389
    73017279msgid "Download"
    73027280msgstr "Download"
    73037281
    7304 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
     7282#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:348
    73057283msgid "Download information about the selected changesets from the OSM server"
    73067284msgstr "Download information about the selected changesets from the OSM server"
    73077285
    7308 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:385
     7286#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:383
    73097287msgid "Closes the selected open changesets"
    73107288msgstr "Closes the selected open changesets"
    73117289
    7312 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:416
     7290#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:414
    73137291#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:213
    73147292msgid "Show info"
    73157293msgstr "Show info"
    73167294
    7317 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:417
     7295#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:415
    73187296msgid "Open a web page for each selected changeset"
    73197297msgstr "Open a web page for each selected changeset"
    73207298
    73217299#. Strings in JFileChooser
    7322 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
     7300#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:454
    73237301#: build/specialmessages.java:49
    73247302#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:194
    … …  
    73267304msgstr "Details"
    73277305
    7328 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:457
     7306#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:455
    73297307msgid "Opens the Changeset Manager window for the selected changesets"
    73307308msgstr "Opens the Changeset Manager window for the selected changesets"
    … …  
    73447322#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
    73457323#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
    7346 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:175
     7324#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:173
    73477325#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:88
    7348 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
    7349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:169
     7326#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
     7327#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:165
    73507328#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
    73517329#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
    … …  
    73957373
    73967374#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362
    7397 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:331
     7375#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327
    73987376#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115
    73997377#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:101
    … …  
    74037381"Set the selected elements on the map to the selected items in the list above."
    74047382
    7405 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
     7383#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:137
    74067384msgid "Cancel conflict resolution and close the dialog"
    74077385msgstr "Cancel conflict resolution and close the dialogue"
    74087386
    7409 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225
     7387#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170
    74107388msgid "Apply resolved conflicts and close the dialog"
    74117389msgstr "Apply resolved conflicts and close the dialogue"
    74127390
    7413 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226
     7391#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
    74147392msgid "Apply Resolution"
    74157393msgstr "Apply Resolution"
    74167394
    7417 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238
     7395#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
    74187396msgid "Close anyway"
    74197397msgstr "Close anyway"
    74207398
    7421 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239
     7399#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184
    74227400msgid "Continue resolving"
    74237401msgstr "Continue resolving"
    74247402
    7425 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241
     7403#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186
    74267404#, java-format
    74277405msgid ""
    … …  
    74387416"<strong>{1}</strong> to return to resolving conflicts.</html>"
    74397417
    7440 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
     7418#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:194
    74417419#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:671
    74427420msgid "Conflict not resolved completely"
    74437421msgstr "Conflict not resolved completely"
    74447422
    7445 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:282
     7423#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:227
    74467424msgid "Resolve conflicts"
    74477425msgstr "Resolve conflicts"
    74487426
    7449 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:284
     7427#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:229
    74507428#, java-format
    74517429msgid "Resolve conflicts for ''{0}''"
    … …  
    78427820msgstr "Close the dialogue, do not create a new node"
    78437821
    7844 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:174
    7845 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:175
     7822#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:172
     7823#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:173
    78467824msgid "Layers"
    78477825msgstr "Layers"
    78487826
    7849 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:174
     7827#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:172
    78507828msgid "Open a list of all loaded layers."
    78517829msgstr "Open a list of all loaded layers."
    78527830
    7853 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
     7831#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:319
    78547832msgid "Delete the selected layers."
    78557833msgstr "Delete the selected layers."
    78567834
    7857 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:402
    7858 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:1394
     7835#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:400
     7836#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:1392
    78597837msgid "Show/Hide"
    78607838msgstr "Show/Hide"
    78617839
    7862 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:415
     7840#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:413
    78637841msgid "Toggle visible state of the selected layer."
    78647842msgstr "Toggle visible state of the selected layer."
    78657843
    7866 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
     7844#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:473
    78677845msgid "Opacity"
    78687846msgstr ""
    78697847
    7870 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:487
     7848#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:485
    78717849msgid "Adjust opacity of the layer."
    78727850msgstr ""
    78737851
    7874 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:572
     7852#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:570
    78757853#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:491
    78767854msgid "Activate"
    78777855msgstr "Activate"
    78787856
    7879 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
     7857#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:576
    78807858msgid "Activate the selected layer"
    78817859msgstr "Activate the selected layer"
    78827860
    7883 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:647
     7861#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:645
    78847862msgid "Merge this layer into another layer"
    78857863msgstr "Merge this layer into another layer"
    78867864
    7887 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:701
     7865#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:699
    78887866msgid "Duplicate this layer"
    78897867msgstr "Duplicate this layer"
    78907868
    7891 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:777
     7869#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:775
    78927870msgid "layer is currently visible (click to hide layer)"
    78937871msgstr ""
    78947872
    7895 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:777
     7873#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:775
    78967874msgid "layer is currently hidden (click to show layer)"
    78977875msgstr ""
    78987876
    7899 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:791
     7877#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:789
    79007878msgid "this layer is the active layer"
    79017879msgstr ""
    79027880
    7903 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:791
     7881#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:789
    79047882msgid "this layer is not currently active (click to activate)"
    79057883msgstr ""
    79067884
    7907 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:885
     7885#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:883
    79087886msgid "Move the selected layer one row up."
    79097887msgstr "Move the selected layer one row up."
    79107888
    7911 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:906
     7889#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:904
    79127890msgid "Move the selected layer one row down."
    79137891msgstr "Move the selected layer one row down."
    … …  
    80197997
    80207998#. group "Relations"
    8021 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
    8022 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
    8023 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:779
     7999#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
     8000#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
     8001#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:777
    80248002#: build/trans_presets.java:4094
    80258003msgid "Relations"
    80268004msgstr "Relations"
    80278005
    8028 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
     8006#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
    80298007msgid "Open a list of all relations."
    80308008msgstr "Open a list of all relations."
    80318009
    8032 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:279
     8010#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
    80338011msgid "Open an editor for the selected relation"
    80348012msgstr "Open an editor for the selected relation"
    80358013
    8036 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:320
     8014#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
    80378015msgid "Delete the selected relation"
    80388016msgstr "Delete the selected relation"
    80398017
    8040 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:358
     8018#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
    80418019#: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:344
    80428020#: ../plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java:40
    … …  
    80458023msgstr "Create a new relation"
    80468024
    8047 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395
    8048 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1438
     8025#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
     8026#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
    80498027msgid "Create a copy of this relation and open it in another editor window"
    80508028msgstr "Create a copy of this relation and open it in another editor window"
    80518029
    8052 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
     8030#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:432
    80538031msgid "Add the selected relations to the current selection"
    80548032msgstr ""
    80558033
    8056 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:435
     8034#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:433
    80578035msgid "Set the current selection to the list of selected relations"
    80588036msgstr "Set the current selection to the list of selected relations"
    80598037
    8060 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:437
     8038#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:435
    80618039msgid "Select relation (add)"
    80628040msgstr ""
    80638041
    8064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:437
     8042#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:435
    80658043#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
    80668044#: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
    … …  
    80688046msgstr "Select relation"
    80698047
    8070 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:472
     8048#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:470
    80718049msgid "Add the members of all selected relations to current selection"
    80728050msgstr ""
    80738051
    8074 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
     8052#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:471
    80758053msgid "Select the members of all selected relations"
    80768054msgstr "Select the members of all selected relations"
    80778055
    8078 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:475
     8056#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
    80798057msgid "Select members (add)"
    80808058msgstr ""
    80818059
    8082 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:475
     8060#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
    80838061#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
    80848062#: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
    … …  
    80868064msgstr "Select members"
    80878065
    8088 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:509
     8066#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:507
    80898067msgid "Download all members of the selected relations"
    80908068msgstr "Download all members of the selected relations"
    80918069
    8092 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:510
     8070#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:508
    80938071msgid "Download members"
    80948072msgstr "Download members"
    80958073
    8096 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:541
    8097 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:868
     8074#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:539
     8075#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
    80988076#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
    80998077msgid "Download incomplete members of selected relations"
    81008078msgstr "Download incomplete members of selected relations"
    81018079
    8102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:543
    8103 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:870
     8080#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:541
     8081#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
    81048082#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
    81058083msgid "Download incomplete members"
    81068084msgstr "Download incomplete members"
    81078085
    8108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:777
     8086#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:775
    81098087#, java-format
    81108088msgid "Relations: {0}"
    81118089msgstr "Relations: {0}"
    81128090
    8113 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:168
    8114 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:169
     8091#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:164
     8092#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:165
    81158093msgid "Current Selection"
    81168094msgstr "Current Selection"
    81178095
    8118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:168
     8096#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:164
    81198097msgid "Open a selection list window."
    81208098msgstr "Open a selection list window."
    81218099
    8122 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:305
     8100#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:301
    81238101msgid "Search for objects"
    81248102msgstr "Search for objects"
    81258103
    8126 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
    8127 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:360
     8104#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:355
     8105#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:356
    81288106msgid "Zoom to selection"
    81298107msgstr "Zoom to selection"
    81308108
    8131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
    8132 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:394
     8109#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:389
     8110#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:390
    81338111msgid "Zoom to selected element(s)"
    81348112msgstr "Zoom to selected element(s)"
    81358113
    8136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
     8114#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:421
    81378115msgid "Call editor for relation"
    81388116msgstr ""
    81398117
    8140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:426
     8118#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:422
    81418119msgid "Call relation editor for selected relation"
    81428120msgstr ""
    81438121
    8144 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
     8122#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
    81458123#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
    81468124#: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
    … …  
    81488126msgstr "Select in relation list"
    81498127
    8150 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:454
     8128#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
    81518129#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
    81528130#: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
    … …  
    81548132msgstr "Select relation in relation list."
    81558133
    8156 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:504
    8157 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:375
     8134#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:500
     8135#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:371
    81588136#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
    81598137#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:64
    … …  
    81628140msgstr "Selection"
    81638141
    8164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:515
     8142#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:511
    81658143#, java-format
    81668144msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
    81678145msgstr "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
    81688146
    8169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:833
     8147#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:829
    81708148#, java-format
    81718149msgid "Selection: {0}"
    81728150msgstr "Selection: {0}"
    81738151
    8174 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:905
     8152#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:901
    81758153msgid "Get detailed information on the internal state of the objects."
    81768154msgstr ""
    81778155
    8178 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:906
     8156#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:902
    81798157msgid "Inspect"
    81808158msgstr ""
    … …  
    83448322#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
    83458323#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
    8346 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:200
     8324#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
    83478325msgid "Close the dialog"
    83488326msgstr "Close the dialogue"
    … …  
    84248402#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:73
    84258403#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:221
    8426 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155
     8404#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:151
    84278405msgid "anonymous"
    84288406msgstr "anonymous"
    … …  
    84448422
    84458423#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
    8446 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:54
     8424#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50
    84478425msgid "User"
    84488426msgstr "User"
    … …  
    100029980
    100039981#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
    10004 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:138
     9982#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:135
    100059983#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:138
    100069984msgid "Advanced"
    … …  
    1022410202msgstr ""
    1022510203
    10226 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
     10204#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:175
    1022710205msgid "Edit the relation the currently selected relation member refers to."
    1022810206msgstr "Edit the relation the currently selected relation member refers to"
    1022910207
    10230 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:220
     10208#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:218
    1023110209msgid "Download all child relations (recursively)"
    1023210210msgstr "Download all child relations (recursively)"
    1023310211
    10234 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222
     10212#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:220
    1023510213msgid "Download All Children"
    1023610214msgstr "Download All Children"
    1023710215
    10238 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:241
     10216#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:239
    1023910217msgid "Download selected relations"
    1024010218msgstr "Download selected relations"
    1024110219
    10242 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:245
     10220#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
    1024310221msgid "Download Selected Children"
    1024410222msgstr "Download Selected Children"
    1024510223
    10246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:290
    10247 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:439
     10224#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:288
     10225#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:437
    1024810226#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:42
    1024910227#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:50
    … …  
    1025210230msgstr "Download relation members"
    1025310231
    10254 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331
    10255 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477
    10256 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
     10232#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
     10233#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:475
     10234#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1170
    1025710235#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:615
    1025810236msgid "Conflict in data"
    … …  
    1026110239msgstr[1] "Conflicts in data"
    1026210240
    10263 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:344
     10241#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:342
    1026410242#, java-format
    1026510243msgid ""
    … …  
    1026810246msgstr ""
    1026910247
    10270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:353
     10248#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:351
    1027110249msgid "Relation is deleted"
    1027210250msgstr "Relation is deleted"
    1027310251
    10274 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:401
    10275 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:503
     10252#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:399
     10253#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:501
    1027610254#, java-format
    1027710255msgid "Downloading relation {0}"
    1027810256msgstr "Downloading relation {0}"
    1027910257
    10280 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420
    10281 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513
     10258#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:418
     10259#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:511
    1028210260#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
    1028310261#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
    … …  
    1031910297msgstr "({0}/{1}): Downloading relation ''{2}''..."
    1032010298
    10321 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
     10299#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:169
    1032210300msgid "Tags and Members"
    1032310301msgstr "Tags and Members"
    1032410302
    10325 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:175
    10326 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:183
     10303#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
     10304#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:179
    1032710305msgid "Parent Relations"
    1032810306msgstr "Parent Relations"
    1032910307
    10330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:176
     10308#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172
    1033110309msgid "Child Relations"
    1033210310msgstr "Child Relations"
    1033310311
    10334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316
     10312#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:312
    1033510313msgid "Apply Role:"
    1033610314msgstr "Apply Role:"
    1033710315
    10338 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
     10316#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:314
    1033910317msgid "Enter a role and apply it to the selected relation members"
    1034010318msgstr "Enter a role and apply it to the selected relation members"
    1034110319
    10342 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:603
     10320#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:599
    1034310321msgid ""
    1034410322"<html>There is at least one member in this relation referring<br>to the "
    … …  
    1035010328"<br>How do you want to proceed with circular dependencies?</html>"
    1035110329
    10352 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:610
    10353 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
     10330#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:606
     10331#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607
    1035410332msgid "Remove them, clean up relation"
    1035510333msgstr "Remove them, clean up relation"
    1035610334
    10357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:610
     10335#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:606
    1035810336msgid "Ignore them, leave relation as is"
    1035910337msgstr "Ignore them, leave relation as is"
    1036010338
    10361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:673
     10339#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:669
    1036210340#, java-format
    1036310341msgid ""
    … …  
    1036710345msgstr ""
    1036810346
    10369 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
     10347#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:679
    1037010348msgid "Multiple members referring to same object."
    1037110349msgstr ""
    1037210350
    10373 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:701
     10351#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697
    1037410352#, java-format
    1037510353msgid ""
    … …  
    1038210360"''{0}''.</html>"
    1038310361
    10384 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:742
     10362#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:738
    1038510363msgid "Add all objects selected in the current dataset before the first member"
    1038610364msgstr ""
    1038710365
    10388 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:768
     10366#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:764
    1038910367msgid "Add all objects selected in the current dataset after the last member"
    1039010368msgstr ""
    1039110369
    10392 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:795
     10370#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:791
    1039310371msgid ""
    1039410372"Add all objects selected in the current dataset before the first selected "
    … …  
    1039610374msgstr ""
    1039710375
    10398 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829
     10376#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:825
    1039910377msgid ""
    1040010378"Add all objects selected in the current dataset after the last selected "
    … …  
    1040210380msgstr ""
    1040310381
    10404 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861
     10382#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857
    1040510383msgid "Remove all members referring to one of the selected objects"
    1040610384msgstr ""
    1040710385
    1040810386#. putValue(NAME, tr("Remove Selected"));
    10409 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:864
     10387#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:860
    1041010388msgid "Relation Editor: Remove Selected"
    1041110389msgstr "Relation Editor: Remove Selected"
    1041210390
    10413 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
    10414 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
     10391#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
     10392#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
    1041510393msgid "Select relation members which refer to objects in the current selection"
    1041610394msgstr ""
    1041710395
    10418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908
     10396#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
    1041910397#, java-format
    1042010398msgid ""
    … …  
    1042210400msgstr ""
    1042310401
    10424 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
     10402#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
    1042510403msgid "Select objects for selected relation members"
    1042610404msgstr ""
    1042710405
    10428 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952
     10406#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
    1042910407msgid "Sort the relation members"
    1043010408msgstr "Sort the relation members"
    1043110409
    1043210410#. JButton
    10433 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
     10411#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
    1043410412#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:817
    1043510413#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:940
    … …  
    1043810416msgstr "Sort"
    1043910417
    10440 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:955
     10418#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
    1044110419msgid "Relation Editor: Sort"
    1044210420msgstr "Relation Editor: Sort"
    1044310421
    10444 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:975
     10422#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971
    1044510423msgid "Reverse the order of the relation members"
    1044610424msgstr "Reverse the order of the relation members"
    1044710425
    10448 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:977
     10426#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:973
    1044910427msgid "Reverse"
    1045010428msgstr "Reverse"
    1045110429
    10452 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
     10430#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:974
    1045310431msgid "Relation Editor: Reverse"
    1045410432msgstr "Relation Editor: Reverse"
    1045510433
    10456 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
     10434#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:994
    1045710435msgid "Move the currently selected members up"
    1045810436msgstr "Move the currently selected members up"
    1045910437
    1046010438#. putValue(NAME, tr("Move Up"));
    10461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1001
     10439#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:997
    1046210440msgid "Relation Editor: Move Up"
    1046310441msgstr "Relation Editor: Move Up"
    1046410442
    10465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
     10443#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1013
    1046610444msgid "Move the currently selected members down"
    1046710445msgstr "Move the currently selected members down"
    1046810446
    1046910447#. putValue(NAME, tr("Move Down"));
    10470 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1020
     10448#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1016
    1047110449msgid "Relation Editor: Move Down"
    1047210450msgstr "Relation Editor: Move Down"
    1047310451
    10474 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036
     10452#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1032
    1047510453msgid "Remove the currently selected members from this relation"
    1047610454msgstr "Remove the currently selected members from this relation"
    1047710455
    1047810456#. putValue(NAME, tr("Remove"));
    10479 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1039
     10457#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
    1048010458msgid "Relation Editor: Remove"
    1048110459msgstr "Relation Editor: Remove"
    1048210460
    10483 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055
     10461#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
    1048410462msgid "Delete the currently edited relation"
    1048510463msgstr "Delete the currently edited relation"
    1048610464
    10487 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
     10465#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1098
    1048810466msgid ""
    1048910467"One or more members of this new relation have been deleted while the "
    … …  
    1049510473"was open. They have been removed from the relation members list."
    1049610474
    10497 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
     10475#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1151
    1049810476#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:596
    1049910477msgid "Yes, create a conflict and close"
    1050010478msgstr "Yes, create a conflict and close"
    1050110479
    10502 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
     10480#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
    1050310481msgid "Click to create a conflict and close this relation editor"
    1050410482msgstr "Click to create a conflict and close this relation editor"
    1050510483
    10506 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161
     10484#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
    1050710485#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:602
    1050810486msgid "No, continue editing"
    1050910487msgstr "No, continue editing"
    1051010488
    10511 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163
     10489#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
    1051210490msgid "Click to return to the relation editor and to resume relation editing"
    1051310491msgstr "Click to return to the relation editor and to resume relation editing"
    1051410492
    10515 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1170
     10493#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
    1051610494msgid ""
    1051710495"<html>This relation has been changed outside of the editor.<br>You cannot "
    … …  
    1052310501"conflict and close the editor?</html>"
    1052410502
    10525 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
     10503#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
    1052610504#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628
    1052710505#, java-format
    … …  
    1053310511"resolve this conflict first, then try again.</html>"
    1053410512
    10535 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1201
     10513#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
    1053610514#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:642
    1053710515msgid "Apply the current updates"
    1053810516msgstr "Apply the current updates"
    1053910517
    10540 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234
     10518#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230
    1054110519#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:685
    1054210520msgid "Apply the updates and close the dialog"
    1054310521msgstr "Apply the updates and close the dialogue"
    1054410522
    10545 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269
     10523#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265
    1054610524#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:739
    1054710525msgid "Cancel the updates and close the dialog"
    1054810526msgstr "Cancel the updates and close the dialogue"
    1054910527
    10550 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286
     10528#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
    1055110529msgid "Add an empty tag"
    1055210530msgstr "Add an empty tag"
    1055310531
    10554 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1299
     10532#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
    1055510533msgid "Download all incomplete members"
    1055610534msgstr "Download all incomplete members"
    1055710535
    10558 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1301
    10559 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1331
     10536#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1297
     10537#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1327
    1056010538msgid "Download Members"
    1056110539msgstr "Download Members"
    1056210540
    10563 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
    10564 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1332
     10541#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
     10542#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328
    1056510543msgid "Relation Editor: Download Members"
    1056610544msgstr "Relation Editor: Download Members"
    1056710545
    10568 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1329
     10546#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1325
    1056910547msgid "Download selected incomplete members"
    1057010548msgstr "Download selected incomplete members"
    1057110549
    10572 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1363
     10550#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1359
    1057310551msgid "Sets a role for the selected members"
    1057410552msgstr "Sets a role for the selected members"
    1057510553
    10576 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1365
     10554#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
    1057710555msgid "Apply Role"
    1057810556msgstr "Apply Role"
    1057910557
    10580 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1379
     10558#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1375
    1058110559#, java-format
    1058210560msgid "You are setting an empty role on {0} object."
    … …  
    1058510563msgstr[1] ""
    1058610564
    10587 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1382
     10565#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1378
    1058810566msgid "This is equal to deleting the roles of these objects."
    1058910567msgstr ""
    1059010568
    10591 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1384
     10569#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380
    1059210570msgid "Do you really want to apply the new role?"
    1059310571msgstr "Do you really want to apply the new role?"
    1059410572
    10595 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386
     10573#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1382
    1059610574msgid "Yes, apply it"
    1059710575msgstr "Yes, apply it"
    1059810576
    10599 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
     10577#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383
    1060010578msgid "No, do not apply"
    1060110579msgstr "No, do not apply"
    1060210580
    10603 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393
     10581#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1389
    1060410582msgid "Confirm empty role"
    1060510583msgstr "Confirm empty role"
    1060610584
    10607 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1461
     10585#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1457
    1060810586msgid "Edit the relation the currently selected relation member refers to"
    1060910587msgstr "Edit the relation the currently selected relation member refers to"
    1061010588
    10611 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1538
     10589#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1534
    1061210590msgid ""
    1061310591"Members from paste buffer cannot be added because they are not included in "
    … …  
    1068810666msgstr "Edit relation #{0} in layer ''{1}''"
    1068910667
    10690 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:116
     10668#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:112
    1069110669msgid "Load relation"
    1069210670msgstr "Load relation"
    1069310671
    10694 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:162
     10672#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
    1069510673#, java-format
    1069610674msgid ""
    … …  
    1082010798
    1082110799#. adding the download tasks
    10822 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:97
     10800#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
    1082310801msgid "Data Sources and Types:"
    1082410802msgstr "Data Sources and Types:"
    1082510803
    10826 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:98
     10804#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
    1082710805msgid "OpenStreetMap data"
    1082810806msgstr "OpenStreetMap data"
    1082910807
    10830 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:99
     10808#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:95
    1083110809msgid "Select to download OSM data in the selected download area."
    1083210810msgstr "Select to download OSM data in the selected download area."
    1083310811
    10834 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:101
     10812#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:97
    1083510813msgid "Raw GPS data"
    1083610814msgstr "Raw GPS data"
    1083710815
    10838 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:102
     10816#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:98
    1083910817msgid "Select to download GPS traces in the selected download area."
    1084010818msgstr "Select to download GPS traces in the selected download area."
    1084110819
    10842 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:133
     10820#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:129
    1084310821msgid "Download as new layer"
    1084410822msgstr "Download as new layer"
    1084510823
    10846 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:134
     10824#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:130
    1084710825msgid ""
    1084810826"<html>Select to download data into a new data layer.<br>Unselect to download "
    … …  
    1085210830"into the currently active data layer.</html>"
    1085310831
    10854 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219
     10832#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
    1085510833msgid "No area selected yet"
    1085610834msgstr "No area selected yet"
    1085710835
    10858 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222
     10836#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:218
    1085910837msgid "Download area too large; will probably be rejected by server"
    1086010838msgstr "Download area too large, will probably be rejected by server"
    1086110839
    10862 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225
     10840#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:221
    1086310841msgid "Download area ok, size probably acceptable to server"
    1086410842msgstr "Download area ok, size probably acceptable to server"
    1086510843
    10866 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:378
     10844#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:374
    1086710845msgid "Click to close the dialog and to abort downloading"
    1086810846msgstr "Click to close the dialogue and to abort downloading"
    1086910847
    10870 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395
     10848#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
    1087110849msgid "Click to download the currently selected area"
    1087210850msgstr ""
    1087310851
    10874 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:402
     10852#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398
    1087510853msgid "Please select a download area first."
    1087610854msgstr "Please select a download area first."
    1087710855
    10878 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:411
     10856#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:407
    1087910857#, java-format
    1088010858msgid ""
    … …  
    1099010968#. item "Facilities/Hunting Stand" combo "Lock" display value
    1099110969#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
    10992 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
    10993 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
    10994 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:45
    10995 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:56
    10996 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:58
     10970#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90
     10971#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
     10972#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
     10973#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
     10974#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
    1099710975#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:171
    1099810976#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:312
    … …  
    1101410992msgstr "Slippy map"
    1101510993
    11016 #: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:37
     10994#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:34
    1101710995msgid "Tile Numbers"
    1101810996msgstr "Tile Numbers"
    1101910997
    11020 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
     10998#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:130
    1102110999#, java-format
    1102211000msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
    1102311001msgstr "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
    1102411002
    11025 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
     11003#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:180
    1102611004msgid "JOSM Help Browser"
    1102711005msgstr "JOSM Help Browser"
    1102811006
    1102911007#. i18n: do not translate "warning-header" and "warning-body"
    11030 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234
     11008#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:231
    1103111009#, java-format
    1103211010msgid ""
    … …  
    1104011018msgstr ""
    1104111019
    11042 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256
     11020#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:253
    1104311021#, java-format
    1104411022msgid ""
    … …  
    1105311031"p></html>"
    1105411032
    11055 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356
     11033#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:352
    1105611034#, java-format
    1105711035msgid ""
    … …  
    1106211040"network problem, please check<br>your internet connection</html>"
    1106311041
    11064 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
     11042#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:357
    1106511043msgid "Failed to open URL"
    1106611044msgstr "Failed to open URL"
    1106711045
    1106811046#. putValue(NAME, tr("Open in Browser"));
    11069 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394
     11047#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:390
    1107011048msgid "Open the current help page in an external browser"
    1107111049msgstr "Open the current help page in an external browser"
    1107211050
    1107311051#. putValue(NAME, tr("Edit"));
    11074 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
     11052#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:402
    1107511053msgid "Edit the current help page"
    1107611054msgstr "Edit the current help page"
    1107711055
    11078 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416
     11056#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:412
    1107911057#, java-format
    1108011058msgid ""
    … …  
    1108611064
    1108711065#. putValue(NAME, tr("Reload"));
    11088 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438
     11066#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:434
    1108911067msgid "Reload the current help page"
    1109011068msgstr "Reload the current help page"
    1109111069
    1109211070#. putValue(NAME, tr("Back"));
    11093 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453
     11071#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:449
    1109411072msgid "Go to the previous page"
    1109511073msgstr "Go to the previous page"
    1109611074
    1109711075#. putValue(NAME, tr("Forward"));
    11098 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
     11076#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:469
    1109911077msgid "Go to the next page"
    1110011078msgstr "Go to the next page"
    1110111079
    1110211080#. putValue(NAME, tr("Home"));
    11103 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489
     11081#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:485
    1110411082msgid "Go to the JOSM help home page"
    1110511083msgstr "Go to the JOSM help home page"
    1110611084
    11107 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520
     11085#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:516
    1110811086#, java-format
    1110911087msgid "Warning: bad location in HTML document. Exception was: {0}"
    1111011088msgstr "Warning: bad location in HTML document. Exception was: {0}"
    1111111089
    11112 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570
     11090#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566
    1111311091msgid "Failed to open help page. The target URL is empty."
    1111411092msgstr "Failed to open help page. The target URL is empty."
    1111511093
    11116 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571
     11094#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:567
    1111711095msgid "Failed to open help page"
    1111811096msgstr "Failed to open help page"
    … …  
    1114911127msgstr "Reload the history from the server"
    1115011128
    11151 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:272
     11129#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:270
    1115211130msgid "History not initialized yet. Failed to set reference primitive."
    1115311131msgstr "history not initialised yet. Failed to set reference primitive."
    1115411132
    11155 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:274
    11156 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304
     11133#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:272
     11134#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302
    1115711135#, java-format
    1115811136msgid ""
    … …  
    1116111139"Failed to set reference. Reference ID {0} does not match history ID {1}."
    1116211140
    11163 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:277
     11141#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275
    1116411142#, java-format
    1116511143msgid ""
    … …  
    1116811146"failed to set reference. reference version {0} not available in history"
    1116911147
    11170 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302
     11148#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:300
    1117111149msgid "History not initialized yet. Failed to set current primitive."
    1117211150msgstr "history not initialised yet. Failed to set current primitive."
    1117311151
    11174 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307
     11152#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:305
    1117511153#, java-format
    1117611154msgid ""
    … …  
    1123111209msgstr "Object"
    1123211210
    11233 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36
    11234 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60
     11211#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:32
     11212#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:56
    1123511213msgid "not present"
    1123611214msgstr "not present"
    1123711215
    11238 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:56
     11216#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
    1123911217msgid "Changeset"
    1124011218msgstr "Changeset"
    1124111219
    11242 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:92
     11220#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:88
    1124311221#, java-format
    1124411222msgid ""
    … …  
    1124711225"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
    1124811226
    11249 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:98
     11227#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
    1125011228#, java-format
    1125111229msgid ""
    … …  
    1125411232"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
    1125511233
    11256 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120
     11234#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
    1125711235msgid "Changeset info"
    1125811236msgstr "Changeset info"
    1125911237
    11260 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121
     11238#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
    1126111239msgid "Launch browser with information about the changeset"
    1126211240msgstr "Launch browser with information about the changeset"
    1126311241
    11264 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140
     11242#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138
    1126511243#, java-format
    1126611244msgid "Show changeset {0}"
    1126711245msgstr "Show changeset {0}"
    1126811246
    11269 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:63
     11247#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:58
    1127011248#, java-format
    1127111249msgid "Version {0}, {1} (by {2})"
    1127211250msgstr "Version {0}, {1} (by {2})"
    1127311251
    11274 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:79
     11252#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:74
    1127511253#, java-format
    1127611254msgid "Version {0} created on {1} by {2}"
    1127711255msgstr "Version {0} created on {1} by {2}"
    1127811256
    11279 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:107
     11257#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:102
    1128011258#, java-format
    1128111259msgid "Version {0} in editor"
    1128211260msgstr "Version {0} in editor"
    1128311261
    11284 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:109
     11262#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:104
    1128511263msgid "[deleted]"
    1128611264msgstr "[deleted]"
    1128711265
    11288 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:119
     11266#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:114
    1128911267#, java-format
    1129011268msgid "Version {0} currently edited in data layer ''{1}''"
    … …  
    1129511273msgstr "Version"
    1129611274
     11275#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:59
     11276#, java-format
     11277msgid ""
     11278"Failed to update primitive with id {0} because current edit layer is null"
     11279msgstr ""
     11280"Failed to update primitive with id {0} because current edit layer is null"
     11281
    1129711282#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62
    11298 #, java-format
    11299 msgid ""
    11300 "Failed to update primitive with id {0} because current edit layer is null"
    11301 msgstr ""
    11302 "Failed to update primitive with id {0} because current edit layer is null"
    11303 
    11304 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65
    1130511283#, java-format
    1130611284msgid ""
    … …  
    1131111289"include such a primitive"
    1131211290
    11313 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94
     11291#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:91
    1131411292#, java-format
    1131511293msgid "Synchronize node {0} only"
    1131611294msgstr "Synchronise node {0} only"
    1131711295
    11318 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95
     11296#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:92
    1131911297#, java-format
    1132011298msgid "Synchronize way {0} only"
    1132111299msgstr "Synchronise way {0} only"
    1132211300
    11323 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96
     11301#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:93
    1132411302#, java-format
    1132511303msgid "Synchronize relation {0} only"
    1132611304msgstr "Synchronise relation {0} only"
    1132711305
    11328 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106
    11329 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154
     11306#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:103
     11307#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:151
    1133011308msgid "Synchronize entire dataset"
    1133111309msgstr "Synchronise entire dataset"
    1133211310
    11333 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118
     11311#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:115
    1133411312#, java-format
    1133511313msgid ""
    … …  
    1135011328"<strong>{6}</strong> to abort and continue editing.<br></html>"
    1135111329
    11352 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
    11353 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
    11354 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
     11330#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:129
     11331#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:173
     11332#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
    1135511333msgid "Conflicts detected"
    1135611334msgstr "Conflicts detected"
    1135711335
    11358 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166
     11336#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:163
    1135911337#, java-format
    1136011338msgid ""
    … …  
    1136911347"<strong>{1}</strong> to abort and continue editing.<br></html>"
    1137011348
    11371 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194
     11349#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:191
    1137211350#, java-format
    1137311351msgid ""
    … …  
    1138011358"again with a new or an existing open changeset.</html>"
    1138111359
    11382 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202
     11360#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:199
    1138311361msgid "Changeset closed"
    1138411362msgstr "Changeset closed"
    1138511363
    11386 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214
     11364#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:211
    1138711365msgid "Prepare conflict resolution"
    1138811366msgstr "Prepare conflict resolution"
    1138911367
    11390 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216
     11368#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:213
    1139111369#, java-format
    1139211370msgid "Click to download all parent ways for node {0}"
    1139311371msgstr "Click to download all parent ways for node {0}"
    1139411372
    11395 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222
     11373#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:219
    1139611374msgid "Click to cancel and to resume editing the map"
    1139711375msgstr "Click to cancel and to resume editing the map"
    1139811376
    11399 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226
     11377#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:223
    1140011378#, java-format
    1140111379msgid ""
    … …  
    1141011388"conflicts which you can resolve in the Conflict Resolution Dialogue.</html>"
    1141111389
    11412 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237
     11390#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:234
    1141311391msgid "Node still in use"
    1141411392msgstr "Node still in use"
    1141511393
    11416 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275
    11417 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292
     11394#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:272
     11395#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:289
    1141811396#, java-format
    1141911397msgid "Warning: error header \"{0}\" did not match with an expected pattern"
    … …  
    1162211600"was: {0}"
    1162311601
    11624 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java:57
     11602#: ../core/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java:53
    1162511603msgid "Download objects"
    1162611604msgstr ""
    1162711605
    11628 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java:106
     11606#: ../core/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java:102
    1162911607msgid "Initializing nodes to download ..."
    1163011608msgstr ""
    … …  
    1192111899
    1192211900#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
    11923 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502
     11901#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:499
    1192411902msgid "Upload"
    1192511903msgstr "Upload"
    1192611904
    11927 #: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:56
     11905#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:52
    1192811906msgid "Update objects"
    1192911907msgstr "Update objects"
    1193011908
    11931 #: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:107
     11909#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:103
    1193211910msgid "Initializing nodes to update ..."
    1193311911msgstr "Initialising nodes to update ..."
    1193411912
    11935 #: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:123
     11913#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:119
    1193611914msgid "Initializing ways to update ..."
    1193711915msgstr "Initialising ways to update ..."
    1193811916
    11939 #: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:132
     11917#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:128
    1194011918msgid "Initializing relations to update ..."
    1194111919msgstr "Initialising relations to update ..."
    1194211920
    11943 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126
     11921#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:123
    1194411922#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:260
    1194511923#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:84
    … …  
    1194811926msgstr "Settings"
    1194911927
    11950 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:127
     11928#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
    1195111929msgid "Decide how to upload the data and which changeset to use"
    1195211930msgstr "Decide how to upload the data and which changeset to use"
    1195311931
    11954 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130
    11955 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:488
     11932#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:127
     11933#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485
    1195611934msgid "Tags of new changeset"
    1195711935msgstr "Tags of new changeset"
    1195811936
    11959 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
     11937#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
    1196011938msgid "Apply tags to the changeset data is uploaded to"
    1196111939msgstr "Apply tags to the changeset data is uploaded to"
    1196211940
    11963 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:135
     11941#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
    1196411942msgid "Manage open changesets and select a changeset to upload to"
    1196511943msgstr "Manage open changesets and select a changeset to upload to"
    1196611944
    11967 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:139
     11945#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
    1196811946msgid "Configure advanced settings"
    1196911947msgstr "Configure advanced settings"
    1197011948
    11971 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:180
    11972 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:504
     11949#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:177
     11950#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:501
    1197311951#, java-format
    1197411952msgid "Upload to ''{0}''"
    1197511953msgstr "Upload to ''{0}''"
    1197611954
    11977 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369
     11955#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:366
    1197811956msgid "Upload Changes"
    1197911957msgstr "Upload Changes"
    1198011958
    11981 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
     11959#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368
    1198211960msgid "Upload the changed primitives"
    1198311961msgstr "Upload the changed primitives"
    1198411962
     11963#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:377
     11964msgid "Please revise upload comment"
     11965msgstr ""
     11966
     11967#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378
     11968msgid "Revise"
     11969msgstr ""
     11970
     11971#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378
     11972msgid "Continue as is"
     11973msgstr ""
     11974
    1198511975#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:380
    11986 msgid "Please revise upload comment"
    11987 msgstr ""
    11988 
    11989 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:381
    11990 msgid "Revise"
    11991 msgstr ""
    11992 
    11993 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:381
    11994 msgid "Continue as is"
    11995 msgstr ""
    11996 
    11997 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:383
    1199811976msgid ""
    1199911977"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
    … …  
    1200411982msgstr ""
    1200511983
    12006 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:398
     11984#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:395
    1200711985msgid "Return to the previous dialog to enter a more descriptive comment"
    1200811986msgstr ""
    1200911987
    12010 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:399
     11988#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:396
    1201111989msgid "Cancel and return to the previous dialog"
    1201211990msgstr ""
    1201311991
     11992#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:397
     11993msgid "Ignore this hint and upload anyway"
     11994msgstr ""
     11995
    1201411996#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:400
    12015 msgid "Ignore this hint and upload anyway"
    12016 msgstr ""
    12017 
    12018 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:403
    1201911997msgid "Do not show this message again"
    1202011998msgstr ""
    1202111999
    12022 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411
     12000#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
    1202312001msgid "Please enter a valid chunk size first"
    1202412002msgstr "Please enter a valid chunk size first"
    1202512003
    12026 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:412
     12004#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
    1202712005msgid "Illegal chunk size"
    1202812006msgstr "Illegal chunk size"
    1202912007
    12030 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
     12008#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:445
    1203112009msgid "Cancel the upload and resume editing"
    1203212010msgstr "Cancel the upload and resume editing"
    1203312011
    12034 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:490
     12012#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:487
    1203512013#, java-format
    1203612014msgid "Tags of changeset {0}"
    … …  
    1204012018#.
    1204112019#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
    12042 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195
     12020#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:191
    1204312021#, java-format
    1204412022msgid ""
    … …  
    1205312031msgstr ""
    1205412032
    12055 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44
     12033#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:40
    1205612034msgid "Objects are uploaded to a <strong>new changeset</strong>."
    1205712035msgstr "Objects are uploaded to a <strong>new changeset</strong>."
    1205812036
    12059 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48
     12037#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44
    1206012038#, java-format
    1206112039msgid ""
    … …  
    1206612044"comment ''{1}''."
    1206712045
    12068 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
     12046#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:51
    1206912047msgid "The changeset is going to be <strong>closed</strong> after this upload"
    1207012048msgstr "The changeset is going to be <strong>closed</strong> after this upload"
    1207112049
    12072 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:57
     12050#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:53
    1207312051msgid "The changeset is <strong>left open</strong> after this upload"
    1207412052msgstr "The changeset is <strong>left open</strong> after this upload"
    1207512053
    12076 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:59
     12054#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
    1207712055msgid "configure changeset"
    1207812056msgstr "configure changeset"
    1207912057
    12080 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:81
     12058#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:77
    1208112059#, java-format
    1208212060msgid "Uploading <strong>{0} object</strong> to <strong>1 changeset</strong>"
    … …  
    1208812066"Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong>"
    1208912067
    12090 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:87
     12068#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:83
    1209112069#, java-format
    1209212070msgid ""
    … …  
    1210312081"<strong>1 request</strong>"
    1210412082
    12105 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:92
     12083#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:88
    1210612084#, java-format
    1210712085msgid ""
    … …  
    1211212090"<strong>{1} requests</strong>"
    1211312091
    12114 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:94
    12115 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:102
     12092#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:90
     12093#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:98
    1211612094msgid "advanced configuration"
    1211712095msgstr "advanced configuration"
    1211812096
    12119 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:98
     12097#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:94
    1212012098#, java-format
    1212112099msgid ""
    … …  
    1212812106"proceed with <strong>multiple changesets</strong>"
    1212912107
    12130 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:101
     12108#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97
    1213112109#, java-format
    1213212110msgid ""
    … …  
    1213712115"strong> using <strong>{1} requests</strong>"
    1213812116
    12139 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:68
     12117#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:64
    1214012118#, java-format
    1214112119msgid "Uploading data for layer ''{0}''"
    1214212120msgstr "Uploading data for layer ''{0}''"
    1214312121
    12144 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82
     12122#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:78
    1214512123#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:275
    1214612124msgid "Continue uploading"
    1214712125msgstr "Continue uploading"
    1214812126
    12149 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:84
     12127#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80
    1215012128msgid "Click to continue uploading to additional new changesets"
    1215112129msgstr "Click to continue uploading to additional new changesets"
    1215212130
    12153 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88
     12131#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:84
    1215412132msgid "Go back to Upload Dialog"
    1215512133msgstr "Go back to Upload Dialogue"
    1215612134
    12157 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:90
     12135#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86
    1215812136msgid "Click to return to the Upload Dialog"
    1215912137msgstr "Click to return to the Upload Dialogue"
    1216012138
    12161 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94
     12139#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:90
    1216212140msgid "Abort"
    1216312141msgstr "Abort"
    1216412142
    12165 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:96
     12143#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92
    1216612144msgid "Click to abort uploading"
    1216712145msgstr "Click to abort uploading"
    1216812146
    12169 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:101
     12147#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:97
    1217012148#, java-format
    1217112149msgid ""
    … …  
    1217812156"on the server ''{1}''."
    1217912157
    12180 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:108
     12158#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:104
    1218112159#, java-format
    1218212160msgid "There is {0} object left to upload."
    … …  
    1218512163msgstr[1] "There are {0} objects left to upload."
    1218612164
    12187 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:114
     12165#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:110
    1218812166#, java-format
    1218912167msgid ""
    … …  
    1219812176"map editing.<br>"
    1219912177
    12200 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:125
     12178#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:121
    1220112179msgid "Changeset is full"
    1220212180msgstr "Changeset is full"
    1220312181
    12204 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:196
     12182#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:192
    1220512183#, java-format
    1220612184msgid "Object ''{0}'' is already deleted. Skipping object in upload."
    1220712185msgstr "Object ''{0}'' is already deleted. Skipping object in upload."
    1220812186
    12209 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:233
    12210 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462
     12187#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:229
     12188#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:459
    1221112189#, java-format
    1221212190msgid "Uploading {0} object..."
    … …  
    1221512193msgstr[1] "Uploading {0} objects..."
    1221612194
    12217 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:290
     12195#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286
    1221812196#, java-format
    1221912197msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
    … …  
    1249012468
    1249112469#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:679
    12492 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550
     12470#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
    1249312471#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
    1249412472#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
    … …  
    1272912707msgstr ""
    1273012708
    12731 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:121
     12709#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119
    1273212710#, java-format
    1273312711msgid "Data Layer {0}"
    1273412712msgstr "Data Layer {0}"
    1273512713
    12736 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
     12714#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
    1273712715msgid "outside downloaded area"
    1273812716msgstr "outside downloaded area"
    1273912717
    12740 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
     12718#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
    1274112719#, java-format
    1274212720msgid "version {0}"
    1274312721msgstr "version {0}"
    1274412722
    12745 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:322
     12723#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:320
    1274612724msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
    1274712725msgstr "Warning: mixing 0.6 and 0.5 data results in version 0.5"
    1274812726
    12749 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:347
     12727#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345
    1275012728#, java-format
    1275112729msgid "There was {0} conflict detected."
    … …  
    1275412732msgstr[1] "There were {0} conflicts detected."
    1275512733
    12756 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:360
     12734#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:358
    1275712735msgid "Click to close this dialog and continue editing"
    1275812736msgstr "Click to close this dialogue and continue editing"
    1275912737
    12760 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
    12761 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
    12762 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:436
     12738#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:424
     12739#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:429
     12740#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434
    1276312741#, java-format
    1276412742msgid "{0} deleted"
    … …  
    1276712745msgstr[1] "{0} deleted"
    1276812746
    12769 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439
     12747#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
    1277012748#, java-format
    1277112749msgid "{0} consists of:"
    1277212750msgstr "{0} consists of:"
    1277312751
    12774 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:443
     12752#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:441
    1277512753msgid "unset"
    1277612754msgstr "unset"
    1277712755
    12778 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:443
     12756#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:441
    1277912757#, java-format
    1278012758msgid "API version: {0}"
    1278112759msgstr "API version: {0}"
    1278212760
    12783 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:547
     12761#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:545
    1278412762#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
    1278512763msgid "Convert to GPX layer"
    1278612764msgstr "Convert to GPX layer"
    1278712765
    12788 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645
     12766#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
    1278912767msgid "Dataset consistency test"
    1279012768msgstr "Dataset consistency test"
    1279112769
    12792 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651
     12770#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
    1279312771msgid "No problems found"
    1279412772msgstr "No problems found"
    1279512773
    12796 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654
     12774#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:652
    1279712775msgid "Following problems found:"
    1279812776msgstr "Following problems found:"
    … …  
    1283212810msgstr[1] "{0} points"
    1283312811
    12834 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:323
    12835 #, java-format
    12836 msgid ""
    12837 "TMS layers do not support the projection {1}.\n"
    12838 "{2}\n"
     12812#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
     12813#, java-format
     12814msgid ""
     12815"TMS layers do not support the projection {0}.\n"
     12816"{1}\n"
    1283912817"Change the projection or remove the layer."
    1284012818msgstr ""
    1284112819
    12842 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:342
     12820#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
    1284312821msgid "Auto Zoom"
    1284412822msgstr "Auto Zoom"
    1284512823
    12846 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:353
     12824#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
    1284712825msgid "Auto load tiles"
    1284812826msgstr ""
    1284912827
    12850 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:362
     12828#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
    1285112829msgid "Load Tile"
    1285212830msgstr "Load Tile"
    1285312831
    12854 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:373
     12832#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
    1285512833msgid "Show Tile Info"
    1285612834msgstr "Show Tile Info"
    1285712835
    12858 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:396
     12836#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
    1285912837msgid "Load All Tiles"
    1286012838msgstr "Load All Tiles"
    1286112839
    12862 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:406
     12840#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
    1286312841msgid "Increase zoom"
    1286412842msgstr "Increase zoom"
    1286512843
    12866 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:415
     12844#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
    1286712845msgid "Decrease zoom"
    1286812846msgstr "Decrease zoom"
    1286912847
    12870 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:426
     12848#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
    1287112849msgid "Snap to tile size"
    1287212850msgstr "Snap to tile size"
    1287312851
    12874 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:437
     12852#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
    1287512853msgid "Flush Tile Cache"
    1287612854msgstr "Flush Tile Cache"
    1287712855
    12878 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:850
    12879 msgid "image "
    12880 msgstr "image "
    12881 
    12882 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1243
     12856#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
    1288312857msgid "zoom in to load any tiles"
    1288412858msgstr ""
    1288512859
    12886 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1245
     12860#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
    1288712861msgid "zoom in to load more tiles"
    1288812862msgstr ""
    1288912863
    12890 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
     12864#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
    1289112865msgid "increase zoom level to see more detail"
    1289212866msgstr ""
    1289312867
    12894 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
     12868#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
    1289512869msgid "No tiles at this zoom level"
    1289612870msgstr ""
    1289712871
    12898 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1254
    12899 #, java-format
    12900 msgid "Current zoom: {0}"
    12901 msgstr ""
    12902 
    12903 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
    12904 #, java-format
    12905 msgid "Display zoom: {0}"
    12906 msgstr ""
    12907 
    12908 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1256
    12909 #, java-format
    12910 msgid "Pixel scale: {0}"
    12911 msgstr ""
    12912 
    12913 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1257
    12914 #, java-format
    12915 msgid "Best zoom: {0}"
    12916 msgstr ""
    12917 
    12918 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1334
     12872#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
    1291912873msgid "EPSG:4326 and Mercator projection are supported"
    1292012874msgstr ""
    … …  
    1302912983
    1303012984#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:929
    13031 #, fuzzy, java-format
     12985#, java-format
    1303212986msgid "Supported projections are: {0}"
    13033 msgstr "Unsupported version: {0}"
     12987msgstr ""
    1303412988
    1303512989#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
    … …  
    1345013404msgid ""
    1345113405"\n"
    13452 "Direction {0}°"
     13406"Direction {0}°"
    1345313407msgstr ""
    1345413408
    … …  
    1355213506
    1355313507#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:191
    13554 #: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:72
     13508#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:70
    1355513509#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77
    1355613510#, java-format
    … …  
    1357613530msgstr[1] ""
    1357713531
    13578 #: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:76
    13579 #: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:80
     13532#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:74
     13533#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:78
    1358013534#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85
    1358113535#, java-format
    … …  
    1360013554#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
    1360113555#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:68
    13602 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:234
     13556#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:230
    1360313557msgid "Access Token Key:"
    1360413558msgstr "Access Token Key:"
    … …  
    1360613560#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
    1360713561#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:82
    13608 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:246
     13562#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:242
    1360913563msgid "Access Token Secret:"
    1361013564msgstr "Access Token Secret:"
    … …  
    1375013704
    1375113705#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:232
    13752 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:361
     13706#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:357
    1375313707msgid "Accept Access Token"
    1375413708msgstr "Accept Access Token"
    … …  
    1376613720
    1376713721#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:327
    13768 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
     13722#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:302
    1376913723msgid "Authorize now"
    1377013724msgstr "Authorise now"
    … …  
    1378613740#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:231
    1378713741#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:436
    13788 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
     13742#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:352
    1378913743msgid "Test Access Token"
    1379013744msgstr "Test Access Token"
    … …  
    1392013874msgstr "Click to test the Access Token"
    1392113875
    13922 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:115
     13876#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:111
    1392313877#, java-format
    1392413878msgid ""
    … …  
    1392913883"your behalf (<a href=\"{0}\">more info...</a>)."
    1393013884
    13931 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:126
     13885#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:122
    1393213886msgid "Please select an authorization procedure: "
    1393313887msgstr "Please select an authorisation procedure: "
    1393413888
    13935 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:244
     13889#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:240
    1393613890#, java-format
    1393713891msgid "Get an Access Token for ''{0}''"
    1393813892msgstr "Get an Access Token for ''{0}''"
    1393913893
    13940 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:344
     13894#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340
    1394113895msgid "Close the dialog and cancel authorization"
    1394213896msgstr "Close the dialogue and cancel authorisation"
    1394313897
    13944 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:363
     13898#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359
    1394513899msgid "Close the dialog and accept the Access Token"
    1394613900msgstr "Close the dialogue and accept the Access Token"
    1394713901
    13948 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
    13949 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
    13950 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
     13902#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:97
     13903#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
     13904#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
    1395113905msgid "Warning: failed to cancel running OAuth operation"
    1395213906msgstr "Warning: failed to cancel running OAuth operation"
    1395313907
    13954 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
     13908#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:127
    1395513909#, java-format
    1395613910msgid "Retrieving OAuth Request Token from ''{0}''"
    1395713911msgstr "Retrieving OAuth Request Token from ''{0}''"
    1395813912
    13959 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
     13913#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:160
    1396013914#, java-format
    1396113915msgid "Retrieving OAuth Access Token from ''{0}''"
    1396213916msgstr "Retrieving OAuth Access Token from ''{0}''"
    1396313917
    13964 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
     13918#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:294
    1396513919#, java-format
    1396613920msgid "OSM website did not return a session cookie in response to ''{0}'',"
    1396713921msgstr "OSM website did not return a session cookie in response to ''{0}'',"
    1396813922
    13969 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
     13923#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:345
    1397013924#, java-format
    1397113925msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
    … …  
    1397313927"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
    1397413928
    13975 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
     13929#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:432
    1397613930#, java-format
    1397713931msgid "Failed to authorize OAuth request  ''{0}''"
    1397813932msgstr "Failed to authorise OAuth request  ''{0}''"
    1397913933
    13980 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
     13934#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:479
    1398113935#, java-format
    1398213936msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
    1398313937msgstr "Authorising OAuth Request token ''{0}'' at the OSM website ..."
    1398413938
    13985 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
     13939#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:481
    1398613940msgid "Initializing a session at the OSM website..."
    1398713941msgstr "Initialising a session at the OSM website..."
    1398813942
    13989 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
     13943#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
    1399013944#, java-format
    1399113945msgid "Authenticating the session for user ''{0}''..."
    1399213946msgstr "Authenticating the session for user ''{0}''..."
    1399313947
    13994 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
     13948#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
    1399513949#, java-format
    1399613950msgid "Authorizing request token ''{0}''..."
    1399713951msgstr "Authorising request token ''{0}''..."
    1399813952
    13999 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
     13953#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
    1400013954#, java-format
    1400113955msgid "Logging out session ''{0}''..."
    … …  
    1407014024
    1407114025#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:130
    14072 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:83
     14026#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:79
    1407314027msgid "Display Advanced OAuth Parameters"
    1407414028msgstr "Display Advanced OAuth Parameters"
    … …  
    1425814212msgstr "Retrieving user info..."
    1425914213
    14260 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:84
     14214#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:86
    1426114215#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:563
    1426214216msgid "Menu Name"
    1426314217msgstr "Menu Name"
    1426414218
    14265 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:86
     14219#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:88
    1426614220msgid "Unnamed Imagery Layer"
    1426714221msgstr ""
    1426814222
    14269 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:92
     14223#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:94
    1427014224msgid "WMS"
    1427114225msgstr "WMS"
    1427214226
    14273 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:98
     14227#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:100
    1427414228msgid "Service URL"
    1427514229msgstr ""
    1427614230
    14277 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:103
     14231#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:105
    1427814232msgid "Get Layers"
    1427914233msgstr ""
    1428014234
    14281 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:141
     14235#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:143
    1428214236msgid ""
    1428314237"That layer does not support any of JOSM's projections,\n"
    … …  
    1428514239msgstr ""
    1428614240
    14287 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:143
    14288 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:179
    14289 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:282
    14290 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:304
    14291 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:322
     14241#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:145
     14242#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:181
     14243#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:297
     14244#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:319
     14245#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:337
    1429214246msgid "WMS Error"
    1429314247msgstr ""
    1429414248
    14295 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:168
    14296 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:176
     14249#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:170
     14250#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:178
    1429714251msgid "Show Bounds"
    1429814252msgstr ""
    1429914253
    14300 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:178
     14254#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:180
    1430114255msgid "No bounding box was found for this layer."
    1430214256msgstr ""
    1430314257
    14304 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:188
     14258#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:190
    1430514259msgid "TMS URL"
    14306 msgstr ""
    14307 
    14308 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:202
    14309 msgid "TMS"
    1431014260msgstr ""
    1431114261
    1431214262#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:204
    1431314263#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:563
     14264msgctxt "layer"
     14265msgid "Zoom"
     14266msgstr ""
     14267
     14268#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:213
     14269msgid "TMS"
     14270msgstr ""
     14271
     14272#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:215
     14273#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:563
    1431414274msgid "Imagery URL"
    1431514275msgstr ""
    1431614276
    14317 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:281
     14277#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:296
    1431814278msgid "Could not parse WMS layer list."
    1431914279msgstr ""
    1432014280
    14321 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:303
     14281#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:318
    1432214282msgid "Invalid service URL."
    1432314283msgstr ""
    1432414284
    14325 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:321
     14285#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:336
    1432614286msgid "Could not retrieve WMS layer list."
    1432714287msgstr ""
    … …  
    1496114921
    1496214922#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:206
    14963 msgid "Min zoom lvl: "
    14964 msgstr "Min zoom lvl: "
     14923msgid "Min. zoom level: "
     14924msgstr ""
    1496514925
    1496614926#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:210
    14967 msgid "Max zoom lvl: "
    14968 msgstr "Max zoom lvl: "
     14927msgid "Max. zoom level: "
     14928msgstr ""
    1496914929
    1497014930#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:214
    … …  
    1504515005msgstr ""
    1504615006
    15047 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:563
    15048 msgctxt "layer"
    15049 msgid "Zoom"
    15050 msgstr ""
    15051 
    1505215007#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:642
    1505315008msgid "Menu Name (Default)"
    … …  
    1519915154msgstr ""
    1520015155
    15201 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
     15156#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:69
    1520215157#, java-format
    1520315158msgid "The following plugin has been downloaded <strong>successfully</strong>:"
    … …  
    1521015165"strong>:"
    1521115166
    15212 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
     15167#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
    1521315168#, java-format
    1521415169msgid "Downloading the following plugin has <strong>failed</strong>:"
    … …  
    1521815173msgstr[1] "Downloading the following {0} plug-ins has <strong>failed</strong>:"
    1521915174
    15220 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
     15175#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:117
    1522115176msgid "Search:"
    1522215177msgstr "Search:"
    1522315178
    15224 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
     15179#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:122
    1522515180msgid "Enter a search expression"
    1522615181msgstr "Enter a search expression"
    1522715182
    15228 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:172
     15183#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:168
    1522915184msgid "Plugin update policy"
    1523015185msgstr "Plug-in update policy"
    1523115186
    15232 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:194
     15187#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:190
    1523315188msgid "Accept the new plugin sites and close the dialog"
    1523415189msgstr "Accept the new plug-in sites and close the dialogue"
    1523515190
    15236 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:209
     15191#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:205
    1523715192msgid "Configure Plugin Sites"
    1523815193msgstr "Configure Plug-in Sites"
    1523915194
    15240 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:274
     15195#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:270
    1524115196msgid "Download list"
    1524215197msgstr "Download list"
    1524315198
    15244 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:275
     15199#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:271
    1524515200msgid "Download the list of available plugins"
    1524615201msgstr "Download the list of available plug-ins"
    1524715202
    15248 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:303
    15249 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:321
    15250 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:343
     15203#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:299
     15204#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:317
     15205#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:339
    1525115206#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
    1525215207#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:329
    … …  
    1525615211msgstr "Update plug-ins"
    1525715212
    15258 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:304
     15213#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:300
    1525915214msgid "Update the selected plugins"
    1526015215msgstr "Update the selected plug-ins"
    1526115216
    15262 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:315
     15217#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:311
    1526315218msgid "Please restart JOSM to activate the downloaded plugins."
    1526415219msgstr "Please restart JOSM to activate the downloaded plug-ins."
    1526515220
    15266 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:330
     15221#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:326
    1526715222msgid ""
    1526815223"All installed plugins are up to date. JOSM does not have to download newer "
    … …  
    1527215227"versions."
    1527315228
    15274 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:331
     15229#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:327
    1527515230msgid "Plugins up to date"
    1527615231msgstr "Plug-ins up to date"
    1527715232
    15278 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:399
     15233#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:395
    1527915234msgid "Configure sites..."
    1528015235msgstr "Configure sites..."
    1528115236
    15282 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:400
     15237#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:396
    1528315238msgid "Configure the list of sites where plugins are downloaded from"
    1528415239msgstr "Configure the list of sites where plug-ins are downloaded from"
    1528515240
    15286 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:462
    15287 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:474
     15241#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:458
     15242#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:470
    1528815243msgid "Add JOSM Plugin description URL."
    1528915244msgstr "Add JOSM Plug-in description URL."
    1529015245
    15291 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:475
     15246#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
    1529215247msgid "Enter URL"
    1529315248msgstr "Enter URL"
    1529415249
    15295 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:488
    15296 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
     15250#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
     15251#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
    1529715252msgid "Please select an entry."
    1529815253msgstr "Please select an entry."
    1529915254
    15300 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:496
     15255#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:492
    1530115256msgid "Edit JOSM Plugin description URL."
    1530215257msgstr "Edit JOSM Plug-in description URL."
    1530315258
    15304 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:497
     15259#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:493
    1530515260msgid "JOSM Plugin description URL"
    1530615261msgstr "JOSM Plug-in description URL"
    … …  
    1546915424
    1547015425#. some common tabs
    15471 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:62
     15426#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:58
    1547215427msgid "Display Settings"
    1547315428msgstr "Display Settings"
    1547415429
    15475 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:62
     15430#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:58
    1547615431msgid ""
    1547715432"Various settings that influence the visual representation of the whole "
    … …  
    1548115436"program."
    1548215437
    15483 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:63
     15438#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:59
    1548415439msgid "Connection Settings"
    1548515440msgstr "Connection Settings"
    1548615441
    15487 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:63
     15442#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:59
    1548815443msgid "Connection Settings for the OSM server."
    1548915444msgstr "Connection Settings for the OSM server."
    1549015445
    15491 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:64
     15446#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:60
    1549215447msgid "Map Settings"
    1549315448msgstr "Map Settings"
    1549415449
    15495 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:64
     15450#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:60
    1549615451msgid "Settings for the map projection and data interpretation."
    1549715452msgstr "Settings for the map projection and data interpretation."
    1549815453
    15499 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:65
     15454#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:61
    1550015455msgid "Audio Settings"
    1550115456msgstr "Audio Settings"
    1550215457
    15503 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:65
     15458#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:61
    1550415459msgid "Settings for the audio player and audio markers."
    1550515460msgstr "Settings for the audio player and audio markers."
    1550615461
    15507 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:66
     15462#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:62
    1550815463msgid "Configure available plugins."
    1550915464msgstr "Configure available plug-ins."
    1551015465
    15511 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144
     15466#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:140
    1551215467msgid "Download plugins"
    1551315468msgstr "Download plug-ins"
    1551415469
    15515 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176
     15470#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:172
    1551615471msgid "You have to restart JOSM for some settings to take effect."
    1551715472msgstr "You have to restart JOSM for some settings to take effect."
    … …  
    1594315898msgstr "Data validator"
    1594415899
    15945 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:65
     15900#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:61
    1594615901msgid "Plugin bundled with JOSM"
    1594715902msgstr "Plug-in bundled with JOSM"
    1594815903
    15949 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:82
     15904#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:78
    1595015905msgid ""
    1595115906"Please click on <strong>Download list</strong> to download and display a "
    … …  
    1595515910"list of available plug-ins."
    1595615911
    15957 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:118
     15912#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:114
    1595815913#, java-format
    1595915914msgid "{0}: Version {1} (local: {2})"
    … …  
    1611316068#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:118
    1611416069#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:140
    16115 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:152
    16116 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:183
     16070#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:147
     16071#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:178
    1611716072#, java-format
    1611816073msgid "Current credential manager is of type ''{0}''"
    … …  
    1612316078msgstr "Warning: failed to save OSM credentials to credential manager."
    1612416079
    16125 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
     16080#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:146
    1612616081msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
    1612716082msgstr "Warning: Failed to retrieve OAuth Access Token from credential manager"
    1612816083
    16129 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
     16084#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:177
    1613016085msgid "Warning: Failed to store OAuth Access Token to credentials manager"
    1613116086msgstr "Warning: Failed to store OAuth Access Token to credentials manager"
    1613216087
    16133 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:187
     16088#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:183
    1613416089msgid ""
    1613516090"You do not have an Access Token yet to access the OSM server using OAuth. "
    … …  
    1613916094"Please authorise first."
    1614016095
    16141 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
     16096#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:222
    1614216097msgid "You already have an Access Token to access the OSM server using OAuth."
    1614316098msgstr "You already have an Access Token to access the OSM server using OAuth."
    1614416099
    16145 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:258
     16100#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:254
    1614616101msgid "Save to preferences"
    1614716102msgstr "Save to preferences"
    1614816103
    16149 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:307
     16104#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:303
    1615016105msgid "Click to step through the OAuth authorization process"
    1615116106msgstr "Click to step through the OAuth authorisation process"
    1615216107
    16153 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
     16108#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:327
    1615416109msgid "New Access Token"
    1615516110msgstr "New Access Token"
    1615616111
    16157 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:332
     16112#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:328
    1615816113msgid ""
    1615916114"Click to step through the OAuth authorization process and generate a new "
    … …  
    1616316118"Access Token"
    1616416119
    16165 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:357
     16120#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:353
    1616616121msgid "Click test access to the OSM server with the current access token"
    1616716122msgstr "Click test access to the OSM server with the current access token"
    … …  
    1625816213"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
    1625916214
    16260 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:58
     16215#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:54
    1626116216#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:64
    1626216217msgid "multiple"
    1626316218msgstr "multiple"
    1626416219
    16265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:505
     16220#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:501
    1626616221#, java-format
    1626716222msgid "Remove old keys from up to {0} object"
    … …  
    1627016225msgstr[1] "Remove old keys from up to {0} objects"
    1627116226
    16272 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:184
     16227#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:179
    1627316228msgid "Delete the selection in the tag table"
    1627416229msgstr "Delete the selection in the tag table"
    1627516230
    16276 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:276
     16231#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:271
    1627716232msgid "Add a new tag"
    1627816233msgstr "Add a new tag"
    … …  
    1653816493msgstr "Unsupported parameter ''{0}'' in changeset query string"
    1653916494
    16540 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
     16495#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:81
    1654116496#, java-format
    1654216497msgid ""
    … …  
    1654516500"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
    1654616501
    16547 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
    16548 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
    16549 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
    16550 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
    16551 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
     16502#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:82
     16503#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:87
     16504#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:116
     16505#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
    1655216506msgid "The proxy will not be used."
    1655316507msgstr "The proxy will not be used."
    1655416508
    16555 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
     16509#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
    1655616510#, java-format
    1655716511msgid "Illegal port number in preference ''{0}''. Got {1}."
    … …  
    1656016514#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
    1656116515#, java-format
    16562 msgid "Warning: no preference ''{0}'' found."
    16563 msgstr "Warning: no preference ''{0}'' found."
    16564 
    16565 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
    16566 #, java-format
    1656716516msgid ""
    1656816517"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
    … …  
    1657216521"use no proxy."
    1657316522
    16574 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
     16523#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:115
    1657516524#, java-format
    1657616525msgid ""
    … …  
    1658116530"''{1}''."
    1658216531
    16583 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
     16532#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:127
    1658416533#, java-format
    1658516534msgid ""
    … …  
    1659316542#. somewhere else
    1659416543#.
    16595 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
     16544#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
    1659616545#, java-format
    1659716546msgid ""
    … …  
    1660016549"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
    1660116550
    16602 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
     16551#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
    1660316552msgid ""
    1660416553"Warning: the JVM is not configured to lookup proxies from the system "
    … …  
    1679616745msgstr ""
    1679716746
    16798 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116
     16747#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:113
    1679916748#, java-format
    1680016749msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
    … …  
    1680216751"No primitive with id {0} in local dataset. Cannot infer primitive type."
    1680316752
    16804 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:303
    16805 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:327
     16753#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:300
     16754#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:324
    1680616755#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30
    1680716756#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:82
    … …  
    1681116760msgstr "Downloading OSM data..."
    1681216761
    16813 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:355
     16762#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:352
    1681416763#, java-format
    1681516764msgid "Fetching node with id {0} from ''{1}''"
    1681616765msgstr "Fetching node with id {0} from ''{1}''"
    1681716766
    16818 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:356
     16767#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:353
    1681916768#, java-format
    1682016769msgid "Fetching way with id {0} from ''{1}''"
    1682116770msgstr "Fetching way with id {0} from ''{1}''"
    1682216771
    16823 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:357
     16772#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:354
    1682416773#, java-format
    1682516774msgid "Fetching relation with id {0} from ''{1}''"
    1682616775msgstr "Fetching relation with id {0} from ''{1}''"
    1682716776
    16828 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363
     16777#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360
    1682916778#, java-format
    1683016779msgid "Server replied with response code 404 for id {0}. Skipping."
    1683116780msgstr "Server replied with response code 404 for id {0}. Skipping."
    1683216781
    16833 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405
     16782#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:402
    1683416783#, java-format
    1683516784msgid "Fetching a package of nodes from ''{0}''"
    1683616785msgstr "Fetching a package of nodes from ''{0}''"
    1683716786
    16838 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:406
     16787#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403
    1683916788#, java-format
    1684016789msgid "Fetching a package of ways from ''{0}''"
    1684116790msgstr "Fetching a package of ways from ''{0}''"
    1684216791
    16843 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:407
     16792#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404
    1684416793#, java-format
    1684516794msgid "Fetching a package of relations from ''{0}''"
    1684616795msgstr "Fetching a package of relations from ''{0}''"
    1684716796
    16848 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:418
     16797#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:415
    1684916798msgid ""
    1685016799"Server replied with response code 404, retrying with an individual request "
    … …  
    1685216801msgstr ""
    1685316802
    16854 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:444
     16803#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:441
    1685516804#, java-format
    1685616805msgid "Downloading {0} object from ''{1}''"
    … …  
    1689616845msgstr "NMEA import failure!"
    1689716846
    16898 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:88
     16847#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:85
    1689916848#, java-format
    1690016849msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
    1690116850msgstr "Preference ''{0}'' missing. Cannot initialise OsmApi."
    1690216851
    16903 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172
     16852#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:169
    1690416853msgid "This version of JOSM is incompatible with the configured server."
    1690516854msgstr "This version of JOSM is incompatible with the configured server."
    1690616855
    16907 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173
     16856#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:170
    1690816857#, java-format
    1690916858msgid ""
    … …  
    1691416863"{1}."
    1691516864
    16916 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177
     16865#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174
    1691716866#, java-format
    1691816867msgid "Communications with {0} established using protocol version {1}."
    1691916868msgstr "Communications with {0} established using protocol version {1}"
    1692016869
    16921 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203
     16870#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:200
    1692216871#, java-format
    1692316872msgid "Removed layer {0} because it is not allowed by the configured API."
    1692416873msgstr ""
    1692516874
    16926 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291
    16927 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355
     16875#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:288
     16876#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
    1692816877#, java-format
    1692916878msgid "Unexpected format of ID replied by the server. Got ''{0}''."
    1693016879msgstr "unexpected format of id replied by the server, got ''{0}''"
    1693116880
    16932 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
     16881#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
    1693316882#, java-format
    1693416883msgid ""
    … …  
    1693716886"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
    1693816887
    16939 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
     16888#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
    1694016889msgid "Creating changeset..."
    1694116890msgstr "Creating changeset..."
    1694216891
    16943 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357
     16892#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
    1694416893#, java-format
    1694516894msgid "Successfully opened changeset {0}"
    1694616895msgstr "Successfully opened changeset {0}"
    1694716896
    16948 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381
    16949 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421
    16950 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704
     16897#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378
     16898#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418
     16899#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:701
    1695116900#, java-format
    1695216901msgid "Changeset ID > 0 expected. Got {0}."
    1695316902msgstr "Changeset ID > 0 expected. Got {0}."
    1695416903
    16955 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383
     16904#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
    1695616905msgid "Updating changeset..."
    1695716906msgstr "Updating changeset..."
    1695816907
    16959 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
     16908#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382
    1696016909#, java-format
    1696116910msgid "Updating changeset {0}..."
    1696216911msgstr "Updating changeset {0}..."
    1696316912
    16964 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423
     16913#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420
    1696516914msgid "Closing changeset..."
    1696616915msgstr "Closing changeset..."
    1696716916
    16968 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
     16917#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:443
    1696916918msgid "No changeset present for diff upload."
    1697016919msgstr "No changeset present for diff upload"
    1697116920
    16972 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453
     16921#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450
    1697316922msgid "Preparing upload request..."
    1697416923msgstr "Preparing upload request..."
    1697516924
    16976 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483
     16925#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:480
    1697716926msgid "Waiting 10 seconds ... "
    1697816927msgstr "Waiting 10 seconds ... "
    1697916928
    16980 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486
     16929#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483
    1698116930#, java-format
    1698216931msgid "Starting retry {0} of {1} in {2} seconds ..."
    1698316932msgstr "Starting retry {0} of {1} in {2} seconds ..."
    1698416933
    16985 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494
     16934#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:491
    1698616935msgid "OK - trying again."
    1698716936msgstr "OK - trying again."
    1698816937
    16989 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580
     16938#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:577
    1699016939#, java-format
    1699116940msgid "Starting retry {0} of {1}."
    1699216941msgstr "Starting retry {0} of {1}."
    1699316942
    16994 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676
     16943#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:673
    1699516944msgid "Current changeset is null. Cannot upload data."
    1699616945msgstr "Current changeset is null. Cannot upload data."
    1699716946
    16998 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678
     16947#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:675
    1699916948#, java-format
    1700016949msgid "ID of current changeset > 0 required. Current ID is {0}."
    1700116950msgstr "ID of current changeset > 0 required. Current ID is {0}."
    1700216951
    17003 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706
     16952#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:703
    1700416953#, java-format
    1700516954msgid "Open changeset expected. Got closed changeset with id {0}."
    … …  
    1704116990#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:120
    1704216991#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:135
    17043 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:75
    17044 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:112
    17045 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
     16992#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:71
     16993#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:108
     16994#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:162
    1704616995#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:69
    1704716996#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
    1704816997#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
    1704916998#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
    17050 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
     16999#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
    1705117000#: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:104
    1705217001#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:143
    … …  
    1715417103msgstr "Parsing changeset content ..."
    1715517104
    17156 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
    17157 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:131
    17158 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:137
    17159 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:147
    17160 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:153
     17105#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:77
     17106#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:127
     17107#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:133
     17108#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:143
     17109#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:149
    1716117110#, java-format
    1716217111msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
    1716317112msgstr "Illegal value for attribute ''{0}''. Got ''{1}''."
    1716417113
    17165 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:84
     17114#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:80
    1716617115#, java-format
    1716717116msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
    1716817117msgstr "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
    1716917118
    17170 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:118
     17119#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:114
    1717117120#, java-format
    1717217121msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
    1717317122msgstr "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
    1717417123
    17175 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:162
    17176 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
     17124#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:158
     17125#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
    1717717126#: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:100
    1717817127#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:139
    … …  
    1718217131msgstr "Missing mandatory attribute ''{0}'' of XML element {1}."
    1718317132
    17184 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:169
    17185 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
     17133#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:165
     17134#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
    1718617135#: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:107
    1718717136#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:146
    … …  
    1719017139msgstr "Unsupported version: {0}"
    1719117140
    17192 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:179
     17141#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:175
    1719317142#, java-format
    1719417143msgid "Undefined element ''{0}'' found in input stream. Aborting."
    1719517144msgstr "Undefined element ''{0}'' found in input stream. Aborting."
    1719617145
    17197 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:219
     17146#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
    1719817147msgid "Parsing list of changesets..."
    1719917148msgstr "Parsing list of changesets..."
    1720017149
    17201 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
     17150#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:122
    1720217151msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
    1720317152msgstr "Failed to sign a HTTP connection with an OAuth Authentication header"
    1720417153
    17205 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
     17154#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:133
    1720617155#, java-format
    1720717156msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
    … …  
    1725417203msgstr "File \"{0}\" does not exist"
    1725517204
    17256 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:164
     17205#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:160
    1725717206#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:170
    1725817207#, java-format
    … …  
    1726417213"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
    1726517214
    17266 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:195
     17215#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
    1726717216#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:201
    1726817217msgid "Found XML element <nd> not as direct child of element <way>."
    1726917218msgstr "Found XML element <nd> not as direct child of element <way>."
    1727017219
    17271 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
     17220#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:196
    1727217221#: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:150
    1727317222#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:206
    … …  
    1727617225msgstr "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
    1727717226
    17278 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
     17227#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
    1727917228#: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:153
    1728017229#: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:188
    … …  
    1728417233msgstr "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
    1728517234
    17286 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210
     17235#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
    1728717236#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:216
    1728817237#, java-format
    … …  
    1729017239msgstr "Deleted way {0} contains nodes"
    1729117240
    17292 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
     17241#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227
    1729317242#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:237
    1729417243msgid "Found XML element <member> not as direct child of element <relation>."
    1729517244msgstr "Found XML element <member> not as direct child of element <relation>."
    1729617245
    17297 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:237
     17246#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
    1729817247#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:243
    1729917248#, java-format
    … …  
    1730117250msgstr "Missing attribute ''ref'' on member in relation {0}."
    1730217251
    17303 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242
     17252#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
    1730417253#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:248
    1730517254#, java-format
    … …  
    1730717256msgstr "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
    1730817257
    17309 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
     17258#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242
    1731017259#: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:193
    1731117260#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:252
    … …  
    1731417263msgstr "Missing attribute ''type'' on member {0} in relation {1}."
    1731517264
    17316 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
     17265#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:247
    1731717266#: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:199
    1731817267#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:257
    … …  
    1732317272"Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
    1732417273
    17325 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
     17274#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
    1732617275#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:263
    1732717276msgid "Incomplete <member> specification with ref=0"
    1732817277msgstr "Incomplete <member> specification with ref=0"
    1732917278
    17330 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
     17279#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
    1733117280#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:267
    1733217281#, java-format
    … …  
    1733417283msgstr "Deleted relation {0} contains members"
    1733517284
    17336 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
     17285#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
    1733717286#: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:221
    1733817287msgid "Missing key or value attribute in tag."
    1733917288msgstr ""
    1734017289
    17341 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277
     17290#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273
    1734217291#: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:226
    1734317292#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:280
    … …  
    1734617295msgstr "Undefined element ''{0}'' found in input stream. Skipping."
    1734717296
    17348 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
     17297#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:304
    1734917298#: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:334
    1735017299#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:308
    … …  
    1735217301msgstr "Illegal object with id=0"
    1735317302
     17303#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
    1735417304#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
    17355 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
    1735617305#: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:357
    1735717306#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:334
    … …  
    1736617315
    1736717316#. default version in 0.5 files for existing primitives
    17368 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
    17369 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
    17370 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
    17371 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
     17317#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:336
     17318#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:341
     17319#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
     17320#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
    1737217321#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:340
    1737317322#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:345
    … …  
    1738317332
    1738417333#. should not happen. API version has been checked before
    17385 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
     17334#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
    1738617335#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:353
    1738717336#, java-format
    … …  
    1738917338msgstr "Unknown or unsupported API version. Got {0}."
    1739017339
    17391 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
     17340#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355
    1739217341#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:359
    1739317342#, java-format
    … …  
    1739617345
    1739717346#. for a new primitive we just log a warning
    17398 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391
    17399 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:401
     17347#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
     17348#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
    1740017349#: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:380
    1740117350#: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:388
    … …  
    1741117360
    1741217361#. for an existing primitive this is a problem
    17413 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
    17414 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
     17362#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391
     17363#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:401
    1741517364#: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:383
    1741617365#: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:391
    … …  
    1742117370msgstr "Illegal value for attribute ''changeset''. Got {0}."
    1742217371
    17423 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:414
     17372#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:410
    1742417373#: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:304
    1742517374#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:414
    … …  
    1742817377msgstr "Missing required attribute ''{0}''."
    1742917378
    17430 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:419
     17379#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:415
    1743117380#: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:310
    1743217381#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:419
    … …  
    1743517384msgstr "Illegal long value for attribute ''{0}''. Got ''{1}''."
    1743617385
    17437 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
     17386#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:436
    1743817387#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:440
    1743917388#, java-format
    … …  
    1744317392"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
    1744417393
    17445 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
     17394#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:448
    1744617395#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:452
    1744717396#, java-format
    … …  
    1744917398msgstr "Deleted node {0} is part of way {1}"
    1745017399
    17451 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:460
     17400#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:455
    1745217401#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:460
    1745317402#, java-format
    … …  
    1745917408"missing in the loaded data."
    1746017409
    17461 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:516
     17410#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:510
    1746217411#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:516
    1746317412#, java-format
    … …  
    1746917418"external id ''{1}''."
    1747017419
    17471 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:540
     17420#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:534
    1747217421#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:540
    1747317422#, java-format
    … …  
    1747517424msgstr "Deleted member {0} is used by relation {1}"
    1747617425
    17477 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:566
     17426#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:560
    1747817427msgid "Prepare OSM data..."
    1747917428msgstr "Prepare OSM data..."
    1748017429
    17481 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:567
     17430#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:561
    1748217431msgid "Parsing OSM data..."
    1748317432msgstr "Parsing OSM data..."
    1748417433
    17485 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:573
     17434#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:567
    1748617435msgid "Preparing data set..."
    1748717436msgstr "Preparing data set..."
    1748817437
    17489 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589
     17438#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:583
    1749017439#: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:66
    1749117440#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:221
    … …  
    1755617505msgstr "Contacting Server..."
    1755717506
    17558 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65
     17507#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:62
    1755917508#, java-format
    1756017509msgid "Failed to open connection to API {0}."
    1756117510msgstr "Failed to open connection to API {0}"
    1756217511
    17563 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
     17512#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:85
    1756417513msgid ""
    1756517514"Could not connect to the OSM server. Please check your internet connection."
    … …  
    1756717516"Could not connect to the OSM server. Please check your internet connection."
    1756817517
    17569 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114
     17518#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:111
    1757017519msgid "Reading error text failed."
    1757117520msgstr ""
    … …  
    1759517544msgstr "Reading user info ..."
    1759617545
    17597 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
     17546#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:76
    1759817547msgid "Starting to upload with one request per primitive ..."
    1759917548msgstr "Starting to upload with one request per primitive ..."
    1760017549
    17601 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
     17550#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:84
    1760217551#, java-format
    1760317552msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
    1760417553msgstr "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
    1760517554
    17606 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
     17555#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:85
    1760717556#, java-format
    1760817557msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
    1760917558msgstr "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
    1761017559
    17611 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
     17560#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:86
    1761217561#, java-format
    1761317562msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
    1761417563msgstr "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
    1761517564
    17616 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:122
     17565#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118
    1761717566msgid "Starting to upload in one request ..."
    1761817567msgstr "Starting to upload in one request ..."
    1761917568
    17620 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
     17569#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
    1762117570#, java-format
    1762217571msgid "Value >0 expected for parameter ''{0}'', got {1}"
    1762317572msgstr "Value >0 expected for parameter ''{0}'', got {1}"
    1762417573
    17625 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144
     17574#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:140
    1762617575msgid "Starting to upload in chunks..."
    1762717576msgstr "Starting to upload in chunks..."
    1762817577
    17629 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:160
     17578#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:156
    1763017579#, java-format
    1763117580msgid "({0}/{1}) Uploading {2} object..."
    … …  
    1763417583msgstr[1] "({0}/{1}) Uploading {2} objects..."
    1763517584
    17636 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187
     17585#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
    1763717586msgid "Uploading data ..."
    1763817587msgstr "Uploading data ..."
    … …  
    1773217681msgstr "Request details: {0}"
    1773317682
    17734 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java:141
     17683#: ../core/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java:128
    1773517684msgid "Do you want to allow this?"
    1773617685msgstr "Do you want to allow this?"
    1773717686
    17738 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java:142
     17687#: ../core/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java:129
    1773917688msgid "Confirm Remote Control action"
    1774017689msgstr "Confirm Remote Control action"
    … …  
    1774617695msgstr ""
    1774717696
    17748 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:103
     17697#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:99
    1774917698msgid "Skip download"
    1775017699msgstr "Skip download"
    1775117700
    17752 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:105
     17701#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:101
    1775317702msgid "Download Plugin"
    1775417703msgstr "Download Plug-in"
    1775517704
    17756 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:106
     17705#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:102
    1775717706msgid "Skip Download"
    1775817707msgstr "Skip Download"
    1775917708
    17760 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:108
     17709#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:104
    1776117710#, java-format
    1776217711msgid "JOSM version {0} required for plugin {1}."
    1776317712msgstr "JOSM version {0} required for plug-in {1}."
    1776417713
    17765 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:113
     17714#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:109
    1776617715msgid "Download skipped"
    1776717716msgstr ""
    1776817717
    17769 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:119
     17718#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:115
    1777017719#, java-format
    1777117720msgid ""
    … …  
    1777617725"Skipping download."
    1777717726
    17778 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:140
     17727#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:136
    1777917728#, java-format
    1778017729msgid ""
    … …  
    1778517734"valid URL. Skipping download."
    1778617735
    17787 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:160
     17736#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:156
    1778817737#, java-format
    1778917738msgid "Failed to create plugin directory ''{0}''"
    1779017739msgstr "Failed to create plug-in directory ''{0}''"
    1779117740
    17792 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:168
     17741#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:164
    1779317742#, java-format
    1779417743msgid "Downloading Plugin {0}..."
    … …  
    1811318062msgstr "More info..."
    1811418063
    18115 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:255
     18064#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:256
    1811618065#, java-format
    1811718066msgid "<b>Plugin provided by an external source:</b> {0}"
    … …  
    2207922028msgstr ""
    2208022029
    22081 #. item "Ways/Path" combo "SAC Scale" item "T3 - difficult‘ exposed hiking trail" short description
     22030#. item "Ways/Path" combo "SAC Scale" item "T3 - difficult, exposed hiking trail" short description
    2208222031#: build/trans_presets.java:550
    2208322032msgid ""
    … …  
    2208722036msgstr ""
    2208822037
    22089 #. item "Ways/Path" combo "SAC Scale" item "T4 - difficult‘ exposed‘ steep alpine trail" short description
     22038#. item "Ways/Path" combo "SAC Scale" item "T4 - difficult, exposed, steep alpine trail" short description
    2209022039#: build/trans_presets.java:551
    2209122040msgid ""
    … …  
    2521325162#. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
    2521425163#: build/trans_presets.java:1573
    25215 msgid "GTÜ"
     25164msgid "GTÜ"
    2521625165msgstr ""
    2521725166
    … …  
    2522325172#. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
    2522425173#: build/trans_presets.java:1573
    25225 msgid "TÜV"
     25174msgid "TÜV"
    2522625175msgstr ""
    2522725176
    … …  
    3560035549msgstr "unusual tag combination"
    3560135550
    35602 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
    35603 #: build/trans_wms.java:1
     35551#. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
     35552#. http://irs.gis-lab.info/?layers=landsat&
     35553#: build/trans_wms.java:2
    3560435554msgid "Landsat"
    3560535555msgstr "Landsat"
    35606 
    35607 #. http://irs.gis-lab.info/?layers=landsat&
    35608 #: build/trans_wms.java:2
    35609 msgid "Landsat (mirror)"
    35610 msgstr ""
    3561135556
    3561235557#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
    … …  
    3563035575msgstr ""
    3563135576
    35632 #. tms:http://tile.openstreetmap.org/
     35577#. tms[18]:http://tile.openstreetmap.org/;;;osm;osm;osm
    3563335578#: build/trans_wms.java:7
    3563435579msgid "OpenStreetMap (Mapnik)"
    3563535580msgstr ""
    3563635581
    35637 #. tms:http://tile.opencyclemap.org/cycle
     35582#. tms[17]:http://tile.opencyclemap.org/cycle;;;osm;osm;osm
    3563835583#: build/trans_wms.java:8
    3563935584msgid "OpenCycleMap"
    3564035585msgstr "OpenCycleMap"
    3564135586
    35642 #. tms:http://tah.openstreetmap.org/Tiles/tile
     35587#. tms[17]:http://tah.openstreetmap.org/Tiles/tile;;;osm;osm;osm
    3564335588#: build/trans_wms.java:9
    3564435589msgid "TilesAtHome"
    3564535590msgstr "TilesAtHome"
    3564635591
    35647 #. tms:http://tile.xn--pnvkarte-m4a.de/tilegen
     35592#. tms[18]:http://otile1.mqcdn.com/tiles/1.0.0/osm;;;osm;osm;osm
    3564835593#: build/trans_wms.java:10
     35594msgid "MapQuest OSM"
     35595msgstr ""
     35596
     35597#. tms[5,18]:http://osm.informatik.uni-leipzig.de/osm_tiles2;;;osm;osm;osm
     35598#: build/trans_wms.java:11
     35599msgid "ODBL coverage"
     35600msgstr ""
     35601
     35602#. tms[18]:http://tile.xn--pnvkarte-m4a.de/tilegen;;;osm;osm;osm
     35603#: build/trans_wms.java:12
    3564935604msgid "PNV"
    3565035605msgstr ""
    3565135606
    35652 #. tms:http://b.tile.openstreetmap.de/tiles/osmde
    35653 #: build/trans_wms.java:11
     35607#. tms[18]:http://{switch:a,b,c}.tile.openstreetmap.de/tiles/osmde;;;osm;osm;osm
     35608#: build/trans_wms.java:13
    3565435609msgid "German Style"
    3565535610msgstr ""
    3565635611
    3565735612#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
    35658 #: build/trans_wms.java:12
     35613#: build/trans_wms.java:14
    3565935614msgid "Streets NRW Geofabrik.de"
    3566035615msgstr "Streets NRW Geofabrik.de"
    3566135616
    35662 #. tms:http://toolserver.org/tiles/hikebike/
    35663 #: build/trans_wms.java:13
     35617#. tms[18]:http://toolserver.org/tiles/hikebike/;;;osm;osm;osm
     35618#: build/trans_wms.java:15
    3566435619msgid "Hike & Bike"
    3566535620msgstr ""
    3566635621
    35667 #. tms:http://toolserver.org/tiles/osm-locale-hsb
    35668 #: build/trans_wms.java:14
     35622#. tms[17]:http://toolserver.org/tiles/osm-locale-hsb;;;osm;osm;osm
     35623#: build/trans_wms.java:16
    3566935624msgid "Sorbische Karte"
    3567035625msgstr ""
    3567135626
    35672 #. tms:http://toolserver.org/tiles/osm-locale-de
    35673 #: build/trans_wms.java:15
     35627#. tms[17]:http://toolserver.org/tiles/osm-locale-de;;;osm;osm;osm
     35628#: build/trans_wms.java:17
    3567435629msgid "Deutsche Karte"
    3567535630msgstr ""
    3567635631
     35632#. tms[5,16]:http://openptmap.de/tiles;;45.7,5.9,55.0,17.3;osm;osm;osm
     35633#: build/trans_wms.java:18
     35634msgid "OpenPT Map"
     35635msgstr ""
     35636
    3567735637#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m&
    35678 #: build/trans_wms.java:16
     35638#: build/trans_wms.java:19
    3567935639msgid "Geoimage.at"
    3568035640msgstr ""
    3568135641
    3568235642#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
    35683 #: build/trans_wms.java:17
     35643#: build/trans_wms.java:20
    3568435644msgid "MSR Maps Topo"
    3568535645msgstr ""
    3568635646
    3568735647#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
    35688 #: build/trans_wms.java:18
     35648#: build/trans_wms.java:21
    3568935649msgid "MSR Maps Urban"
    3569035650msgstr ""
    3569135651
    3569235652#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
    35693 #: build/trans_wms.java:19
     35653#: build/trans_wms.java:22
    3569435654msgid "Czech CUZK:KM"
    3569535655msgstr "Czech CUZK:KM"
    3569635656
    3569735657#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
    35698 #: build/trans_wms.java:20
     35658#: build/trans_wms.java:23
    3569935659msgid "Czech UHUL:ORTOFOTO"
    3570035660msgstr "Czech UHUL:ORTOFOTO"
    3570135661
    3570235662#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
    35703 #: build/trans_wms.java:21
     35663#: build/trans_wms.java:24
    3570435664msgid "NPE Maps"
    3570535665msgstr "NPE Maps"
    3570635666
    3570735667#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
    35708 #: build/trans_wms.java:22
     35668#: build/trans_wms.java:25
    3570935669msgid "NPE Maps (Tim)"
    3571035670msgstr "NPE Maps (Tim)"
    3571135671
    3571235672#. http://ooc.openstreetmap.org/wms/map.php?source=os7&
    35713 #: build/trans_wms.java:23
     35673#: build/trans_wms.java:26
    3571435674msgid "7th Series (OS7)"
    3571535675msgstr "7th Series (OS7)"
    3571635676
    3571735677#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
    35718 #: build/trans_wms.java:24
     35678#: build/trans_wms.java:27
    3571935679msgid "MLIT Japan (ORTHO)"
    3572035680msgstr "MLIT Japan (ORTHO)"
    3572135681
    3572235682#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
    35723 #: build/trans_wms.java:25
     35683#: build/trans_wms.java:28
    3572435684msgid "MLIT Japan (ORTHO01)"
    3572535685msgstr "MLIT Japan (ORTHO01)"
    3572635686
    3572735687#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
    35728 #: build/trans_wms.java:26
     35688#: build/trans_wms.java:29
    3572935689msgid "MLIT Japan (ORTHO02)"
    3573035690msgstr "MLIT Japan (ORTHO02)"
    3573135691
    3573235692#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
    35733 #: build/trans_wms.java:27
     35693#: build/trans_wms.java:30
    3573435694msgid "MLIT Japan (ORTHO03)"
    3573535695msgstr "MLIT Japan (ORTHO03)"
    3573635696
    3573735697#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
    35738 #: build/trans_wms.java:28
     35698#: build/trans_wms.java:31
    3573935699msgid "Lodi - Italy"
    3574035700msgstr "Lodi - Italy"
    3574135701
    3574235702#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
    35743 #: build/trans_wms.java:29
     35703#: build/trans_wms.java:32
    3574435704msgid "Sicily - Italy"
    3574535705msgstr "Sicily - Italy"
    3574635706
    3574735707#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
    35748 #: build/trans_wms.java:30
     35708#: build/trans_wms.java:33
    3574935709msgid "PCN 2006 - Italy"
    3575035710msgstr ""
    3575135711
    3575235712#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
    35753 #: build/trans_wms.java:31
     35713#: build/trans_wms.java:34
    3575435714msgid "SPOTMaps (France)"
    3575535715msgstr ""
    3575635716
    3575735717#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
    35758 #: build/trans_wms.java:32
     35718#: build/trans_wms.java:35
    3575935719msgid "PNOA Spain"
    3576035720msgstr ""
    3576135721
    3576235722#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
    35763 #: build/trans_wms.java:33
     35723#: build/trans_wms.java:36
    3576435724msgid "Estonia Basemap (Maaamet)"
    3576535725msgstr ""
    3576635726
    3576735727#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
    35768 #: build/trans_wms.java:34
     35728#: build/trans_wms.java:37
    3576935729msgid "Estonia Ortho (Maaamet)"
    3577035730msgstr ""
    3577135731
    3577235732#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
    35773 #: build/trans_wms.java:35
     35733#: build/trans_wms.java:38
    3577435734msgid "Estonia Multi (Maaamet)"
    3577535735msgstr ""
    3577635736
    3577735737#. tms:http://tile.openstreetmap.dk/fugro2005
    35778 #: build/trans_wms.java:36
     35738#: build/trans_wms.java:39
    3577935739msgid "Fugro (Denmark)"
    3578035740msgstr ""
    3578135741
    3578235742#. tms:http://tile.openstreetmap.dk/stevns/2009
    35783 #: build/trans_wms.java:37
     35743#: build/trans_wms.java:40
    3578435744msgid "Stevns (Denmark)"
    3578535745msgstr ""
    3578635746
    3578735747#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
    35788 #: build/trans_wms.java:38
     35748#: build/trans_wms.java:41
    3578935749msgid "Pangasinan (Phillipines HiRes)"
    3579035750msgstr ""
    … …  
    3703636996msgstr "Select commune"
    3703736997
    37038 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:181
     36998#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
    3703936999msgid "Cadastre"
    3704037000msgstr "Cadastre"
    3704137001
    37042 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:190
     37002#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
    3704337003msgid "Auto sourcing"
    3704437004msgstr "Auto sourcing"
    3704537005
    37046 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:256
     37006#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
    3704737007msgid ""
    3704837008"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
    … …  
    3705437014"Would you like to restore F11 for grab action ?"
    3705537015
    37056 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259
     37016#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
    3705737017msgid "Restore grab shortcut F11"
    3705837018msgstr "Restore grab shortcut F11"
    3705937019
    37060 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:264
     37020#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
    3706137021msgid "JOSM is stopped for the change to take effect."
    3706237022msgstr "JOSM is stopped for the change to take effect."
    3706337023
    37064 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:370
     37024#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
    3706537025#, java-format
    3706637026msgid ""
    … …  
    3912739087
    3912839088#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:16
    39129 #, fuzzy
    3913039089msgid "license validation error"
    39131 msgstr "validation error"
     39090msgstr ""
    3913239091
    3913339092#. * Warning messages
    … …  
    3913739096
    3913839097#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:20
    39139 #, fuzzy
    3914039098msgid "license validation warning"
    39141 msgstr "validation warning"
     39099msgstr ""
    3914239100
    3914339101#. * Other messages
    … …  
    3914739105
    3914839106#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:24
    39149 #, fuzzy
    3915039107msgid "license validation other"
    39151 msgstr "validation other"
     39108msgstr ""
    3915239109
    3915339110#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:131
    … …  
    4162741584
    4162841585#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Lane.java:182
    41629 #, fuzzy
    4163041586msgid "Add turn"
    41631 msgstr "Add filter."
     41587msgstr ""
    4163241588
    4163341589#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Lane.java:233
    41634 #, fuzzy
    4163541590msgid "Delete lane."
    41636 msgstr "Delete mine"
     41591msgstr ""
    4163741592
    4163841593#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Turn.java:183
    41639 #, fuzzy
    4164041594msgid "Delete turn."
    41641 msgstr "Delete filter."
     41595msgstr ""
    4164241596
    4164341597#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:129
    … …  
    4299542949msgid "Drive a race car on this layer"
    4299642950msgstr ""
     42951
     42952#~ msgid "Warning: no preference ''{0}'' found."
     42953#~ msgstr "Warning: no preference ''{0}'' found."
    4299742954
    4299842955#~ msgid "Move"
    … …  
    4443244389#~ msgid ""
    4443344390#~ "The projection \"{0}\" is designed for\n"
    44434 #~ "latitudes between 46.1° and 57° only.\n"
     44391#~ "latitudes between 46.1° and 57° only.\n"
    4443544392#~ "Use another projection system if you are not using\n"
    4443644393#~ "a French WMS server.\n"
    … …  
    4443844395#~ msgstr ""
    4443944396#~ "The projection \"{0}\" is designed for\n"
    44440 #~ "latitudes between 46.1° and 57° only.\n"
     44397#~ "latitudes between 46.1° and 57° only.\n"
    4444144398#~ "Use another projection system if you are not using\n"
    4444244399#~ "a French WMS server.\n"
    … …  
    4470444661#~ msgstr "Autoload Tiles: "
    4470544662
     44663#~ msgid "Max zoom lvl: "
     44664#~ msgstr "Max zoom lvl: "
     44665
    4470644666#~ msgid "No intersections found. Nothing was changed."
    4470744667#~ msgstr "No intersection found. Nothing was changed."
    … …  
    4506045020#~ msgid ""
    4506145021#~ "The projection \"{0}\" is designed for\n"
    45062 #~ "latitudes between 45.7° and 47.9°\n"
    45063 #~ "and longitutes between 5.7° and 10.6° only.\n"
     45022#~ "latitudes between 45.7° and 47.9°\n"
     45023#~ "and longitutes between 5.7° and 10.6° only.\n"
    4506445024#~ "Use another projection system if you are not working\n"
    4506545025#~ "on a data set of Switzerland or Liechtenstein.\n"
    … …  
    4506745027#~ msgstr ""
    4506845028#~ "The projection \"{0}\" is designed for\n"
    45069 #~ "latitudes between 45.7° and 47.9°\n"
    45070 #~ "and longitutes between 5.7° and 10.6° only.\n"
     45029#~ "latitudes between 45.7° and 47.9°\n"
     45030#~ "and longitutes between 5.7° and 10.6° only.\n"
    4507145031#~ "Use another projection system if you are not working\n"
    4507245032#~ "on a data set of Switzerland or Liechtenstein.\n"
    … …  
    4545545415#~ msgstr "Primitive deleted on the server"
    4545645416
     45417#~ msgid "Delete mine"
     45418#~ msgstr "Delete mine"
     45419
    4545745420#~ msgid "Update failed"
    4545845421#~ msgstr "Update failed"
    … …  
    4551845481#~ msgid "Undelete {0} primitives"
    4551945482#~ msgstr "Undelete {0} primitives"
     45483
     45484#~ msgid ""
     45485#~ "Warning: Purging way {0} because number of nodes dropped below 2. Current "
     45486#~ "is {1}"
     45487#~ msgstr ""
     45488#~ "Warning: Purging way {0} because number of nodes dropped below 2. Current "
     45489#~ "is {1}"
    4552045490
    4552145491#~ msgid "Purging 1 primitive"
    … …  
    4599245962#~ msgstr "Used style"
    4599345963
     45964#~ msgid "image "
     45965#~ msgstr "image "
     45966
    4599445967#~ msgid "OpenStreetMap"
    4599545968#~ msgstr "OpenStreetMap"
    … …  
    4612446097#~ "primitmive ''{1}''"
    4612546098
    46126 #~ msgid "Gauss-Laborde Réunion 1947"
    46127 #~ msgstr "Gauss-Laborde Réunion 1947"
     46099#~ msgid "Gauss-Laborde Réunion 1947"
     46100#~ msgstr "Gauss-Laborde Réunion 1947"
    4612846101
    4612946102#~ msgid "UTM20N Martinique Fort Desaix 1952"
    … …  
    4684146814#~ msgstr "Parameter ''{0}'' > 0 expected. Got ''{1}''."
    4684246815
     46816#~ msgid "Purged object ''{0}''"
     46817#~ msgstr "Purged object ''{0}''"
     46818
    4684346819#~ msgid ""
    4684446820#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
    … …  
    4685246828#~ "Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
    4685346829#~ "primitive ''{1}''."
     46830
     46831#~ msgid "Removing reference from relation {0}"
     46832#~ msgstr "Removing reference from relation {0}"
    4685446833
    4685546834#~ msgid "Purged {0} objects"
    … …  
    4740347382#~ msgstr "create new objects"
    4740447383
     47384#~ msgid "Min zoom lvl: "
     47385#~ msgstr "Min zoom lvl: "
     47386
    4740547387#~ msgid ""
    4740647388#~ "This test checks that there are no ways with same tags and same node "
Note: See TracChangeset for help on using the changeset viewer.