Changeset 18273 in osm for applications/editors/josm/i18n/po/cs.po

Timestamp:

2009-10-25T13:31:57+01:00 (15 years ago)

Author:

stoecker

Message:

updated i18n

File:

• applications/editors/josm/i18n/po/cs.po (modified) (170 diffs)

applications/editors/josm/i18n/po/cs.po

@@ -8 +8 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 15:06+0200\n"
-"PO-Revision-Date: 2009-10-17 11:42+0000\n"
+"POT-Creation-Date: 2009-10-25 13:10+0100\n"
+"PO-Revision-Date: 2009-10-19 09:47+0000\n"
 "Last-Translator: Kuvaly <kuvaly@seznam.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -16 +16 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2009-10-17 12:23+0000\n"
+"X-Launchpad-Export-Date: 2009-10-25 12:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -26 +26 @@
 #. FIXME why is help not a JosmAction?
 #: ../core/src/org/openstreetmap/josm/Main.java:202
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:99
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:23
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 msgid "Help"
@@ -49 +49 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
@@ -72 +72 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:262
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -93 +94 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:78
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:128
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -123 +123 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:489
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
@@ -158 +157 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:650
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:658
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -165 +164 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:162
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
@@ -180 +179 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:39
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
@@ -279 +279 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
 msgid "Plugins"
 msgstr "Pluginy"
@@ -329 +329 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:506
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:741
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
@@ -408 +410 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
@@ -504 +506 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
@@ -518 +520 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
@@ -603 +605 @@
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
@@ -660 +662 @@
 msgstr "Nemohu spojit cesty (Nemohou být spojeny do jednoho řetězce bodů)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Kombinovat {0} cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
 msgid "Please select at least two ways to combine."
 msgstr "Prosím zvolte minimálně dvě cesty ke spojení"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
 msgid "Copy selected objects to paste buffer."
 msgstr "Vybrat označené objekty pro vložení."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
 msgid "Please select something to copy."
 msgstr "Prosím zvol něco ke kopírování"
@@ -706 +708 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
@@ -768 +770 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
@@ -786 +789 @@
 msgstr "Prosím zvol aspoň jeden úkol ke stažení"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download parent ways/relations..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 msgid "Download primitives referring to one of the selected primitives"
 msgstr "Stáhnout prvky odkazující na jeden z vybraných prvků"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
+#, fuzzy, java-format
+msgid "Id > 0 required, got {0}"
+msgstr "očekáváno id > 0. Nalezeno {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
+#: ../core/src/org/openstreetmap/josm/command/Command.java:66
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #, java-format
@@ -804 +829 @@
 msgstr "Došlo k  {0} konfliktům během importu."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
 msgid "Conflicts during download"
 msgstr "Konflikty během stahování"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:147
-#, java-format
-msgid "({0}/{1}) Loading parents of primitive {2}"
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
+#, fuzzy, java-format
+msgid "({0}/{1}) Loading parents of node {2}"
 msgstr "({0}/{1}) Nahrávání rodičů prvku {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
+#, fuzzy, java-format
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) Nahrávání rodičů prvku {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#, fuzzy, java-format
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) Nahrávání rodičů prvku {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
 msgid "Duplicate"
 msgstr "Duplikovat"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Duplikovat výběr kopírováním a vložením."
@@ -865 +900 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:456
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -932 +966 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
@@ -955 +989 @@
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
-#, fuzzy
 msgid "Object history"
-msgstr "informace o historii"
+msgstr "Historie objektu"
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
@@ -985 +1018 @@
 msgstr "Spojit uzly a linie"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
 msgid "No Shortcut"
 msgstr "Beze zkratky"
@@ -1077 +1110 @@
 msgstr "Přesunutí objektů {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
@@ -1132 +1165 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
 msgid "Enter an URL from where data should be downloaded"
-msgstr ""
+msgstr "Vložte URL ze které mají být stažena data"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
@@ -1143 +1176 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
-#, fuzzy
 msgid "Start downloading data"
-msgstr "Stahuji data"
+msgstr "Začít stahování dat"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
 msgid "Close dialog and cancel downloading"
-msgstr ""
+msgstr "Zavřít dialog a ukončit stahování"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
@@ -1163 +1195 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#, fuzzy
 msgid "Orthogonalize Shape / Undo"
-msgstr "Ortogonalizovat tvar"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
@@ -1172 +1203 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
-#, fuzzy
 msgid "Orthogonalize / Undo"
-msgstr "Ortogonalizovat"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
@@ -1184 +1214 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
-#, fuzzy
 msgid "Undo Orthogonalize Shape"
-msgstr "Ortogonalizovat tvar"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
@@ -1197 +1226 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
-#, fuzzy
 msgid "Usage"
-msgstr "použití"
+msgstr "Využití"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
@@ -1209 +1237 @@
 msgstr "Ortogonalizovat"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste"
 msgstr "Vložit"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 msgid "Paste contents of paste buffer."
 msgstr "Vložit ze schránky"
 
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
 msgid "Paste Tags"
 msgstr "Vložit Popisky"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
 msgid "Apply tags of contents of paste buffer to all selected items."
 msgstr "Použít popisky objektu ve schránce na všechny zvolené objekty."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
 #, java-format
 msgid "Pasting {0} tag"
@@ -1236 +1263 @@
 msgstr[2] "Vkládám {0} tagů"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
 #, java-format
 msgid "to {0} primitive"
@@ -1408 +1435 @@
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1474 +1501 @@
 "should verify this and correct it when necessary.</html>"
 msgstr ""
+"<html>Relace založená na rolích byla zkopírována na všechny nové cesty."
+"<br>Mělo by být ověřeno, zda je zkopírování správné a případně opraveno.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
@@ -1633 +1663 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
-#, fuzzy, java-format
+#, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
-msgstr "Prvek s id {0} nebyl v aktuální datové sadě nalezen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
@@ -1687 +1717 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
-#, fuzzy, java-format
+#, java-format
 msgid "Synchronize node {0} only"
-msgstr "Synchronizovat pouze {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Synchronize way {0} only"
-msgstr "Synchronizovat pouze {0} {1}"
+msgstr "Synchronizovat pouze cestu {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
-#, fuzzy, java-format
+#, java-format
 msgid "Synchronize relation {0} only"
-msgstr "Synchronizovat pouze {0} {1}"
+msgstr "Syncronizovat pouze relaci {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
@@ -1760 +1790 @@
 msgstr "Sada změn byla uzavřena"
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#, fuzzy
+msgid "Prepare conflict resolution"
+msgstr "Zrušit řešení konfliktů"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+#, java-format
+msgid "Click to download all parent ways for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
+#, fuzzy
+msgid "Click to cancel and to resume editing the map"
+msgstr "Zavřít tento dialog a pokračovat v editování v JOSM"
+
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #, java-format
-msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
+msgid ""
+"<html>Uploading <strong>failed</strong> because you tried to delete node {0} "
+"which is still in use in way {1}.<br><br>Click <strong>{2}</strong> to "
+"download all parent ways of node {0}.<br>If necessary JOSM will create "
+"conflicts which you can resolve in the Conflict Resolution Dialog.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+msgid "Node still in use"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
+#, fuzzy, java-format
+msgid "Warning: error header \"{0}\" did not match with an expected pattern"
 msgstr "Varování: chybná hlavička \"{0}\" neodpovídá očekávanému vzoru \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>Aktualizace <strong>selhala</strong>.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 msgid "Upload to OSM API failed"
 msgstr "Nahrándí do OSM API selhalo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
 msgid "Updating primitive"
 msgstr "Aktualizuji prvky"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1785 +1844 @@
 #. we tried to delete an already deleted primitive.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:569
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
 #, java-format
@@ -1798 +1857 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
-#, fuzzy
 msgid "Upload all changes in the current selection to the OSM server."
-msgstr "Nahrát současné nastavení na server"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
 msgstr ""
 
@@ -1931 +1982 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
 msgid "No data found in this area."
-msgstr ""
+msgstr "V této oblasti nebyla nalezena žádná data."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
@@ -2084 +2135 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Pusťte myší tlačítko k vybrání obejktů v obdélníku"
@@ -2093 +2144 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
 msgid "Release the mouse button to stop rotating."
 msgstr "Pusťte myší tlačítko k zastavení otaáčení"
@@ -2155 +2206 @@
 msgstr "Vždy přesunout a tento dialog již více nezobrazovat"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2161 +2212 @@
 "Uvolněte tlačítko myši pro ukončení pohybu. Ctrl sloučí s nejbližším uzlem."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2555 +2606 @@
 msgid "Add relation {0}"
 msgstr "Přidat relaci {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
+#, fuzzy, java-format
+msgid "Added {0} objects"
+msgstr "Smazat {0} objekt"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2634 +2690 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
 msgid "Double conflict"
 msgstr "Dvojí konflikt"
@@ -2668 +2724 @@
 msgstr "nemohu vyřešit nerozhodnutý konflikt"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:127
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
 msgid "Delete {0} object"
@@ -2676 +2732 @@
 msgstr[2] "Smazat {0} objektů"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:132
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:183
 #, java-format
 msgid "Delete {0} node"
@@ -2684 +2740 @@
 msgstr[2] "Smazat {0} uzlů"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184
 #, java-format
 msgid "Delete {0} way"
@@ -2692 +2748 @@
 msgstr[2] "Smazat {0} cest"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:134
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:185
 #, java-format
 msgid "Delete {0} relation"
@@ -2700 +2756 @@
 msgstr[2] "Smazat {0} relací"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
 msgid "Conflicting relation"
 msgstr "Konfliktní relace"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
 msgid "Delete from relation"
 msgstr "Odstranit z relace"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
 #, java-format
 msgid ""
@@ -2718 +2774 @@
 "relace?</html>"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
 #, java-format
 msgid ""
@@ -2726 +2782 @@
 "<html>Výběr \"{0}\" je použit v relaci \"{1}\".<br>Smazat z relace?</html>"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#. FIXME: relation memberships are not handled
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
 msgid "Split way segment"
 msgstr "Rozdělit segment cesty"
@@ -2732 +2789 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
 msgid ""
@@ -2743 +2800 @@
 "<br>Opravdu je chcete smazat?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
 msgid "Delete confirmation"
 msgstr "Potvrďte smazání"
@@ -3070 +3127 @@
 msgstr "Sada změn {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:454
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-msgstr "očekáván parameter ''{0}'' > 0, zadáno ''{1}''"
-
 #. translators notes must be in front
 #. column header: enable filter
@@ -3090 +3137 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
-msgstr ""
+msgstr "H"
 
 #. column header: filter text
@@ -3105 +3152 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
-msgstr ""
+msgstr "I"
 
 #. column header: filter mode
@@ -3133 +3180 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
 #, java-format
 msgid "Error: {0}"
 msgstr "Chyba: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
 #, java-format
 msgid "Warning: {0}"
 msgstr "Varování: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr "očekáváno id >= 0. Nalezeno {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:319
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr "objekt s id=0 nemůže být neviditelný"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:375
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3158 +3205 @@
 msgstr "očekáváno id > 0. Nalezeno {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:377
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "očekávána verze > 0. Nalezena {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:37
 #, java-format
 msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:48
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:55
 #, java-format
 msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
@@ -3222 +3270 @@
 msgstr "V této datové sadě nelze nalézt prvek s id {0} a verzí {1}"
 
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+msgstr "očekáván parameter ''{0}'' > 0, zadáno ''{1}''"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:105
 msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
@@ -3232 +3289 @@
 msgstr "parameter {0} není v rozsahu 0..{1}, zadáno {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:250
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
 msgid "Area style way is not closed."
 msgstr "Cesta se stylem plochy není uzavřená."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:487
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "Cesta v multipolygonu ''{0}'' není uzavřena."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Odstraněn prvek ''{0}'' z relace."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:866
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Cesta ''{0}'' s méně, než dvěmi body."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
 msgid "More than one \"from\" way found."
 msgstr "Nalezena více než jedna \"from\" cesta."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
 msgid "More than one \"to\" way found."
 msgstr "Nalezeno více cílových \"to\" cest."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:632
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
 msgid "More than one \"via\" found."
 msgstr "Nalezen více než jeden \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Neznámá role ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Neznámý typ prvku pro ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:646
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
 msgid "No \"from\" way found."
 msgstr "Nenazezena příchozí cesta \"from\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
 msgid "No \"to\" way found."
 msgstr "Nenalezena odchozí cesta \"to\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:654
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
 msgid "No \"via\" node or way found."
 msgstr "Nenalezen \"via\" uzel nebo cesta."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:663
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "Cesta \"from\" nezačíná, ani nekončí v uzlu \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:667
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Cesta \"to\" nezačíná nebo nekončí v uzlu \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:694
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Cesta \"from\" nezačíná nebo nekončí v uzlu \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:698
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Cesta \"to\" nezačíná nebo nekončí na cestě \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:821
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Styl pro omezení {0} nenalezen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:875
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Žádná použitelná role ''{0}'' pro cestu ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:887
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Ne-cesta ''{0}'' v multipolygonu."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:945
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Multipolygon ''{0}'' nemá žádnou vnější cestu."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1034
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Cesty ''{0}'' a ''{1}'' se protínají."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Vnitřní cesta ''{0}'' je venku."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1099
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Styl pro vnitřní cestu ''{0}'' odpovídá multipolygonu."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1125
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Styl pro vnější cestu ''{0}'' nesedí."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1421
 msgid "untagged"
 msgstr "nepopsaný"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1330
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1422
 msgid "text"
 msgstr "text"
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1423
+#, fuzzy
+msgid "areatext"
+msgstr "text"
+
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
 #, java-format
 msgid ""
@@ -3373 +3435 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3383 +3445 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3393 +3455 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3428 +3490 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -3443 +3506 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
-msgid "Lambert Zone (France)"
+#, fuzzy
+msgid "Lambert 4 Zones (France)"
+msgstr "Lambertova zóna (Francie)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166
+#, fuzzy
+msgid "Lambert CC9 Zone (France)"
 msgstr "Lambertova zóna (Francie)"
 
@@ -3460 +3529 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350
 msgid "UTM"
-msgstr ""
+msgstr "UTM"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391
-#, fuzzy
 msgid "UTM Zone"
-msgstr "UTM Zóna {0}"
+msgstr "Zóna UTM"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
@@ -3584 +3652 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:101
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:22
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
 msgid "Show help information"
-msgstr "Informace o pluginu"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65
@@ -3915 +3982 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
 msgid "User:"
-msgstr ""
+msgstr "Uživatel:"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
@@ -3957 +4024 @@
 msgstr "Inicializace"
 
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125
+msgid ""
+"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
+"relation</strong>.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129
+#, java-format
+msgid ""
+"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
+"relations</strong>.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131
+#, java-format
+msgid ""
+"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
+"relations</strong>.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
+#, fuzzy, java-format
+msgid "Deleting {0} object"
+msgid_plural "Deleting {0} objects"
+msgstr[0] "Smazat {0} objekt"
+msgstr[1] "Smazat {0} objekty"
+msgstr[2] "Smazat {0} objektů"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
+#, fuzzy
+msgid "Delete objects"
+msgstr "Smazat {0} objekt"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
+#, fuzzy
+msgid "To delete"
+msgstr "nesmazáno"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
+#, fuzzy
+msgid "From Relation"
+msgstr "Vztah"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33
+msgid "Pos."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
+msgid "Role"
+msgstr "Role"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327
+msgid "Click to close the dialog and remove the object from the relations"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340
+msgid "Click to close the dialog and to abort deleting the objects"
+msgstr ""
+
 #. *
 #. * compare my version of an {@see OsmPrimitive} with their version
@@ -3990 +4123 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4005 +4138 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4493 +4626 @@
 msgid "Undecide conflict between visible state"
 msgstr "Nerozhodnutý konflikt stavu viditelné"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
-msgid "Role"
-msgstr "Role"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
@@ -4642 +4767 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
 msgid "Apply"
 msgstr "Aplikovat"
@@ -4789 +4914 @@
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
 msgid "Role:"
 msgstr "Role:"
@@ -4809 +4934 @@
 msgid "Apply this role to all members"
 msgstr "Aplikovat tuto roli na všechny členy"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33
-msgid "Pos."
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
@@ -4846 +4967 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -4865 +4986 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
-#, fuzzy
 msgid "Resolve conflicts."
-msgstr "Vyřešit konflikty"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332
@@ -4975 +5095 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
 msgid "Hide elements"
-msgstr ""
+msgstr "Skrýt elementy"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
@@ -5087 +5207 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:110
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<různé>"
@@ -5174 +5294 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
 #: build/trans_presets.java:3145
 msgid "Relations"
 msgstr "Relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 msgid "Open a list of all relations."
 msgstr "Otevřít seznam všech relací"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relace: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
 msgid "Open an editor for the selected relation"
 msgstr "Otevřít editor pro zvolenou relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
 msgid "Delete the selected relation"
 msgstr "Smazat vybrané relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:363
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
 msgid "Create a new relation"
 msgstr "Vytvořit novou relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Vytvořit kopii relace a otevřít ji v novém okně"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
@@ -5234 +5354 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5338 +5458 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
 msgid "Download relation members"
 msgstr "Stáhnout členy relace"
@@ -5367 +5487 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
 msgid "Tags and Members"
 msgstr "Značky a Členové"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
 msgid "Parent Relations"
 msgstr "Rodičovské relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Child Relations"
 msgstr "Potomci relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5395 +5515 @@
 "provést s touto cyklickou závislostí?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
 msgid "Remove them, clean up relation"
 msgstr "Odstranit, vyčistit relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Ignore them, leave relation as is"
 msgstr "Ignorovat, ponechat relaci jak je"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
 #, java-format
 msgid ""
@@ -5414 +5534 @@
 "''{0}''<br><br>Opravdu chcete přidat dalšího člena relace?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
 msgid "Multiple members referring to same primitive"
 msgstr "Více členů odkazuje na stejný prvek"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
 #, java-format
 msgid ""
@@ -5429 +5549 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr "Přidat všechny vybrané prvky z aktuální datové sady před prvního člena"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -5440 +5560 @@
 "Přidat všechny vybrané prvky z aktuální datové sady za posledního člena"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5448 +5568 @@
 "člena"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5456 +5576 @@
 "člena"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
 msgid "Remove all members referring to one of the selected primitives"
 msgstr "Odstranit všechny členy odkazující na některý z vybraných prvků"
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:806
 msgid "Relation Editor: Remove Selected"
 msgstr "Editor relací: Odstranit vybrané"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr "Vybrat členy relace odkazující na prvky v aktuálním výběru"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
 #, java-format
 msgid ""
@@ -5478 +5598 @@
 msgstr "Vybrat členy relace odkazující na {0} prvků v aktuálním výběru"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
 msgid "Select primitives for selected relation members"
 msgstr "Vybrat prvky pro vybrané členy relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
 msgid "Sort the relation members"
 msgstr "Seřadit členy relace"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
 msgid "Move the currently selected members up"
 msgstr "Přesunout zvolené členy nahoru"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
 msgid "Move the currently selected members down"
 msgstr "Přesunout zvolené členy dolů"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
 msgid "Remove the currently selected members from this relation"
 msgstr "Odstranit vybrané členy z relace"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Relation Editor: Remove"
 msgstr "Editor relací: Odstranit"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
 msgid "Delete the currently edited relation"
 msgstr "Smazat editovanou relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
 msgid "Yes, create a conflict and close"
 msgstr "Ano, vytvořit konflikt a zavřít"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
+#, fuzzy
+msgid "Click to create a conflict and close this relation editor"
+msgstr "Ano, vytvořit konflikt a zavřít"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
 msgid "No, continue editing"
 msgstr "Ne, pokračovat v editaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgid ""
+"Click to to return to the relation editor and to resume relation editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5537 +5667 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
 msgid "Conflict in data"
 msgstr "Konflikt v datech"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
 #, java-format
 msgid ""
@@ -5548 +5678 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
 msgid "Apply the current updates"
 msgstr "Aplikovat aktuální změny"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
 msgid "Apply the updates and close the dialog"
 msgstr "Aplikovat změny a zavřít dialog"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 msgid "Cancel the updates and close the dialog"
 msgstr "Zrušit změny a zavřít dialog"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
 msgid "Add an empty tag"
 msgstr "Přidat prázdnou značku"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Stáhnout všechny nekompletní cesty a uzly v relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
 msgid "Download Members"
 msgstr "Stáhnout prvky"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Relation Editor: Download Members"
 msgstr "Editor relací: Stáhnout členy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
 msgid "Sets a role for the selected members"
 msgstr "Nastaví roli pro vybrané členy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
 msgid "Apply Role"
 msgstr "Aplikovat roli"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
 #, java-format
 msgid ""
@@ -5594 +5724 @@
 "role těchto prvků.<br>Opravdu chcete novou roli aplikovat?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Yes, apply it"
 msgstr "Ano, aplikovat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
 msgid "No, don't apply"
 msgstr "Ne, neaplikovat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
 msgid "Confirm empty role"
 msgstr "Potvrdit prázdnou roli"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "Upravit relaci na kterou odkazuje vybraný člen"
@@ -5691 +5821 @@
 msgid "Warning: ignoring exception because task was cancelled. Exception was: "
 msgstr "Varovaní: ignoruji výjimku protože úloha byla přerušena. Výjimka: "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
+#, fuzzy
+msgid "way is connected"
+msgstr "Nepřipojeno"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
+#, fuzzy
+msgid "way is connected to previous relation member"
+msgstr "Seřadit členy relace"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
+#, fuzzy
+msgid "way is connected to next relation member"
+msgstr "Seřadit členy relace"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+msgid "way is not connected to previous or next relation member"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
@@ -5887 +6036 @@
 msgstr "Čísla dlaždic"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:102
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:166
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
 msgid "JOSM Help Browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:195
-#, java-format
-msgid "Error while loading page {0}"
-msgstr "Chyba při načítání stránky {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:223
-#, java-format
-msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-msgstr "Chybí stránka nápovědy. Vytvořte ji v <A HREF=\"{0}\">češtině</A>."
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:226
-#, java-format
-msgid ""
-"Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF=\"{1}"
-"\">your language</A>."
-msgstr ""
-"Chybí stránka nápovědy. Vytvořte ji v <A HREF=\"{0}\">angličtině</A> anebo "
-"<A HREF=\"{1}\">ve vašem jazyce</A>."
+msgstr "JOSM prohlížeč nápovědy"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, java-format
+msgid ""
+"<html><p class=\"warning-header\">Help content for help topic missing</p><p "
+"class=\"warning-body\">Help content for the help topic <strong>{0}</strong> "
+"is not available yet. It is missing both in your local language ({1}) and in "
+"english.<br><br>Please help to improve the JOSM help system and fill in the "
+"missing information.You can both edit the <a href=\"{2}\">help topic in your "
+"local language ({1})</a> and the <a href=\"{3}\">help topic in english</a>.</"
+"p></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, java-format
+msgid ""
+"<html><p class=\"error-header\">Error when retrieving help information</p><p "
+"class=\"error-body\">The content for the help topic <strong>{0}</strong> "
+"could not be loaded. The error message is (untranslated):<br><tt>{1}</tt></"
+"p></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#, fuzzy, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+"<html>Nepodařilo se navázat komunikaci se serverem<br>''{0}''.<br>Prosím "
+"prověřte funkčnost internetového připojení.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr ""
 
 #. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:241
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
 msgid "Open the current help page in an external browser"
 msgstr ""
 
 #. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:253
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
 msgid "Edit the current help page"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:261
-msgid "Can only edit help pages from JOSM Online Help"
-msgstr "Nápovědu můžete upravovat pouze z online nápovědy JOSM"
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, java-format
+msgid ""
+"<html>The current URL <tt>{0}</tt><br>is an external URL. Editing is only "
+"possible for help topics<br>on the help server <tt>{1}</tt>.</html>"
+msgstr ""
 
 #. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:274
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
 msgid "Reload the current help page"
 msgstr ""
 
 #. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:289
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
 msgid "Go to the previous page"
 msgstr ""
 
 #. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:309
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
 msgid "Go to the next page"
 msgstr ""
 
 #. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:325
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
 msgid "Go to the JOSM help home page"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:70
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
 msgid "Failed to read command. Exiting help browser. Exception was:"
 msgstr ""
@@ -5967 +6146 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
 msgid "Coordinates"
-msgstr ""
+msgstr "Koordináty"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
@@ -6025 +6204 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Object id > 0 expected. Got {0}"
-msgstr "očekávána verze > 0. Nalezena {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
@@ -7282 +7461 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203
 msgid "Upload"
 msgstr "Nahrát na server"
@@ -7295 +7474 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:871
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:909
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
 msgid "Tags of new changeset"
 msgstr "Tagy nové sady změn"
@@ -7305 +7484 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:224
 msgid "Objects to add:"
 msgstr "Objekty k přidání:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:230
 msgid "Objects to modify:"
 msgstr "Objekty ke změnění:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:236
 msgid "Objects to delete:"
 msgstr "Objekty ke smazání:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:271
 #, java-format
 msgid "{0} object to add:"
@@ -7325 +7504 @@
 msgstr[2] "{0} objektů k přidání:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
 #, java-format
 msgid "{0} object to modifiy:"
@@ -7333 +7512 @@
 msgstr[2] "{0} upravených objektů:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
 #, java-format
 msgid "{0} object to delete:"
@@ -7341 +7520 @@
 msgstr[2] "{0} smazaných objektů:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
 msgid "Upload Changes"
 msgstr "Nahrát změny na server"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474
 msgid "Upload the changed primitives"
 msgstr "Nahrát změněné objekty"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:482
 msgid "Illegal upload comment"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507
 msgid "Cancel the upload and resume editing"
 msgstr "Zrušit nahrávání na server a pokračovat v editaci"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614
+msgid "Upload all changes in one request"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
-msgid "Upload all changes in one request"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:616
 msgid ""
 "Enable to upload all changes in one request, disable to use one request per "
@@ -7373 +7552 @@
 "prvku samostatně"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Napište stručný komentář ke změnám, které nahráváte na server:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:628
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627
 msgid "Enter an upload comment (min. 3 characters)"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685
+msgid "Open a new changeset"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686
-msgid "Open a new changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:687
 msgid "Open a new changeset and use it in the next upload"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693
+msgid "Use an open changeset"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694
-msgid "Use an open changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695
 msgid "Upload data to an already opened changeset"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734
+msgid "Close changeset after upload"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735
-msgid "Close changeset after upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:736
 msgid "Select to close the changeset after the next upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:927
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #, java-format
 msgid "Tags of changeset {0}"
@@ -7412 +7591 @@
 
 #. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:967
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:966
 msgid "Load the list of your open changesets from the server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:980
 msgid "Close the currently selected open changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1032
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
@@ -7450 +7629 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266
 msgid "Cancel uploading"
-msgstr ""
+msgstr "Ukončit nahrávání"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280
@@ -7672 +7851 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Length"
-msgstr ""
+msgstr "Délka"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
@@ -8634 +8813 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86
-#, fuzzy
 msgid "Projection code"
-msgstr "Metoda projekce"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89
-#, fuzzy
 msgid "Bounds"
-msgstr "Hranice"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:94
@@ -8771 +8948 @@
 msgstr "Přednastavení tagů"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:205
 msgid "Separator"
 msgstr "Oddělovač"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:351
 msgid "Toolbar"
 msgstr "Panel nástrojů"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:355
 msgid "Available"
 msgstr "Dostupné"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Toolbar customization"
 msgstr "Upravení panelu nástrojů"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:395
 msgid "Customize the elements on the toolbar."
 msgstr "Upravit prvky v panelu nástrojů."
@@ -8946 +9123 @@
 msgstr "Smazat vybrané prvky v seznamu tagů"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
 msgid "More information about this feature"
@@ -8952 +9129 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473
 msgid "Optional Attributes:"
 msgstr "Volitelné atributy:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:521
-#, java-format
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Použít přednastavení \"{0}\" ze skupiny \"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:522
-#, java-format
-msgid "Use preset ''{0}''"
-msgstr "Použít přednastavení \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 msgid "closedway"
 msgstr "uzavřená cesta"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Neznámý typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:649
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8984 +9151 @@
 msgstr "Nelze načíst zdroj přednastavených tagů: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:657
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Chyba parsování {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Objekty typu {0} nejsou podporovány."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -9003 +9170 @@
 msgstr[2] "Změnit {0} objektů"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Nic není zvoleno!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:733
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731
 msgid "Selection unsuitable!"
 msgstr "Vybrány nevhodné objekty!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:741
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 msgid "Apply Preset"
 msgstr "Aplikovat přednastavení"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:816
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814
 msgid "Change Properties"
 msgstr "Změnit vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
-#, java-format
-msgid "Preset group ''{0}'' of group ''{1}''"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, java-format
-msgid "Preset group ''{0}''"
+#, fuzzy, java-format
+msgid "Preset group {1} / {0}"
+msgstr "Skupina přednastavení ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
+#, fuzzy, java-format
+msgid "Preset group {0}"
 msgstr "Skupina přednastavení ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9717 +9883 @@
 msgstr "Připravuji data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:55
 #, java-format
 msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
+#, fuzzy
+msgid "Downloading from OSM Server..."
+msgstr "Stáhnout z OSM..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
 msgid "Downloading referring ways ..."
 msgstr "Stahování odkazovaných cest ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
 msgid "Downloading referring relations ..."
 msgstr "Stahování odkazovaných relací ..."
@@ -9893 +10064 @@
 msgstr "Nastala chyba v pluginu {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:77
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
 #, java-format
 msgid ""
@@ -9906 +10077 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr "Plugin {0} požaduje aktualizaci JOSM na verzi {1}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126
-#, java-format
-msgid ""
-"Plugin {0} version {1} found but for this version of JOSM is at least "
-"version {2} required. Please update the plugin."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:146
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
 msgstr "Plugin {0} je požadován pluginem {1}, ale nebyl nalezen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Následující plugin nenalezen:{0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
 #, java-format
 msgid "Last plugin update more than {0} days ago."
 msgstr "Pluginy byly  naposledy aktualizovány před {0} dny."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
 msgid ""
 "(You can change the number of days after which this warning appears<br>by "
@@ -9941 +10105 @@
 "'pluginmanager.warntime'.)"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "Nemohu nahrát plugin {0}. Odstranit z nastavení?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
 msgid "Disable plugin"
 msgstr "Zakázat plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
 msgid "Keep plugin"
 msgstr "Ponechat plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -9965 +10129 @@
 "jejich přepsání."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
 msgid "<html>"
 msgstr "<html>"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
 #, java-format
 msgid ""
@@ -9976 +10140 @@
 "Nastala neočekávaná výjimka, která by mohla pocházet z pluginu ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Dle informací z pluginu je autor {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -9987 +10151 @@
 "Zkuste aktualizovat na nejnovější verzi tohoto pluginu, než ohlásíte chybu."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
 msgid "Should the plugin be disabled?"
 msgstr "Chcete plugin zakázat ?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -9999 +10163 @@
 "programu."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr "Plugin nelze odstranit. Pravděpodobně je již neaktivní."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
 msgid "Plugin information"
 msgstr "Informace o pluginu"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
 msgid "no description available"
@@ -10203 +10367 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Closing of changeset <strong>{0}</strong> failed <br>because it has "
 "already been closed.</html>"
 msgstr ""
-"<html>Kliněte <strong>{0}</strong> pro dokončení slučování mých a cizích "
-"položek</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
@@ -10326 +10488 @@
 "Fatal: failed to locate image ''{0}''. This is a serious configuration "
 "problem. JOSM will stop working."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#, java-format
+msgid ""
+"Warning: failed to derive wiki language prefix from JOSM locale code "
+"''{0}''. Using default code ''en''."
 msgstr ""
 
@@ -11023 +11192 @@
 msgstr "Chyba v souboru {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -11034 +11203 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr "Vybrat Feuille"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11087 +11256 @@
 msgstr "Vyberte z..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
 msgid "Cadastre"
 msgstr "Katastr"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
 msgid "Auto sourcing"
 msgstr "Automatické zdrojování"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11102 +11271 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
 #, java-format
 msgid ""
@@ -11133 +11302 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:174
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:56
 msgid "Enable automatic caching."
 msgstr "Zapnout automatické cachování."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:53
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
 msgid "Max. cache size (in MB)"
 msgstr "Max. velikost cache (v MB)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:61
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -11155 +11324 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
 msgid "French cadastre WMS"
 msgstr "WMS francouzského katastru"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 "<html>Hodnota klíče \"source\" pokud je zapnuto automatické zdrojování</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
 msgid "Source"
 msgstr "Zdroj"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:210
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -11176 +11345 @@
 "Nahradit původní bílé pozadí barvou pozadí nastavenou v nastavení JOSM."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:90
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -11184 +11353 @@
 "texty na tmavém pozadí."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
 msgid "Allows multiple layers stacking"
 msgstr "Povolit skládání více vrstev"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 "Nastavení průhlednosti WMS vrstvy. Vpravo je neprůhledné, vlevo průhledné."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr "Zobrazovat rámeček kolem dat stažených z WMS serveru."
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:115
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:123
 msgid "Vector images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:130
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:138
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr "Stahovat menší obrázky (lepší kvalita, ale používá více paměti)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:138
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 msgid "Fixed size square (default is 100m)"
 msgstr "Fixní velikost čtverce (výchozí je 100m)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:158
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:166
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr "Fixní velikost (od 25 do 1000 metrů)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:175
 msgid "Raster images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:194
+#. the crosspiece display
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#, fuzzy
+msgid "Display crosspieces:"
+msgstr "Zobrazovat souřadnice jako"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
@@ -11235 +11410 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:21
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
 msgid "Downloading {0}"
@@ -11242 +11417 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:29
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:30
 msgid "Contacting WMS Server..."
 msgstr "Kontaktuji WMS server..."
@@ -11302 +11477 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:26
 msgid "Download Image from French Cadastre WMS"
 msgstr "Stáhnout obráze z Francouzkého katastrálního WMS"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:26
 #, java-format
 msgid "Cadastre: {0}"
 msgstr "Katastr: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:40
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:85
 msgid ""
@@ -11328 +11503 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:157
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:99
+msgid ""
+"This image contains georeference data.\n"
+"Do you want to use them ?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:169
 msgid ""
 "Click first corner for image cropping\n"
@@ -11336 +11517 @@
 "(jsou potřeba dva body)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:158
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:177
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
 msgid "Image cropping"
 msgstr "Ořezávání obrázků"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:176
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:188
 msgid "Click second corner for image cropping"
 msgstr "Klikněte na druhý roh pro oříznutí obrázku"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:208
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -11351 +11532 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:197
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
 msgid "Image georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:215
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:227
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:233
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:245
 msgid ""
 "Do you want to cancel completely\n"
@@ -11368 +11549 @@
 "nebo jen opakovat "
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:249
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:261
 msgid "Enter cadastre east,north position"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:250
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
 msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:252
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "East"
 msgstr "Východ"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:253
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "North"
 msgstr "Sever"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:278
 #, java-format
 msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
-msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
-msgstr "Nastavit Lambertovu zónu ručně (např. pro místo mezi dvěmi zónami)"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:32
+msgid "Set manually the Lambert zone"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:43
 msgid "Zone"
 msgstr "Zóna"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:54
 msgid "Lambert zone"
 msgstr "Lambertova zóna"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:19
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:22
 msgid "Load location from cache (only if cache is enabled)"
 msgstr "Načíst lokaci z cache (pouze pokud je cache povolena)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:39
+#, java-format
+msgid "{0} not allowed with the current projection"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
 msgid "Change location"
 msgstr "Změnit umístění"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
 msgid "Set a new location for the next request"
 msgstr "Nastavení nového místa pro další požadavek"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:38
-msgid "Open a layer first (GPX, OSM, cache)"
-msgstr "Nejdříve otevřete vrstvu (GPX, OSM, cache)"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr "Přidat novou vrstvu"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
 #: build/trans_presets.java:2343
 msgid "Location"
 msgstr "Umístění"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11434 +11616 @@
 "cadastre.gouv.fr .</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:70
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
 msgid "Add new layer"
 msgstr "Přidat novou vrstvu"
@@ -11447 +11629 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
-#, fuzzy
 msgid "PNG files (*.png)"
-msgstr "JPEG obrázky (*.jpg)"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
@@ -11464 +11645 @@
 msgstr[2] "Zjednodušení cesty (odstranění {0} uzlů)"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:33
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41
+msgid "Adjust WMS"
+msgstr "Upravit WMS"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
+#, fuzzy
+msgid "Adjust the position of the WMS layer (raster images only)"
+msgstr "Upravit pozici WMS vrstvy"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+msgid ""
+"This mode works only if active layer is\n"
+"a cadastre \"plan image\" (raster image)"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19
 #: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:15
@@ -11478 +11675 @@
 "Nejdříve vyberte jednu z nich a potom zopakujte"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
@@ -11484 +11681 @@
 msgstr "Prázdná vrstva"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS vrstva ({0}), nahráno {1} dlaždic"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
 msgid "Is not vectorized."
 msgstr "Není vektorizovaný."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Velikost rastru: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189
 msgid "Is vectorized."
 msgstr "Je vektorizovaný."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 #, java-format
 msgid ""
@@ -11516 +11713 @@
 "Vytvořte nový soubor."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
 msgid "Cache Format Error"
 msgstr "Chyba formátu cache"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -11526 +11723 @@
 "Lambertova zóne {0} v cache nekompatibilní se současnou Lambertovou zónou {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
 msgid "Cache Lambert Zone Error"
 msgstr "Chyba Lambertovy zóny v cache"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#, java-format
+msgid ""
+"Current layer is in Lambert CC9 Zone \"{0}\"\n"
+"where the commune is in Lambert CC9 Zone \"{1}\".\n"
+"Upload your changes, close all layers and change\n"
+"manually the Lambert zone from the Cadastre menu"
+msgstr ""
 
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
@@ -12333 +12539 @@
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:65
-#, fuzzy
 msgid "Please select 4 ways that form a closed relation."
-msgstr "Vyberte minimálně 4 uzly"
+msgstr ""
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:92
@@ -12355 +12560 @@
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
-#, fuzzy
 msgid "Create multipolygon"
-msgstr "Upravit multipolygon"
+msgstr ""
 
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#, fuzzy
 msgid "Create multipolygon."
-msgstr "Upravit multipolygon"
+msgstr ""
 
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
-#, fuzzy
 msgid "One of the selected ways is already part of another multipolygon."
-msgstr "Smazat cesty, které nejsou součástí vnižního multipolygonu."
+msgstr ""
 
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
-#, fuzzy
 msgid "Multipolygon must consist only of closed ways."
-msgstr "Výběr se musí skládat pouze z cest"
+msgstr ""
 
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
-#, fuzzy
 msgid "You must select at least two ways."
-msgstr "Musíte vybrat alespoň jednu cestu."
+msgstr ""
 
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
@@ -13313 +13513 @@
 msgstr "Zaměňte \"{0}\" za \"{1}\" pro"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
 msgid "Coastlines."
 msgstr "Linie pobřeží."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "This test checks that coastlines are correct."
 msgstr "Tento test kontroluje správnost linií pobřeží."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
+#, fuzzy
+msgid "Unconnected coastline"
+msgstr "Neuspořádané pobřeží"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
+#, fuzzy
+msgid "Reversed coastline"
+msgstr "Neuspořádané pobřeží"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
 msgid "Unordered coastline"
 msgstr "Neuspořádané pobřeží"
@@ -13390 +13600 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:35
-#, fuzzy
 msgid "Missing name:* translation."
-msgstr "Chybějící argument pro \"NOT\""
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:36
@@ -13410 +13619 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:57
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:62
 msgid "Nodes with same name"
 msgstr "Uzly se stejným jménem"
@@ -13688 +13897 @@
 "skutečně uzavřené."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
 #, java-format
 msgid "natural type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "landuse type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "amenities type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "sport type {0}"
 msgstr "sport typ {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "tourism type {0}"
 msgstr "turistické typ {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:95
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "shop type {0}"
 msgstr "obchod typ {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "leisure type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "waterway type {0}"
@@ -13817 +14026 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13831 +14040 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:107
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4194
 msgid "area"
 msgstr "oblast"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:122
 msgid "Unclosed way"
 msgstr "Neuzavřená cesta"
@@ -13948 +14157 @@
 #, java-format
 msgid "Walking Papers: {0}"
+msgstr ""
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
+msgid "Walking Papers"
 msgstr ""
 
@@ -14079 +14292 @@
 msgid "No valid WMS URL or id"
 msgstr "Neplatná URL WMS nebo id"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41
-msgid "Adjust WMS"
-msgstr "Upravit WMS"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
@@ -15269 +15478 @@
 msgstr "kov"
 
-#. color heath
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="natural" v="wood"/>
-#. <icon src="misc/landmark/trees.png"/>
 #: build/trans_presets.java:254 build/trans_presets.java:272
 #: build/trans_presets.java:291 build/trans_presets.java:306
@@ -15284 +15485 @@
 #: build/trans_presets.java:521 build/trans_presets.java:677
 #: build/trans_presets.java:1320 build/trans_presets.java:2469
-#: build/trans_style.java:3375
 msgid "wood"
 msgstr "Prales"
@@ -20927 +21127 @@
 
 #: build/trans_presets.java:2470
+#, fuzzy
+msgid "gray"
+msgstr "tráva"
+
+#: build/trans_presets.java:2470
 msgid "white"
 msgstr "bílá"
@@ -22779 +22984 @@
 #. <condition k="amenity" v="signpost"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
-#. color wood
+#. color woodarea
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25935 +26140 @@
 msgstr "vřesoviště"
 
+#. color heath
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wood"/>
+#. <icon src="misc/landmark/trees.png"/>
+#: build/trans_style.java:3375
+#, fuzzy
+msgid "woodarea"
+msgstr "oblast"
+
 #. color water
 #. <scale_min>1</scale_min>
@@ -26589 +26807 @@
 msgstr "Český UHUL:ORTOFOTO"
 
-#~ msgid "History of Element"
-#~ msgstr "Historie prvku"
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Povoleny pouze dva uzly"
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr "Vyberte jednu nebo více uzavřených cest s alespoň čtyřmi uzly."
-
-#~ msgid "Only one node selected"
-#~ msgstr "Vybrán pouze jeden uzel"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Spojení konfliktů"
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Chyba při načítání stránky {0}"
+
+#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr "Chybí stránka nápovědy. Vytvořte ji v <A HREF=\"{0}\">češtině</A>."
+
+#~ msgid ""
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Chybí stránka nápovědy. Vytvořte ji v <A HREF=\"{0}\">angličtině</A> "
+#~ "anebo <A HREF=\"{1}\">ve vašem jazyce</A>."
+
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "Nápovědu můžete upravovat pouze z online nápovědy JOSM"
+
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Použít přednastavení \"{0}\" ze skupiny \"{1}\""
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Použít přednastavení \"{0}\""
+
+#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
+#~ msgstr "Nastavit Lambertovu zónu ručně (např. pro místo mezi dvěmi zónami)"
+
+#~ msgid "Open a layer first (GPX, OSM, cache)"
+#~ msgstr "Nejdříve otevřete vrstvu (GPX, OSM, cache)"
+
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "No data imported."
+#~ msgstr "Nic nebylo importováno"
+
+#~ msgid "Data Layer"
+#~ msgstr "Vrstva dat"
+
+#~ msgid "JOSM Online Help"
+#~ msgstr "JOSM Online Nápověda"
 
 #~ msgid "Open in Browser"
 #~ msgstr "Otevřít v prohlížeči"
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "No data imported."
-#~ msgstr "Nic nebylo importováno"
-
-#~ msgid "Data Layer"
-#~ msgstr "Vrstva dat"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "JOSM Online Nápověda"
 
 #~ msgid "unnamed"
@@ -26711 +26942 @@
 #~ msgstr "Přerušuji..."
 
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "Upravit pozici WMS vrstvy"
-
 #~ msgid "YAHOO (WebKit)"
 #~ msgstr "YAHOO (WebKit)"
@@ -26734 +26962 @@
 #~ msgid "Click Reload to refresh list"
 #~ msgstr "Klikněte na obnovit pro aktualizaci seznamu"
+
+#~ msgid "Merging conflicts."
+#~ msgstr "Spojení konfliktů"
 
 #~ msgid ""
@@ -26784 +27015 @@
 #~ msgstr[1] "{0} pluginy úspěšně aktualizovány. Prosím, restartujte JOSM."
 #~ msgstr[2] "{0} pluginů úspěšně aktualizováno. Prosím, restartujte JOSM."
+
+#~ msgid "Only one node selected"
+#~ msgstr "Vybrán pouze jeden uzel"
 
 #~ msgid "Please select ways with almost right angles to orthogonalize."
@@ -26829 +27063 @@
 #~ "vývojáře JOSM."
 
+#~ msgid "Only two nodes allowed"
+#~ msgstr "Povoleny pouze dva uzly"
+
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Nelze otevřít adresář s nastavením: {0}"
@@ -26858 +27095 @@
 #~ msgid "Open the OpenStreetBugs window and activate the automatic download"
 #~ msgstr "Otevře okno OpenStreetBugs a aktivuje automatické stahování"
+
+#~ msgid "History of Element"
+#~ msgstr "Historie prvku"
+
+#~ msgid "Please select one or more closed ways of at least four nodes."
+#~ msgstr "Vyberte jednu nebo více uzavřených cest s alespoň čtyřmi uzly."
 
 #~ msgid "Layers: {0}"