Index: applications/editors/josm/i18n/po/ar.po
===================================================================
--- applications/editors/josm/i18n/po/ar.po	(revision 22209)
+++ applications/editors/josm/i18n/po/ar.po	(revision 22278)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
-"PO-Revision-Date: 2010-06-28 15:33+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
+"PO-Revision-Date: 2010-07-10 14:15+0000\n"
+"Last-Translator: metehyi <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:11+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -262,5 +262,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -486,9 +486,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37
 msgid "previous"
-msgstr ""
+msgstr "السابق"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38
 msgid "next"
-msgstr ""
+msgstr "التالي"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
@@ -647,9 +647,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1460,5 +1460,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2690,6 +2690,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2720,7 +2720,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "عبارة منتظمة"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -4248,5 +4247,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -4772,5 +4771,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -4782,5 +4781,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr ""
@@ -5365,5 +5364,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5462,9 +5461,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5477,46 +5476,46 @@
 msgstr "أضِف"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
 msgstr ""
@@ -5524,5 +5523,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5530,5 +5529,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5536,5 +5535,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5542,5 +5541,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5548,5 +5547,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5555,5 +5554,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5561,5 +5560,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5567,5 +5566,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5573,24 +5572,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -10134,10 +10133,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10146,5 +10145,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr ""
@@ -12688,5 +12687,5 @@
 msgstr "إختر رخصة معرفة سابقاً"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -12697,5 +12696,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -12705,5 +12704,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -12713,5 +12712,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -13366,9 +13365,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14159,11 +14158,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -14172,5 +14171,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -14851,7 +14850,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
-#, fuzzy
 msgid "on polygon"
-msgstr "متعدد الضلوع"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
@@ -14870,14 +14868,14 @@
 msgstr "مباني"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr ""
@@ -15042,5 +15040,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
@@ -22551,10 +22549,10 @@
 #: build/trans_presets.java:724
 msgid "Ford"
-msgstr ""
+msgstr "مخاضة"
 
 #. item "Waypoints/Ford"
 #: build/trans_presets.java:725
 msgid "Edit Ford"
-msgstr ""
+msgstr "حرر المخاضة"
 
 #. item "Waypoints/Ford" text "Name"
@@ -25661,7 +25659,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "american_football"
-msgstr "كرة القدم الأوسترالية"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -25692,7 +25689,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "canadian_football"
-msgstr "كرة القدم الأوسترالية"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -25738,7 +25734,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "gaelic_football"
-msgstr "كرة القدم الأوسترالية"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26273,35 +26268,29 @@
 
 #: build/trans_presets.java:2076
-#, fuzzy
 msgid "American Football"
-msgstr "حرّر كرة القدم"
+msgstr ""
 
 #. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-#, fuzzy
 msgid "Edit American Football"
-msgstr "حرّر كرة القدم"
+msgstr ""
 
 #: build/trans_presets.java:2082
-#, fuzzy
 msgid "Canadian Football"
-msgstr "حرّر كرة القدم"
+msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
 #: build/trans_presets.java:2083
-#, fuzzy
 msgid "Edit Canadian Football"
-msgstr "حرّر كرة القدم"
+msgstr ""
 
 #: build/trans_presets.java:2088
-#, fuzzy
 msgid "Gaelic Football"
-msgstr "حرّر كرة القدم"
+msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "حرّر كرة القدم"
+msgstr ""
 
 #: build/trans_presets.java:2094
@@ -26311,7 +26300,6 @@
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "حرّر كسّارة / مقلع حجارة"
+msgstr ""
 
 #: build/trans_presets.java:2100
@@ -26321,7 +26309,6 @@
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "حرّر قطر/منطقة"
+msgstr ""
 
 #: build/trans_presets.java:2106
@@ -29856,5 +29843,5 @@
 #: build/trans_style.java:875
 msgid "ford"
-msgstr ""
+msgstr "مخاضة"
 
 #. color ford
@@ -33067,90 +33054,90 @@
 msgstr ""
 
+#~ msgid "Unknown version"
+#~ msgstr "نسخة مجهولة"
+
+#~ msgid "Incorrect password or username."
+#~ msgstr "الإسم أو كلمة المرور خطأ"
+
+#~ msgid "Enter Password"
+#~ msgstr "أدخل كلمة المرور"
+
+#~ msgid "Do not show again"
+#~ msgstr "لا تظهر مرة اخرى"
+
+#~ msgid "Unknown role ''{0}''."
+#~ msgstr "دور غير معروف ''{0}''."
+
+#~ msgid "Error: {0}"
+#~ msgstr "خطأ : {0}"
+
+#~ msgid "Warning: {0}"
+#~ msgstr "تحذير: {0}"
+
+#~ msgid "false"
+#~ msgstr "خاطئ"
+
+#~ msgid "true"
+#~ msgstr "حقيقي"
+
+#~ msgid "different"
+#~ msgstr "مختلف"
+
+#~ msgid "Rotate"
+#~ msgstr "أدر"
+
+#~ msgid "Move"
+#~ msgstr "حرك"
+
+#~ msgid "unnamed"
+#~ msgstr "غيرمسمى"
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "دمج العقد رغم عضويتها المختلفة ؟"
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "لم تفتح أي مستند لذالك لم يتم تحميل أي شيء."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "إمتداد ملف غير معروف."
+
+#~ msgid "Email"
+#~ msgstr "البريد الإلكتروني"
+
+#~ msgid "Contact {0}..."
+#~ msgstr "إتصل بــ {0}..."
+
+#~ msgid "Only two nodes allowed"
+#~ msgstr "مسموح فقط عقدتين"
+
+#~ msgid "No data imported."
+#~ msgstr "لم يتم تحميل أي معطيات"
+
+#~ msgid "Data Layer"
+#~ msgstr "طبقة المعطيات"
+
+#~ msgid "Open in Browser"
+#~ msgstr "إفتح في المتصفح"
+
+#~ msgid "File not found"
+#~ msgstr "لم يُعثر على الملف"
+
+#~ msgid "to"
+#~ msgstr "إلى"
+
+#~ msgid "Download Area"
+#~ msgstr "نزّل المساحة"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "الرجاء إدخال مصطلحات البحث"
+
+#~ msgid "zoom"
+#~ msgstr "تكبير/تصغير"
+
+#~ msgid "name"
+#~ msgstr "الإسم"
+
 #~ msgid "Football"
 #~ msgstr "كرة القدم"
-
-#~ msgid "Unknown version"
-#~ msgstr "نسخة مجهولة"
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "الإسم أو كلمة المرور خطأ"
-
-#~ msgid "Enter Password"
-#~ msgstr "أدخل كلمة المرور"
-
-#~ msgid "Do not show again"
-#~ msgstr "لا تظهر مرة اخرى"
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "دور غير معروف ''{0}''."
-
-#~ msgid "Error: {0}"
-#~ msgstr "خطأ : {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "تحذير: {0}"
-
-#~ msgid "false"
-#~ msgstr "خاطئ"
-
-#~ msgid "true"
-#~ msgstr "حقيقي"
-
-#~ msgid "different"
-#~ msgstr "مختلف"
-
-#~ msgid "Rotate"
-#~ msgstr "أدر"
-
-#~ msgid "Move"
-#~ msgstr "حرك"
-
-#~ msgid "unnamed"
-#~ msgstr "غيرمسمى"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "دمج العقد رغم عضويتها المختلفة ؟"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "لم تفتح أي مستند لذالك لم يتم تحميل أي شيء."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "إمتداد ملف غير معروف."
-
-#~ msgid "Email"
-#~ msgstr "البريد الإلكتروني"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "إتصل بــ {0}..."
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "مسموح فقط عقدتين"
-
-#~ msgid "No data imported."
-#~ msgstr "لم يتم تحميل أي معطيات"
-
-#~ msgid "Data Layer"
-#~ msgstr "طبقة المعطيات"
-
-#~ msgid "Open in Browser"
-#~ msgstr "إفتح في المتصفح"
-
-#~ msgid "File not found"
-#~ msgstr "لم يُعثر على الملف"
-
-#~ msgid "to"
-#~ msgstr "إلى"
-
-#~ msgid "Download Area"
-#~ msgstr "نزّل المساحة"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "الرجاء إدخال مصطلحات البحث"
-
-#~ msgid "zoom"
-#~ msgstr "تكبير/تصغير"
-
-#~ msgid "name"
-#~ msgstr "الإسم"
 
 #~ msgid "citymap"
Index: applications/editors/josm/i18n/po/bg.po
===================================================================
--- applications/editors/josm/i18n/po/bg.po	(revision 22209)
+++ applications/editors/josm/i18n/po/bg.po	(revision 22278)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
-"PO-Revision-Date: 2010-06-23 22:51+0000\n"
-"Last-Translator: bastik <Unknown>\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
+"PO-Revision-Date: 2010-07-07 10:27+0000\n"
+"Last-Translator: pl71 <Unknown>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:12+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -267,5 +267,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -658,9 +658,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1479,5 +1479,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2749,6 +2749,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2779,7 +2779,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "регулярен израз"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -4329,5 +4328,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -4856,5 +4855,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -4866,5 +4865,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr "Надолу"
@@ -5446,5 +5445,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5543,9 +5542,9 @@
 msgstr "Разрешаване на конфликти за ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5558,53 +5557,52 @@
 msgstr "Добави"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr "Редактиране на филтъра"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr "изтриване на филтъра"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr "Преместване филтъра нагоре"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr "Преместване филтъра надолу"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr "Разрешаване на филтъра"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr "Скриване на елементи"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr "Обръщане на филтъра"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr "Режим на филтъра"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr "Грешка при зареждане на файла"
+msgstr ""
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5612,5 +5610,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5618,5 +5616,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5624,5 +5622,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5630,5 +5628,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5637,5 +5635,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5643,5 +5641,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5649,5 +5647,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5655,24 +5653,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr "С"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -10258,10 +10256,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10270,5 +10268,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr ""
@@ -12853,5 +12851,5 @@
 msgstr "Изберете лиценз от набора"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -12862,5 +12860,5 @@
 msgstr "Маркери от {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -12870,5 +12868,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -12878,5 +12876,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -13533,9 +13531,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr "Подготвяне на базата данни ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14336,11 +14334,11 @@
 msgstr "Не е намерен превод за локал {0}. Връщане към {1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -14349,5 +14347,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -15035,7 +15033,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
-#, fuzzy
 msgid "on polygon"
-msgstr "Мултиполигон"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
@@ -15054,15 +15051,14 @@
 msgstr "Сгради"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
-msgstr "Следващ"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr ""
@@ -15227,5 +15223,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
@@ -20148,5 +20144,5 @@
 #: build/specialmessages.java:15 build/trans_style.java:3261
 msgid "forest"
-msgstr "гора"
+msgstr "залесена площ"
 
 #. Landuse type used in multipolygons
@@ -21576,5 +21572,5 @@
 #: build/trans_presets.java:1254 build/trans_presets.java:2511
 msgid "wood"
-msgstr "гора"
+msgstr ""
 
 #: build/trans_presets.java:264 build/trans_presets.java:282
@@ -25974,7 +25970,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "american_football"
-msgstr "австралийски футбол"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26005,7 +26000,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "canadian_football"
-msgstr "австралийски футбол"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26051,7 +26045,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "gaelic_football"
-msgstr "австралийски футбол"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26097,7 +26090,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "rugby_union"
-msgstr "ръгби"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26587,35 +26579,29 @@
 
 #: build/trans_presets.java:2076
-#, fuzzy
 msgid "American Football"
-msgstr "Австралийски футбол"
+msgstr ""
 
 #. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-#, fuzzy
 msgid "Edit American Football"
-msgstr "Редактирай австралийски футбол"
+msgstr ""
 
 #: build/trans_presets.java:2082
-#, fuzzy
 msgid "Canadian Football"
-msgstr "Редактирай американски футбол"
+msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
 #: build/trans_presets.java:2083
-#, fuzzy
 msgid "Edit Canadian Football"
-msgstr "Редактирай австралийски футбол"
+msgstr ""
 
 #: build/trans_presets.java:2088
-#, fuzzy
 msgid "Gaelic Football"
-msgstr "Редактирай американски футбол"
+msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "Редактирай американски футбол"
+msgstr ""
 
 #: build/trans_presets.java:2094
@@ -26625,18 +26611,15 @@
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "Редактирай ръгби"
+msgstr ""
 
 #: build/trans_presets.java:2100
-#, fuzzy
 msgid "Rugby Union"
-msgstr "Ръгби"
+msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "Редактирай ръгби"
+msgstr ""
 
 #: build/trans_presets.java:2106
@@ -28688,5 +28671,5 @@
 #: build/trans_presets.java:3006
 msgid "Edit Wood"
-msgstr "Редактирай гората"
+msgstr "редактиране на \"гора\""
 
 #. item "Land use/Wood" combo "Type"
@@ -28713,5 +28696,5 @@
 #: build/trans_presets.java:3014
 msgid "Edit Forest Landuse"
-msgstr "Редактирай гора"
+msgstr "редактиране на \"залесена площ\""
 
 #: build/trans_presets.java:3020
@@ -33344,5 +33327,5 @@
 #: build/trans_wms.java:35
 msgid "7th Series (OS7)"
-msgstr ""
+msgstr "7th Series (OS7)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
@@ -33352,5 +33335,5 @@
 #: build/trans_wms.java:39
 msgid "MLIT Japan (ORTHO)"
-msgstr ""
+msgstr "MLIT Japan (ORTHO)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
@@ -33362,10 +33345,10 @@
 #: build/trans_wms.java:41
 msgid "MLIT Japan (ORTHO02)"
-msgstr ""
+msgstr "MLIT Japan (ORTHO02)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
 #: build/trans_wms.java:42
 msgid "MLIT Japan (ORTHO03)"
-msgstr ""
+msgstr "MLIT Japan (ORTHO03)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
@@ -33375,5 +33358,5 @@
 #: build/trans_wms.java:46
 msgid "Lodi - Italy"
-msgstr ""
+msgstr "Lodi - Italy"
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
@@ -33381,62 +33364,4 @@
 msgid "Sicily - Italy"
 msgstr "Сицилия - Италия"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "Връзката със сървъра пропадна"
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Да, възстанови от изтриване също"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "Не, отказване на операцията"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Възстановяване на изтрити допълнителни възли?"
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Възстановяване след изтриване на свързани примитиви?"
-
-#~ msgid "Visible State:"
-#~ msgstr "Видимо състояние:"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "видимо (на сървъра)"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "не е видимо (на сървъра)"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Запазване копие на местната версия"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Физическо изтриване от местната база данни"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Да, нулирай ID"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "Нулирай ID"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "Запазване на тяхното видимо състояние"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Да, изчисти го!"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSM ще трябва да премахне вашият местен примитив с ID {0}<br>от "
-#~ "базата данни.<br>Съгласни ли сте?</html>"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Премахни от базата данни"
-
-#~ msgid "football"
-#~ msgstr "футбол"
-
-#~ msgid "Football"
-#~ msgstr "Американски футбол"
 
 #~ msgid ""
@@ -33709,4 +33634,10 @@
 #~ msgid "Charge"
 #~ msgstr "Такса"
+
+#~ msgid "Football"
+#~ msgstr "Американски футбол"
+
+#~ msgid "football"
+#~ msgstr "футбол"
 
 #~ msgid "bicyclemap"
@@ -34527,6 +34458,18 @@
 #~ msgstr "Възстановяване от изтриване на релация..."
 
+#~ msgid "Yes, undelete them too"
+#~ msgstr "Да, възстанови от изтриване също"
+
+#~ msgid "No, cancel operation"
+#~ msgstr "Не, отказване на операцията"
+
+#~ msgid "Undelete additional nodes?"
+#~ msgstr "Възстановяване на изтрити допълнителни възли?"
+
 #~ msgid "Checking whether primitive {0} is gone ..."
 #~ msgstr "Проверка дали примитив {0} е заминал..."
+
+#~ msgid "Undelete dependent primitives?"
+#~ msgstr "Възстановяване след изтриване на свързани примитиви?"
 
 #~ msgid "The date in file \"{0}\" could not be parsed."
@@ -34634,4 +34577,41 @@
 #~ msgstr "параметърът '{0}' не трябва да е празен"
 
+#~ msgid "Communication with server failed"
+#~ msgstr "Връзката със сървъра пропадна"
+
+#~ msgid "not visible (on the server)"
+#~ msgstr "не е видимо (на сървъра)"
+
+#~ msgid "visible (on the server)"
+#~ msgstr "видимо (на сървъра)"
+
+#~ msgid "Visible State:"
+#~ msgstr "Видимо състояние:"
+
+#~ msgid "Physically delete from local dataset"
+#~ msgstr "Физическо изтриване от местната база данни"
+
+#~ msgid "Keep a clone of the local version"
+#~ msgstr "Запазване копие на местната версия"
+
+#~ msgid "Keep their visible state"
+#~ msgstr "Запазване на тяхното видимо състояние"
+
+#~ msgid "Reset id to 0"
+#~ msgstr "Нулирай ID"
+
+#~ msgid "Yes, purge it"
+#~ msgstr "Да, изчисти го!"
+
+#~ msgid ""
+#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
+#~ "the dataset.<br>Do you agree?</html>"
+#~ msgstr ""
+#~ "<html>JOSM ще трябва да премахне вашият местен примитив с ID {0}<br>от "
+#~ "базата данни.<br>Съгласни ли сте?</html>"
+
+#~ msgid "Remove from dataset"
+#~ msgstr "Премахни от базата данни"
+
 #~ msgid ">"
 #~ msgstr ">"
@@ -34670,4 +34650,7 @@
 #~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 #~ msgstr "Не е намерен примитив с id = {0} и версия = {1} в тази база данни"
+
+#~ msgid "Yes, reset the id"
+#~ msgstr "Да, нулирай ID"
 
 #~ msgid "Plugin {0} requires JOSM update to version {1}."
Index: applications/editors/josm/i18n/po/cs.po
===================================================================
--- applications/editors/josm/i18n/po/cs.po	(revision 22209)
+++ applications/editors/josm/i18n/po/cs.po	(revision 22278)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
-"PO-Revision-Date: 2010-06-28 15:41+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
+"PO-Revision-Date: 2010-07-10 08:18+0000\n"
+"Last-Translator: Jezevec <Unknown>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:06+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -268,5 +268,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -658,9 +658,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1483,5 +1483,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2769,6 +2769,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2799,7 +2799,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "Zadejte hledaný výraz"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -4357,5 +4356,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -4902,5 +4901,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -4912,5 +4911,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr "Dolu"
@@ -5513,5 +5512,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5612,9 +5611,9 @@
 msgstr "Vyřešit konflikty pro ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr "Filtruje objekty a schová/zneaktivní je."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5627,53 +5626,52 @@
 msgstr "Přidat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr "Přidat filtr."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr "Upravit filtr."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr "Smazat filtr."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr "Přesunout filtr nahoru."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr "Přesunout filtr dolu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr "Aktivovat filtr."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr "Skrýt elementy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr "Negovat filtr"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr "Mód filtrování"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr "Chyba při nahrávání souboru"
+msgstr ""
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5681,5 +5679,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5687,5 +5685,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5693,5 +5691,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5699,5 +5697,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5706,5 +5704,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5712,5 +5710,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5718,5 +5716,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5724,24 +5722,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filtrování je aktivní</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> objektů skryto"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> objektů deaktivováno"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -10416,10 +10414,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Smazat obrázek z disku"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10428,5 +10426,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr "Soubor s obrázkem nebylo možné smazat."
@@ -13036,5 +13034,5 @@
 msgstr "Zvolte předdefinovanou licenci"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -13045,5 +13043,5 @@
 msgstr "Značky z {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -13053,5 +13051,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -13061,5 +13059,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -13730,9 +13728,9 @@
 msgstr "Zpracovávám OSM data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr "Připravuji data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -13839,15 +13837,15 @@
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
-msgstr "{0}% ({1}/{2}), {3} zbývát. Nahrávám uzel ''{4}'' (id: {5})"
+msgstr "{0}% ({1}/{2}), {3} zbývá. Nahrávám uzel ''{4}'' (id: {5})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
-msgstr "{0}% ({1}/{2}), {3} zbývát. Nahrávám cestu ''{4}'' (id: {5})"
+msgstr "{0}% ({1}/{2}), {3} zbývá. Nahrávám cestu ''{4}'' (id: {5})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
-msgstr "{0}% ({1}/{2}), {3} zbývát. Nahrávám relaci ''{4}'' (id: {5})"
+msgstr "{0}% ({1}/{2}), {3} zbývá. Nahrávám relaci ''{4}'' (id: {5})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:122
@@ -14565,11 +14563,11 @@
 msgstr "Nelze najít překlad pro jazyk {0}. Vracím se k {1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -14578,5 +14576,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -15260,7 +15258,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
-#, fuzzy
 msgid "on polygon"
-msgstr "Multipolygon"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
@@ -15279,15 +15276,14 @@
 msgstr "Budovy"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
-msgstr "Další"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr "Ulice"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr ""
@@ -15460,5 +15456,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
@@ -17388,12 +17384,10 @@
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110
-#, fuzzy
 msgid "Create Stops from GTFS ..."
-msgstr "Vytvořit zastávky z GPX souboru"
+msgstr ""
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76
-#, fuzzy
 msgid "Create Stops from a GTFS file"
-msgstr "Vytvořit zastávky z GPX souboru"
+msgstr ""
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204
@@ -17404,7 +17398,6 @@
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85
-#, fuzzy
 msgid "GTFS-Stops"
-msgstr "Zastávky"
+msgstr ""
 
 #. item "Bicycle/Rental" text "Name"
@@ -26216,7 +26209,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "american_football"
-msgstr "australský fotbal"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26247,7 +26239,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "canadian_football"
-msgstr "australský fotbal"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26293,7 +26284,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "gaelic_football"
-msgstr "australský fotbal"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26339,7 +26329,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "rugby_union"
-msgstr "ragby"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26829,35 +26818,29 @@
 
 #: build/trans_presets.java:2076
-#, fuzzy
 msgid "American Football"
-msgstr "Australský fotbal"
+msgstr ""
 
 #. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-#, fuzzy
 msgid "Edit American Football"
-msgstr "Upravit australský fotbal"
+msgstr ""
 
 #: build/trans_presets.java:2082
-#, fuzzy
 msgid "Canadian Football"
-msgstr "Upravit fotbal"
+msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
 #: build/trans_presets.java:2083
-#, fuzzy
 msgid "Edit Canadian Football"
-msgstr "Upravit australský fotbal"
+msgstr ""
 
 #: build/trans_presets.java:2088
-#, fuzzy
 msgid "Gaelic Football"
-msgstr "Upravit fotbal"
+msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "Upravit fotbal"
+msgstr ""
 
 #: build/trans_presets.java:2094
@@ -26867,18 +26850,15 @@
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "Upravit ragby"
+msgstr ""
 
 #: build/trans_presets.java:2100
-#, fuzzy
 msgid "Rugby Union"
-msgstr "Ragby"
+msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "Upravit ragby"
+msgstr ""
 
 #: build/trans_presets.java:2106
@@ -33624,107 +33604,4 @@
 msgstr "Sicily - Itálie"
 
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr ""
-#~ "<html>Při komunikaci se serverem doslo k chybě<br>Detaily: {0}</html>"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "Komunikace se serverem selhala"
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Ano, obnovit je také"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "Ne, zruš operaci"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Obnovit další body?"
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Obnovit závislé prvky?"
-
-#~ msgid "Visible State:"
-#~ msgstr "Stav viditelné:"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "viditelný (na serveru)"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "neviditelný (na serveru)"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Ponechat klon lokální verze"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Fyzicky odstranit z lokální datové sady"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "Ponechat můj stav viditelné"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Ano, resetovat id"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "Resetovat id na 0"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "Ponechat cizí stav viditelné"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Ano, vyčistit to"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSM odstraní lokální prvek s id {0}<br>z datové sady."
-#~ "<br>Souhlasíte?</html>"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Odstranit z datové sady"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "Nerozhodnutý konflikt stavu viditelné"
-
-#~ msgid ""
-#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
-#~ "{0} object<br>from the local dataset because it is deleted on the server."
-#~ msgid_plural ""
-#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
-#~ "purging {0} objects<br> from the local dataset because they are deleted "
-#~ "on the server."
-#~ msgstr[0] ""
-#~ "{0} konflikt byl <strong>vyřešen automaticky</strong> odstraněním {0} "
-#~ "objektu<br>z lokální datové sady protože byl vymazán na serveru."
-#~ msgstr[1] ""
-#~ "{0} konflikty byly <strong>vyřešeny automaticky</strong> odstraněním {0} "
-#~ "objektů<br>z lokální datové sady protože byly vymazány na serveru."
-#~ msgstr[2] ""
-#~ "{0} konfliktů bylo <strong>vyřešeno automaticky</strong> odstraněním {0} "
-#~ "objektů<br>z lokální datové sady protože byly vymazány na serveru."
-
-#~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "{0} konflikt zbývá k řešení.<br><br>Prosím otevřete seznam konfliktů a "
-#~ "vyřešte jej manuálně."
-#~ msgstr[1] ""
-#~ "{0} konflikty zbývají k řešení.<br><br>Prosím otevřete seznam konfliktů a "
-#~ "vyřešte je manuálně."
-#~ msgstr[2] ""
-#~ "{0} konfliktů zbývá k řešení.<br><br>Prosím otevřete seznam konfliktů a "
-#~ "vyřešte je manuálně."
-
-#~ msgid "football"
-#~ msgstr "fotbal"
-
-#~ msgid "Football"
-#~ msgstr "Fotbal"
-
 #~ msgid "Email"
 #~ msgstr "E-mail"
@@ -34385,4 +34262,10 @@
 #~ msgid "Edit Station"
 #~ msgstr "Upravit stanici"
+
+#~ msgid "football"
+#~ msgstr "fotbal"
+
+#~ msgid "Football"
+#~ msgstr "Fotbal"
 
 #~ msgid "sports"
@@ -34683,4 +34566,7 @@
 #~ msgstr "Obrázek s umístěný v {0} neexistuje nebo není čitelný."
 
+#~ msgid "No, cancel operation"
+#~ msgstr "Ne, zruš operaci"
+
 #~ msgid "Selection too big"
 #~ msgstr "Výběr je příliš velký"
@@ -34754,4 +34640,34 @@
 #~ msgid "parameter '{0}' must not be null"
 #~ msgstr "parametr '{0}' nesmí být null (prázdný)"
+
+#~ msgid "Yes, undelete them too"
+#~ msgstr "Ano, obnovit je také"
+
+#~ msgid "Undelete additional nodes?"
+#~ msgstr "Obnovit další body?"
+
+#~ msgid "Communication with server failed"
+#~ msgstr "Komunikace se serverem selhala"
+
+#~ msgid ""
+#~ "<html>An error occurred while communicating with the server<br>Details: "
+#~ "{0}</html>"
+#~ msgstr ""
+#~ "<html>Při komunikaci se serverem doslo k chybě<br>Detaily: {0}</html>"
+
+#~ msgid "not visible (on the server)"
+#~ msgstr "neviditelný (na serveru)"
+
+#~ msgid "visible (on the server)"
+#~ msgstr "viditelný (na serveru)"
+
+#~ msgid "Physically delete from local dataset"
+#~ msgstr "Fyzicky odstranit z lokální datové sady"
+
+#~ msgid "Keep a clone of the local version"
+#~ msgstr "Ponechat klon lokální verze"
+
+#~ msgid "Remove from dataset"
+#~ msgstr "Odstranit z datové sady"
 
 #~ msgid "Apply partial resolutions"
@@ -34858,6 +34774,37 @@
 #~ "<br></html>"
 
+#~ msgid "Undelete dependent primitives?"
+#~ msgstr "Obnovit závislé prvky?"
+
+#~ msgid "Visible State:"
+#~ msgstr "Stav viditelné:"
+
+#~ msgid "Keep their visible state"
+#~ msgstr "Ponechat cizí stav viditelné"
+
+#~ msgid "Reset id to 0"
+#~ msgstr "Resetovat id na 0"
+
+#~ msgid "Yes, purge it"
+#~ msgstr "Ano, vyčistit to"
+
+#~ msgid "Keep my visible state"
+#~ msgstr "Ponechat můj stav viditelné"
+
+#~ msgid "Yes, reset the id"
+#~ msgstr "Ano, resetovat id"
+
 #~ msgid ">"
 #~ msgstr ">"
+
+#~ msgid ""
+#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
+#~ "the dataset.<br>Do you agree?</html>"
+#~ msgstr ""
+#~ "<html>JOSM odstraní lokální prvek s id {0}<br>z datové sady."
+#~ "<br>Souhlasíte?</html>"
+
+#~ msgid "Undecide conflict between visible state"
+#~ msgstr "Nerozhodnutý konflikt stavu viditelné"
 
 #~ msgid "Version number missing from OSM data"
@@ -35178,4 +35125,37 @@
 #~ "<b>Výběr:</b> Držet pravá tlačítko myši a nakreslit rámeček."
 
+#~ msgid ""
+#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
+#~ "{0} object<br>from the local dataset because it is deleted on the server."
+#~ msgid_plural ""
+#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
+#~ "purging {0} objects<br> from the local dataset because they are deleted "
+#~ "on the server."
+#~ msgstr[0] ""
+#~ "{0} konflikt byl <strong>vyřešen automaticky</strong> odstraněním {0} "
+#~ "objektu<br>z lokální datové sady protože byl vymazán na serveru."
+#~ msgstr[1] ""
+#~ "{0} konflikty byly <strong>vyřešeny automaticky</strong> odstraněním {0} "
+#~ "objektů<br>z lokální datové sady protože byly vymazány na serveru."
+#~ msgstr[2] ""
+#~ "{0} konfliktů bylo <strong>vyřešeno automaticky</strong> odstraněním {0} "
+#~ "objektů<br>z lokální datové sady protože byly vymazány na serveru."
+
+#~ msgid ""
+#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
+#~ "Dialog and manually resolve it."
+#~ msgid_plural ""
+#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
+#~ "Dialog and manually resolve them."
+#~ msgstr[0] ""
+#~ "{0} konflikt zbývá k řešení.<br><br>Prosím otevřete seznam konfliktů a "
+#~ "vyřešte jej manuálně."
+#~ msgstr[1] ""
+#~ "{0} konflikty zbývají k řešení.<br><br>Prosím otevřete seznam konfliktů a "
+#~ "vyřešte je manuálně."
+#~ msgstr[2] ""
+#~ "{0} konfliktů zbývá k řešení.<br><br>Prosím otevřete seznam konfliktů a "
+#~ "vyřešte je manuálně."
+
 #~ msgid "{0} Plugin successfully downloaded."
 #~ msgid_plural "{0} Plugins successfully downloaded."
Index: applications/editors/josm/i18n/po/da.po
===================================================================
--- applications/editors/josm/i18n/po/da.po	(revision 22209)
+++ applications/editors/josm/i18n/po/da.po	(revision 22278)
@@ -9,6 +9,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
-"PO-Revision-Date: 2010-06-28 16:18+0000\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
+"PO-Revision-Date: 2010-07-06 17:18+0000\n"
 "Last-Translator: Esben Damgaard <ebbe@skummer.com>\n"
 "Language-Team: Dansk <kde-i18n-doc@kde.org>\n"
@@ -17,5 +17,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:06+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -268,5 +268,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -660,9 +660,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1490,5 +1490,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2775,6 +2775,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2805,7 +2805,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "Angiv et søgeudtryk"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -4389,5 +4388,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -4944,5 +4943,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -4954,5 +4953,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr "Ned"
@@ -5567,5 +5566,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5668,9 +5667,9 @@
 msgstr "Løs konflikter for ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr "Filtrér objekter og skjul/slå dem fra."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5683,53 +5682,52 @@
 msgstr "Tilføj"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr "tilføj filter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr "Redigér filter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr "Slet filter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr "Flyt filter op."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr "Flyt filter ned."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr "Slå filter til"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr "Skjul elementer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr "Omvend filter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr "Filtertilstand"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr "Fejl ved indlæsning af fil"
+msgstr ""
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5737,5 +5735,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5743,5 +5741,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5749,5 +5747,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5755,5 +5753,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5762,5 +5760,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5768,5 +5766,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5774,5 +5772,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5780,24 +5778,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> objekter skjult"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -10527,10 +10525,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Slet billedfil fra disk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10541,5 +10539,5 @@
 "h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr "Billedfilen kunne ikke slettes"
@@ -13199,5 +13197,5 @@
 msgstr "Vælg en forudangivet licens"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -13208,5 +13206,5 @@
 msgstr "Markører fra {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -13218,5 +13216,5 @@
 "være tilgængelig."
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -13226,5 +13224,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -13908,9 +13906,9 @@
 msgstr "Fortolker OSM-data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr "Forbereder data sæt..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14735,11 +14733,11 @@
 "Kan ikke finde nogen oversættelse for sprogvalget {0}. Benytter i stedet {1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -14748,5 +14746,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -15439,7 +15437,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
-#, fuzzy
 msgid "on polygon"
-msgstr "Multipolygon"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
@@ -15458,15 +15455,14 @@
 msgstr "Bygninger"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
-msgstr "Næste"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr ""
@@ -15633,5 +15629,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
@@ -26375,7 +26371,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "american_football"
-msgstr "australsk fodbold"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26406,7 +26401,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "canadian_football"
-msgstr "australsk fodbold"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26452,7 +26446,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "gaelic_football"
-msgstr "australsk fodbold"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26498,7 +26491,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "rugby_union"
-msgstr "rugby"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26988,35 +26980,29 @@
 
 #: build/trans_presets.java:2076
-#, fuzzy
 msgid "American Football"
-msgstr "Australsk fodbold"
+msgstr ""
 
 #. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-#, fuzzy
 msgid "Edit American Football"
-msgstr "Ret australsk fodbold"
+msgstr ""
 
 #: build/trans_presets.java:2082
-#, fuzzy
 msgid "Canadian Football"
-msgstr "Ret amerikansk fodbold"
+msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
 #: build/trans_presets.java:2083
-#, fuzzy
 msgid "Edit Canadian Football"
-msgstr "Ret australsk fodbold"
+msgstr ""
 
 #: build/trans_presets.java:2088
-#, fuzzy
 msgid "Gaelic Football"
-msgstr "Ret amerikansk fodbold"
+msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "Ret amerikansk fodbold"
+msgstr ""
 
 #: build/trans_presets.java:2094
@@ -27026,18 +27012,15 @@
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "Ret rugby"
+msgstr ""
 
 #: build/trans_presets.java:2100
-#, fuzzy
 msgid "Rugby Union"
-msgstr "Rugby"
+msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "Ret rugby"
+msgstr ""
 
 #: build/trans_presets.java:2106
@@ -33783,102 +33766,4 @@
 msgstr "Sicilen - Italien"
 
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr ""
-#~ "<html>En fejl opstod under kommunikation med serveren<br>Detaljer: {0}</"
-#~ "html>"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "Kommunikation med server fejlede"
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Ja, gendan også dem"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "Nej, fortryd handlingen"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Gendan yderligere punkter?"
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Gendan afhængige primitiver?"
-
-#~ msgid "Visible State:"
-#~ msgstr "Synlig status:"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "synlig (på server)"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "ikke synlig (på server)"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Behold en klon af den lokale version."
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Slet fysisk fra lokal datasæt"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "Behold min slettede status"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Ja, nulstil ID"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "Nulstil ID til 0"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "Behold deres synlige status"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Ja, udrens det"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSM vil være nødt til at fjerne din lokale primitiv med ID {0}"
-#~ "<br>fra datasættet.<br>Indvilliger du?</html>"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Fjern fra datasæt"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "Omgør beslutning om konflikt mellem synlige status"
-
-#~ msgid ""
-#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
-#~ "{0} object<br>from the local dataset because it is deleted on the server."
-#~ msgid_plural ""
-#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
-#~ "purging {0} objects<br> from the local dataset because they are deleted "
-#~ "on the server."
-#~ msgstr[0] ""
-#~ "{0} konflikt er blevet <strong>løst automatisk</strong> ved udrensning af "
-#~ "{0} objekt<br>fra det lokale datasæt fordi det er slettet på serveren."
-#~ msgstr[1] ""
-#~ "{0} konflikter er blevet <strong>løst automatisk</strong> ved udrensning "
-#~ "af {0} objekter<br>fra det lokale datasæt fordi de er slettet på serveren."
-
-#~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "{0} konflikt mangler endnu at blive løst.<br><br>Åbn venligst "
-#~ "konfliktlistedialogen og løs den manuelt."
-#~ msgstr[1] ""
-#~ "{0} konflikter mangler endnu at blive løst.<br><br>Åbn venligst "
-#~ "konfliktlistedialogen og løs dem manuelt."
-
-#~ msgid "football"
-#~ msgstr "amerikansk fodbold"
-
-#~ msgid "Football"
-#~ msgstr "Amerikansk fodbold"
-
 #~ msgid "Move"
 #~ msgstr "Flyt"
@@ -34246,4 +34131,7 @@
 #~ msgid "NullPointerException, possibly some missing tags."
 #~ msgstr "NullPointerException, måske på grund af manglende tags."
+
+#~ msgid "Football"
+#~ msgstr "Amerikansk fodbold"
 
 #~ msgid "Edit Station"
@@ -34744,4 +34632,10 @@
 #~ "Upload ikke noget data efter denne besked."
 
+#~ msgid "Yes, undelete them too"
+#~ msgstr "Ja, gendan også dem"
+
+#~ msgid "No, cancel operation"
+#~ msgstr "Nej, fortryd handlingen"
+
 #~ msgid "Checking whether node {0} is gone ..."
 #~ msgstr "Tjekker om punktet {0} er væk ..."
@@ -34750,6 +34644,12 @@
 #~ msgstr "Gendanner relation..."
 
+#~ msgid "Undelete additional nodes?"
+#~ msgstr "Gendan yderligere punkter?"
+
 #~ msgid "Checking whether primitive {0} is gone ..."
 #~ msgstr "Tjekker om primitiven {0} er væk ..."
+
+#~ msgid "Undelete dependent primitives?"
+#~ msgstr "Gendan afhængige primitiver?"
 
 #~ msgid "Update Selection"
@@ -34979,4 +34879,25 @@
 #~ msgstr "Bekræftelse"
 
+#~ msgid "football"
+#~ msgstr "amerikansk fodbold"
+
+#~ msgid "Communication with server failed"
+#~ msgstr "Kommunikation med server fejlede"
+
+#~ msgid "not visible (on the server)"
+#~ msgstr "ikke synlig (på server)"
+
+#~ msgid "visible (on the server)"
+#~ msgstr "synlig (på server)"
+
+#~ msgid "Reset id to 0"
+#~ msgstr "Nulstil ID til 0"
+
+#~ msgid "Yes, reset the id"
+#~ msgstr "Ja, nulstil ID"
+
+#~ msgid "Remove from dataset"
+#~ msgstr "Fjern fra datasæt"
+
 #~ msgid "Parameter ''{0}'' must not be empty."
 #~ msgstr "Parameter ''{0}'' må ikke være tom."
@@ -35009,4 +34930,39 @@
 #~ msgid "Parameter current out of range. Got {0}."
 #~ msgstr "Parameter ude af intervalområde. Fik {0}."
+
+#~ msgid ""
+#~ "<html>An error occurred while communicating with the server<br>Details: "
+#~ "{0}</html>"
+#~ msgstr ""
+#~ "<html>En fejl opstod under kommunikation med serveren<br>Detaljer: {0}</"
+#~ "html>"
+
+#~ msgid "Visible State:"
+#~ msgstr "Synlig status:"
+
+#~ msgid "Physically delete from local dataset"
+#~ msgstr "Slet fysisk fra lokal datasæt"
+
+#~ msgid "Keep a clone of the local version"
+#~ msgstr "Behold en klon af den lokale version."
+
+#~ msgid "Keep their visible state"
+#~ msgstr "Behold deres synlige status"
+
+#~ msgid "Keep my visible state"
+#~ msgstr "Behold min slettede status"
+
+#~ msgid "Yes, purge it"
+#~ msgstr "Ja, udrens det"
+
+#~ msgid ""
+#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
+#~ "the dataset.<br>Do you agree?</html>"
+#~ msgstr ""
+#~ "<html>JOSM vil være nødt til at fjerne din lokale primitiv med ID {0}"
+#~ "<br>fra datasættet.<br>Indvilliger du?</html>"
+
+#~ msgid "Undecide conflict between visible state"
+#~ msgstr "Omgør beslutning om konflikt mellem synlige status"
 
 #~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
@@ -35163,4 +35119,18 @@
 
 #~ msgid ""
+#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
+#~ "{0} object<br>from the local dataset because it is deleted on the server."
+#~ msgid_plural ""
+#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
+#~ "purging {0} objects<br> from the local dataset because they are deleted "
+#~ "on the server."
+#~ msgstr[0] ""
+#~ "{0} konflikt er blevet <strong>løst automatisk</strong> ved udrensning af "
+#~ "{0} objekt<br>fra det lokale datasæt fordi det er slettet på serveren."
+#~ msgstr[1] ""
+#~ "{0} konflikter er blevet <strong>løst automatisk</strong> ved udrensning "
+#~ "af {0} objekter<br>fra det lokale datasæt fordi de er slettet på serveren."
+
+#~ msgid ""
 #~ "Warning: Failed to retrieve user infos for the current JOSM user. "
 #~ "Exceptions was: {0}"
@@ -35168,4 +35138,17 @@
 #~ "Advarsel: Kunne ikke hente brugerinfo for den nuværende JOSM bruger. "
 #~ "Undtagelse var: {0}"
+
+#~ msgid ""
+#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
+#~ "Dialog and manually resolve it."
+#~ msgid_plural ""
+#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
+#~ "Dialog and manually resolve them."
+#~ msgstr[0] ""
+#~ "{0} konflikt mangler endnu at blive løst.<br><br>Åbn venligst "
+#~ "konfliktlistedialogen og løs den manuelt."
+#~ msgstr[1] ""
+#~ "{0} konflikter mangler endnu at blive løst.<br><br>Åbn venligst "
+#~ "konfliktlistedialogen og løs dem manuelt."
 
 #~ msgid "Update Plugins"
Index: applications/editors/josm/i18n/po/de.po
===================================================================
--- applications/editors/josm/i18n/po/de.po	(revision 22209)
+++ applications/editors/josm/i18n/po/de.po	(revision 22278)
@@ -8,6 +8,6 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
-"PO-Revision-Date: 2010-06-30 13:28+0000\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
+"PO-Revision-Date: 2010-07-09 09:43+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: <de@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:08+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -268,5 +268,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -663,9 +663,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1503,5 +1503,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2825,6 +2825,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2853,9 +2853,11 @@
 " {0}"
 msgstr ""
+"Suchausdruck ist ungültig:\n"
+"\n"
+" {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "Suchbegriff eingeben"
+msgstr "Ungültiger Suchausdruck"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -4479,5 +4481,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -5044,5 +5046,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -5054,5 +5056,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr "Runter"
@@ -5674,5 +5676,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5780,9 +5782,9 @@
 msgstr "Konflikte lösen für ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr "Objekte filtern und verbergen/deaktivieren."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5795,53 +5797,52 @@
 msgstr "Hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr "Filter hinzufügen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr "Filter bearbeiten."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr "Filter löschen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr "Filter nach oben verschieben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr "Filter nach unten verschieben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr "Filter aktivieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr "Elemente verbergen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr "Filter invertieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr "Filtermodus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr "Filter: Versteckt:{0} Aus:{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr "Fehler beim Laden der Datei"
+msgstr "Fehler im Filter"
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5849,5 +5850,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5855,5 +5856,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5861,5 +5862,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5867,5 +5868,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5874,5 +5875,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5880,5 +5881,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5886,5 +5887,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5892,24 +5893,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filter aktiv</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> Objekte versteckt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> Objekte ausgeblendet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>Den Filterdialog schließen, um alle Objekte zu sehen<p></html>"
@@ -10761,10 +10762,10 @@
 msgstr[1] "{0} wurden als GPS-markiert erkannt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Bilddatei von der Platte löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10775,5 +10776,5 @@
 "</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr "Bilddatei konnte nicht gelöscht werden."
@@ -13609,5 +13610,5 @@
 msgstr "Eine vordefinierte Lizenz auswählen"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -13618,5 +13619,5 @@
 msgstr "Wegpunkte von {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -13628,5 +13629,5 @@
 "teilweise verwendet."
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -13636,5 +13637,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -14352,9 +14353,9 @@
 msgstr "OSM-Daten einlesen..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr "Datensatz wird vorbereitet ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -15285,5 +15286,5 @@
 "genutzt."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -15291,6 +15292,6 @@
 "Warnung: Fehler beim Bearbeiten der Zip-Datei ''{0}''. Fehlermeldung war: {1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -15301,5 +15302,5 @@
 "verweigert. Fehlermeldung: {1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -16100,7 +16101,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
-#, fuzzy
 msgid "on polygon"
-msgstr "Multipolygon"
+msgstr "Auf Polygon"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
@@ -16110,5 +16110,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96
 msgid "Helping tool for tag address"
-msgstr ""
+msgstr "Hilfsmittel für Adressenerfassung"
 
 #. group "Man-Made"
@@ -16119,15 +16119,14 @@
 msgstr "Gebäude"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
-msgstr "Nächstes"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+msgstr "Nächste Nummer"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr "Straße"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr "Adressen eingeben"
@@ -16309,6 +16308,8 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
-msgstr ""
+#, fuzzy
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
+msgstr ""
+"Keine Relationen für Adressen nutzen (sondern \"addr:street\" auf Knoten)."
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -16633,5 +16634,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342
 msgid "Enable this to use the tag \"add:street\" on nodes."
-msgstr ""
+msgstr "Aktivieren, um den Schlüssel \"addr:street\" auf Knoten zu nutzen."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81
@@ -18283,12 +18284,10 @@
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110
-#, fuzzy
 msgid "Create Stops from GTFS ..."
-msgstr "Erzeuge Haltepunkte aus GPX ..."
+msgstr "Haltestellen aus GTFS erstellen..."
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76
-#, fuzzy
 msgid "Create Stops from a GTFS file"
-msgstr "Erzeuge Haltepunkte aus einer GPX-Datei"
+msgstr "Haltestellen aus GTFS-Datei erstellen"
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204
@@ -18299,7 +18298,6 @@
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85
-#, fuzzy
 msgid "GTFS-Stops"
-msgstr "Zwischenhalte"
+msgstr "GTFS-Haltestelle"
 
 #. item "Bicycle/Rental" text "Name"
@@ -22043,4 +22041,8 @@
 "properties window. Available country presets: Germany."
 msgstr ""
+"Plugin zum Erfassen von Objekten basierend auf einer Auswahl mittels "
+"Straßenzeichen. Der Dialog kann durch Klicken auf ein kleines Bild in der "
+"oberen rechten Ecke des Eigenschaftsdialoges geöffnet werden. Verfügbare "
+"Vorlagen für Länder: Deutschland."
 
 #. Plugin routes
@@ -27267,7 +27269,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "american_football"
-msgstr "Australian Football"
+msgstr "American Football"
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -27298,7 +27299,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "canadian_football"
-msgstr "Australian Football"
+msgstr "Canadian Football"
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -27344,7 +27344,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "gaelic_football"
-msgstr "Australian Football"
+msgstr "Gaelic Football"
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -27386,11 +27385,10 @@
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "rugby_league"
-msgstr ""
+msgstr "Rugby League"
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "rugby_union"
-msgstr "Rugby"
+msgstr "Rugby Union"
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -27880,56 +27878,47 @@
 
 #: build/trans_presets.java:2076
-#, fuzzy
 msgid "American Football"
-msgstr "Australian Football"
+msgstr "American Football"
 
 #. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-#, fuzzy
 msgid "Edit American Football"
-msgstr "Australian Football-Platz bearbeiten"
+msgstr "American Football ändern"
 
 #: build/trans_presets.java:2082
-#, fuzzy
 msgid "Canadian Football"
-msgstr "American Football-Platz bearbeiten"
+msgstr "Canadian Football"
 
 #. item "Sport (Ball)/Canadian Football"
 #: build/trans_presets.java:2083
-#, fuzzy
 msgid "Edit Canadian Football"
-msgstr "Australian Football-Platz bearbeiten"
+msgstr "Canadian Football ändern"
 
 #: build/trans_presets.java:2088
-#, fuzzy
 msgid "Gaelic Football"
-msgstr "American Football-Platz bearbeiten"
+msgstr "Gaelic Football"
 
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "American Football-Platz bearbeiten"
+msgstr "Gaelic Football ändern"
 
 #: build/trans_presets.java:2094
 msgid "Rugby League"
-msgstr ""
+msgstr "Rugby League"
 
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "Rugbyplatz bearbeiten"
+msgstr "Rugby League ändern"
 
 #: build/trans_presets.java:2100
-#, fuzzy
 msgid "Rugby Union"
-msgstr "Rugby"
+msgstr "Rugby Union"
 
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "Rugbyplatz bearbeiten"
+msgstr "Rugby Union ändern"
 
 #: build/trans_presets.java:2106
@@ -34675,4 +34664,94 @@
 msgstr "Sizilien - Italien"
 
+#~ msgid "Create non-audio markers when reading GPX."
+#~ msgstr "Nicht Audio-Marken beim Einlesen von GPX erzeugen."
+
+#~ msgid "football"
+#~ msgstr "American Football"
+
+#~ msgid "Football"
+#~ msgstr "American Football"
+
+#~ msgid "Style for outer way ''{0}'' mismatches."
+#~ msgstr "Zeichenstil für den äußeren Weg ''{0}'' stimmt nicht überein."
+
+#~ msgid "Error: {0}"
+#~ msgstr "Fehler: {0}"
+
+#~ msgid "Warning: {0}"
+#~ msgstr "Warnung: {0}"
+
+#~ msgid "Painting problem"
+#~ msgstr "Zeichenproblem"
+
+#~ msgid "Check for paint notes."
+#~ msgstr "Zeichennotizen prüfen."
+
+#~ msgid "Check if map painting found data errors."
+#~ msgstr "Prüfen, ob beim Kartenzeichnen Fehler aufgetreten sind."
+
+#~ msgid "Area style way is not closed."
+#~ msgstr "Flächenförmiger Weg ist nicht geschlossen."
+
+#~ msgid "More than one \"from\" way found."
+#~ msgstr "Mehr als ein Weg mit \"from\" gefunden."
+
+#~ msgid "More than one \"to\" way found."
+#~ msgstr "Mehr als ein Weg mit \"to\" gefunden."
+
+#~ msgid "Unknown role ''{0}''."
+#~ msgstr "Unbekannte Role \"{0}\"."
+
+#~ msgid "Unknown member type for ''{0}''."
+#~ msgstr "Unbekannter Elementtyp für \"{0}\"."
+
+#~ msgid "No \"from\" way found."
+#~ msgstr "Kein \"from\"-Weg gefunden."
+
+#~ msgid "No \"to\" way found."
+#~ msgstr "Kein \"to\"-Weg gefunden."
+
+#~ msgid "Style for restriction {0} not found."
+#~ msgstr "Kein Zeichenstil für Abbiegeregel {0} gefunden."
+
+#~ msgid "More than one \"via\" found."
+#~ msgstr "Mehr als ein Element mit \"via\" gefunden."
+
+#~ msgid "No \"via\" node or way found."
+#~ msgstr "Kein \"via\"-Knoten oder Weg gefunden."
+
+#~ msgid "Errors during Download"
+#~ msgstr "Fehler beim Herunterladen"
+
+#~ msgid "Yes, undelete them too"
+#~ msgstr "Ja, auch wiederherstellen"
+
+#~ msgid "Undelete additional nodes?"
+#~ msgstr "Zusätzliche Knoten wiederherstellen?"
+
+#~ msgid "Undelete dependent primitives?"
+#~ msgstr "Abhängige Objekte wiederherstellen?"
+
+#~ msgid "No, cancel operation"
+#~ msgstr "Nein, Operation abbrechen"
+
+#~ msgid "Communication with server failed"
+#~ msgstr "Fehler bei der Kommunikation mit dem Server"
+
+#~ msgid "Yes, reset the id"
+#~ msgstr "Ja, diese ID zurücksetzten"
+
+#~ msgid "Physically delete from local dataset"
+#~ msgstr "Aus dem lokalen Datensatz löschen"
+
+#~ msgid "Keep a clone of the local version"
+#~ msgstr "Exakte Kopie der lokalen Version behalten"
+
+#~ msgid "Reset id to 0"
+#~ msgstr "ID auf 0 zurücksetzen"
+
+#~ msgid "Remove from dataset"
+#~ msgstr "Aus dem Datensatz löschen"
+
 #~ msgid ""
 #~ "<html>An error occurred while communicating with the server<br>Details: "
@@ -34681,87 +34760,21 @@
 #~ "<html>Fehler bei der Kommunikation mit dem Server<br>Details: {0}</html>"
 
-#~ msgid "Communication with server failed"
-#~ msgstr "Fehler bei der Kommunikation mit dem Server"
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Ja, auch wiederherstellen"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "Nein, Operation abbrechen"
-
-#~ msgid ""
-#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
-#~ "server.<br><br>Do you want to undelete this node too?"
-#~ msgid_plural ""
-#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
-#~ "the server.<br><br>Do you want to undelete these nodes too?"
-#~ msgstr[0] ""
-#~ "<html>Es gibt {0} zusätzlichen Knoten vom Weg {1},<br>der auf dem Server "
-#~ "gelöscht ist.<br><br>Soll dieser Knoten auch wiederhergestellt werden?</"
-#~ "html>"
-#~ msgstr[1] ""
-#~ "<html>Es gibt {0} zusätzliche Knoten vom Weg {1},<br>die auf dem Server "
-#~ "gelöscht sind.<br><br>Sollen diese Knoten auch wiederhergestellt werden?</"
-#~ "html>"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Zusätzliche Knoten wiederherstellen?"
-
-#~ msgid ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgid_plural ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
-#~ msgstr[0] ""
-#~ "Es gibt {0} zusätzliches Objekt, das von Relation {1} referenziert "
-#~ "wird<br>und das auf dem Server gelöscht ist.<br><br>Soll dieses Objekt "
-#~ "auch wiederhergestellt werden?"
-#~ msgstr[1] ""
-#~ "Es gibt {0} zusätzliche Objekte, die von Relation {1} referenziert "
-#~ "werden<br>und die auf dem Server gelöscht sind.<br><br>Sollen diese "
-#~ "Objekte auch wiederhergestellt werden?"
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Abhängige Objekte wiederherstellen?"
+#~ msgid "Keep their visible state"
+#~ msgstr "Übernehme deren Löschstatus"
+
+#~ msgid "Keep my visible state"
+#~ msgstr "Übernehme meinen Löschstatus"
+
+#~ msgid "Undecide conflict between visible state"
+#~ msgstr "Löschstatus ist unterschiedlich."
 
 #~ msgid "Visible State:"
 #~ msgstr "Löschstatus:"
 
-#~ msgid "visible (on the server)"
-#~ msgstr "sichtbar (auf Server)"
+#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
+#~ msgstr "Syntaxfehler im Muster: Muster {0} in {1} ist ungültig!"
 
 #~ msgid "not visible (on the server)"
 #~ msgstr "nicht sichtbar (auf dem Server)"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Exakte Kopie der lokalen Version behalten"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Aus dem lokalen Datensatz löschen"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "Übernehme meinen Löschstatus"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Ja, diese ID zurücksetzten"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>Um Ihre lokale Version zu behalten, muss JOSM<br>die ID des Objekts "
-#~ "{0} auf 0 setzen.<br>Beim nächsten Hochladen wird der Server eine<br>neue "
-#~ "ID zuweisen.<br>Stimmen Sie zu?</html>"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "ID auf 0 zurücksetzen"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "Übernehme deren Löschstatus"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Ja, entfernen"
 
 #~ msgid ""
@@ -34772,9 +34785,6 @@
 #~ "damit einverstanden?</html>"
 
-#~ msgid "Remove from dataset"
-#~ msgstr "Aus dem Datensatz löschen"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "Löschstatus ist unterschiedlich."
+#~ msgid "Apply also for children"
+#~ msgstr "Auch auf Kinder anwenden"
 
 #~ msgid ""
@@ -34794,4 +34804,77 @@
 #~ "auf dem Server gelöscht wurden."
 
+#~ msgid "Style for inner way ''{0}'' equals multipolygon."
+#~ msgstr "Zeichenstil des inneren Weges ''{0}'' entspricht dem Multipolygon."
+
+#~ msgid "visible (on the server)"
+#~ msgstr "sichtbar (auf Server)"
+
+#~ msgid "Yes, purge it"
+#~ msgstr "Ja, entfernen"
+
+#~ msgid "Non-Way in multipolygon."
+#~ msgstr "Nicht-Weg im Multipolygon."
+
+#~ msgid "Multipolygon inner way is outside."
+#~ msgstr "Innenweg im Multipolygon ist außen."
+
+#~ msgid ""
+#~ "Target object with id {0} and version {1} is visible although source "
+#~ "object with lower version {2} is not visible. Cannot deal with this "
+#~ "inconsistency. Keeping target object. "
+#~ msgstr ""
+#~ "Zielobjekt mit der ID {0} und Version {1} ist sichtbar obwohl das "
+#~ "Quellobjekt mit der niedrigeren Version {2} nicht sichtbar ist. Diese "
+#~ "Inkonsistenz konnte nicht gelöst werden. Zielobjekt beibehalten. "
+
+#~ msgctxt "filter"
+#~ msgid "C"
+#~ msgstr "K"
+
+#~ msgid "The \"from\" way does not start or end at a \"via\" node."
+#~ msgstr "Der \"from\"-Weg beginnt oder endet nicht am \"via\"-Knoten."
+
+#~ msgid "The \"to\" way does not start or end at a \"via\" node."
+#~ msgstr "Der \"to\"-Weg beginnt oder endet nicht am \"via\"-Knoten."
+
+#~ msgid "The \"from\" way does not start or end at the \"via\" way."
+#~ msgstr "Der \"from\"-Weg beginnt oder endet nicht am \"via\"-Weg."
+
+#~ msgid "The \"to\" way does not start or end at the \"via\" way."
+#~ msgstr "Der \"to\"-Weg beginnt oder endet nicht am \"via\"-Weg."
+
+#~ msgid ""
+#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
+#~ "server.<br><br>Do you want to undelete this node too?"
+#~ msgid_plural ""
+#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
+#~ "the server.<br><br>Do you want to undelete these nodes too?"
+#~ msgstr[0] ""
+#~ "<html>Es gibt {0} zusätzlichen Knoten vom Weg {1},<br>der auf dem Server "
+#~ "gelöscht ist.<br><br>Soll dieser Knoten auch wiederhergestellt werden?</"
+#~ "html>"
+#~ msgstr[1] ""
+#~ "<html>Es gibt {0} zusätzliche Knoten vom Weg {1},<br>die auf dem Server "
+#~ "gelöscht sind.<br><br>Sollen diese Knoten auch wiederhergestellt werden?</"
+#~ "html>"
+
+#~ msgid ""
+#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
+#~ "deleted on the server.<br><br>Do you want to undelete this too?"
+#~ msgid_plural ""
+#~ "There are {0} additional primitives referred to by relation {1}<br>which "
+#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
+#~ msgstr[0] ""
+#~ "Es gibt {0} zusätzliches Objekt, das von Relation {1} referenziert "
+#~ "wird<br>und das auf dem Server gelöscht ist.<br><br>Soll dieses Objekt "
+#~ "auch wiederhergestellt werden?"
+#~ msgstr[1] ""
+#~ "Es gibt {0} zusätzliche Objekte, die von Relation {1} referenziert "
+#~ "werden<br>und die auf dem Server gelöscht sind.<br><br>Sollen diese "
+#~ "Objekte auch wiederhergestellt werden?"
+
+#~ msgid "Point on angle of building to start drawing"
+#~ msgstr "Auf Gebäudeecke zeigen, um zu beginnen"
+
 #~ msgid ""
 #~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
@@ -34807,109 +34890,12 @@
 #~ "Konflikt-Dialog und lösen Sie sie manuell."
 
-#~ msgid "Create house number and street name relation"
-#~ msgstr "Hausnummern- und Straßennamenrelation erzeugen"
-
-#~ msgid "football"
-#~ msgstr "American Football"
-
-#~ msgid "Football"
-#~ msgstr "American Football"
-
-#~ msgid "Create non-audio markers when reading GPX."
-#~ msgstr "Nicht Audio-Marken beim Einlesen von GPX erzeugen."
-
-#~ msgid "Style for outer way ''{0}'' mismatches."
-#~ msgstr "Zeichenstil für den äußeren Weg ''{0}'' stimmt nicht überein."
-
-#~ msgid "Error: {0}"
-#~ msgstr "Fehler: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Warnung: {0}"
-
-#~ msgid "Painting problem"
-#~ msgstr "Zeichenproblem"
-
-#~ msgid "Check for paint notes."
-#~ msgstr "Zeichennotizen prüfen."
-
-#~ msgid "Check if map painting found data errors."
-#~ msgstr "Prüfen, ob beim Kartenzeichnen Fehler aufgetreten sind."
-
-#~ msgid "Area style way is not closed."
-#~ msgstr "Flächenförmiger Weg ist nicht geschlossen."
-
-#~ msgid "More than one \"from\" way found."
-#~ msgstr "Mehr als ein Weg mit \"from\" gefunden."
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "Mehr als ein Weg mit \"to\" gefunden."
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Unbekannte Role \"{0}\"."
-
-#~ msgid "Unknown member type for ''{0}''."
-#~ msgstr "Unbekannter Elementtyp für \"{0}\"."
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "Kein \"from\"-Weg gefunden."
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "Kein \"to\"-Weg gefunden."
-
-#~ msgid "Style for restriction {0} not found."
-#~ msgstr "Kein Zeichenstil für Abbiegeregel {0} gefunden."
-
-#~ msgid "More than one \"via\" found."
-#~ msgstr "Mehr als ein Element mit \"via\" gefunden."
-
-#~ msgid "No \"via\" node or way found."
-#~ msgstr "Kein \"via\"-Knoten oder Weg gefunden."
-
-#~ msgid "Errors during Download"
-#~ msgstr "Fehler beim Herunterladen"
-
-#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-#~ msgstr "Syntaxfehler im Muster: Muster {0} in {1} ist ungültig!"
-
-#~ msgid "Apply also for children"
-#~ msgstr "Auch auf Kinder anwenden"
-
-#~ msgid "Style for inner way ''{0}'' equals multipolygon."
-#~ msgstr "Zeichenstil des inneren Weges ''{0}'' entspricht dem Multipolygon."
-
-#~ msgid "Non-Way in multipolygon."
-#~ msgstr "Nicht-Weg im Multipolygon."
-
-#~ msgid "Multipolygon inner way is outside."
-#~ msgstr "Innenweg im Multipolygon ist außen."
-
 #~ msgid ""
-#~ "Target object with id {0} and version {1} is visible although source "
-#~ "object with lower version {2} is not visible. Cannot deal with this "
-#~ "inconsistency. Keeping target object. "
+#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
+#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
+#~ "new id.<br>Do you agree?</html>"
 #~ msgstr ""
-#~ "Zielobjekt mit der ID {0} und Version {1} ist sichtbar obwohl das "
-#~ "Quellobjekt mit der niedrigeren Version {2} nicht sichtbar ist. Diese "
-#~ "Inkonsistenz konnte nicht gelöst werden. Zielobjekt beibehalten. "
-
-#~ msgctxt "filter"
-#~ msgid "C"
-#~ msgstr "K"
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" node."
-#~ msgstr "Der \"from\"-Weg beginnt oder endet nicht am \"via\"-Knoten."
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" node."
-#~ msgstr "Der \"to\"-Weg beginnt oder endet nicht am \"via\"-Knoten."
-
-#~ msgid "The \"from\" way does not start or end at the \"via\" way."
-#~ msgstr "Der \"from\"-Weg beginnt oder endet nicht am \"via\"-Weg."
-
-#~ msgid "The \"to\" way does not start or end at the \"via\" way."
-#~ msgstr "Der \"to\"-Weg beginnt oder endet nicht am \"via\"-Weg."
-
-#~ msgid "Point on angle of building to start drawing"
-#~ msgstr "Auf Gebäudeecke zeigen, um zu beginnen"
+#~ "<html>Um Ihre lokale Version zu behalten, muss JOSM<br>die ID des Objekts "
+#~ "{0} auf 0 setzen.<br>Beim nächsten Hochladen wird der Server eine<br>neue "
+#~ "ID zuweisen.<br>Stimmen Sie zu?</html>"
 
 #~ msgid ""
@@ -34921,2 +34907,5 @@
 #~ "Vor dem Zurücksetzen müssen diese Heruntergeladen werden. Wollen Sie "
 #~ "fortfahren?"
+
+#~ msgid "Create house number and street name relation"
+#~ msgstr "Hausnummern- und Straßennamenrelation erzeugen"
Index: applications/editors/josm/i18n/po/el.po
===================================================================
--- applications/editors/josm/i18n/po/el.po	(revision 22209)
+++ applications/editors/josm/i18n/po/el.po	(revision 22278)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
 "PO-Revision-Date: 2010-04-20 18:36+0000\n"
 "Last-Translator: bastik <Unknown>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:11+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -261,5 +261,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -650,9 +650,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1475,5 +1475,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2736,6 +2736,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2766,7 +2766,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "Άκυρη προβολή"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -4285,5 +4284,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -4811,5 +4810,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -4821,5 +4820,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr "Κάτω"
@@ -5401,5 +5400,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5500,9 +5499,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5515,53 +5514,52 @@
 msgstr "Προσθήκη"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr "Σφάλμα φόρτωσης αρχείου"
+msgstr ""
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5569,5 +5567,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5575,5 +5573,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5581,5 +5579,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5587,5 +5585,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5594,5 +5592,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5600,5 +5598,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5606,5 +5604,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5612,24 +5610,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -10180,10 +10178,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10192,5 +10190,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr ""
@@ -12743,5 +12741,5 @@
 msgstr "Επιλέξτε μια προκαθορισμένη άδεια"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -12752,5 +12750,5 @@
 msgstr "Σημάδια από {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -12760,5 +12758,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -12768,5 +12766,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -13421,9 +13419,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14223,11 +14221,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -14236,5 +14234,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -14937,15 +14935,14 @@
 msgstr "Κτήρια"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
-msgstr "Επόμενο"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr ""
@@ -15110,5 +15107,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
@@ -25769,7 +25766,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "american_football"
-msgstr "ποδόσφαιρο"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -25800,7 +25796,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "canadian_football"
-msgstr "ποδόσφαιρο"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -25846,7 +25841,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "gaelic_football"
-msgstr "ποδόσφαιρο"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -25892,7 +25886,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "rugby_union"
-msgstr "rugby"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26382,35 +26375,29 @@
 
 #: build/trans_presets.java:2076
-#, fuzzy
 msgid "American Football"
-msgstr "Ποδόσφαιρο"
+msgstr ""
 
 #. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-#, fuzzy
 msgid "Edit American Football"
-msgstr "Επεξεργασία Τριτεύοντος Δρόμου"
+msgstr ""
 
 #: build/trans_presets.java:2082
-#, fuzzy
 msgid "Canadian Football"
-msgstr "Ποδόσφαιρο"
+msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
 #: build/trans_presets.java:2083
-#, fuzzy
 msgid "Edit Canadian Football"
-msgstr "Επεξεργασία Καναλιού"
+msgstr ""
 
 #: build/trans_presets.java:2088
-#, fuzzy
 msgid "Gaelic Football"
-msgstr "Ποδόσφαιρο"
+msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "Επεξεργασία Καλαθοσφαίρησης"
+msgstr ""
 
 #: build/trans_presets.java:2094
@@ -26420,18 +26407,15 @@
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "Επεξεργασία Rugby"
+msgstr ""
 
 #: build/trans_presets.java:2100
-#, fuzzy
 msgid "Rugby Union"
-msgstr "Rugby"
+msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "Επεξεργασία Rugby"
+msgstr ""
 
 #: build/trans_presets.java:2106
@@ -33177,16 +33161,4 @@
 msgstr ""
 
-#~ msgid "Communication with server failed"
-#~ msgstr "Η επικοινωνία με τον διακομιστή απέτυχε"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "Όχι, ακύρωση της λειτουργίας"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "ορατό (στον διακομιστή)"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "μη ορατό (στον διακομιστή)"
-
 #~ msgid "Do not show again"
 #~ msgstr "Να μην εμφανιστεί ξανά"
@@ -33881,4 +33853,16 @@
 #~ msgstr "σχέσεις"
 
+#~ msgid "No, cancel operation"
+#~ msgstr "Όχι, ακύρωση της λειτουργίας"
+
+#~ msgid "Communication with server failed"
+#~ msgstr "Η επικοινωνία με τον διακομιστή απέτυχε"
+
+#~ msgid "not visible (on the server)"
+#~ msgstr "μη ορατό (στον διακομιστή)"
+
+#~ msgid "visible (on the server)"
+#~ msgstr "ορατό (στον διακομιστή)"
+
 #~ msgid ">"
 #~ msgstr ">"
Index: applications/editors/josm/i18n/po/en_AU.po
===================================================================
--- applications/editors/josm/i18n/po/en_AU.po	(revision 22209)
+++ applications/editors/josm/i18n/po/en_AU.po	(revision 22278)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
 "PO-Revision-Date: 2010-06-15 17:47+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:08+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -267,5 +267,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -660,9 +660,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1494,5 +1494,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2780,6 +2780,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2810,7 +2810,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "Enter a search expression"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -4392,5 +4391,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -4947,5 +4946,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -4957,5 +4956,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr "Down"
@@ -5561,5 +5560,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5664,9 +5663,9 @@
 msgstr "Resolve conflicts for ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr "Filter objects and hide/disable them."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5679,53 +5678,52 @@
 msgstr "Add"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr "Add filter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr "Edit filter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr "Delete filter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr "Move filter up."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr "Move filter down."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr "Enable filter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr "Hide elements"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr "Inverse filter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr "Filter mode"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr "Error loading file"
+msgstr ""
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5733,5 +5731,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5739,5 +5737,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5745,5 +5743,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5751,5 +5749,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5758,5 +5756,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5764,5 +5762,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5770,5 +5768,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5776,24 +5774,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -10554,10 +10552,10 @@
 msgstr[1] "{0} were found to be GPS tagged."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Delete image file from disk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10568,5 +10566,5 @@
 "permanently lost!</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr "Image file could not be deleted."
@@ -13309,5 +13307,5 @@
 msgstr "Choose a predefined licence"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -13318,5 +13316,5 @@
 msgstr "Markers from {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -13328,5 +13326,5 @@
 "available"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -13336,5 +13334,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -14025,9 +14023,9 @@
 msgstr "Parsing OSM data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr "Preparing data set..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14930,11 +14928,11 @@
 msgstr "Unable to find translation for the locale {0}. Reverting to {1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -14945,5 +14943,5 @@
 "was: {1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -15647,7 +15645,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
-#, fuzzy
 msgid "on polygon"
-msgstr "Multipolygon"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
@@ -15666,15 +15663,14 @@
 msgstr "Buildings"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
-msgstr "Next"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr "Street"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr ""
@@ -15852,5 +15848,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
@@ -17809,7 +17805,6 @@
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85
-#, fuzzy
 msgid "GTFS-Stops"
-msgstr "Stops"
+msgstr ""
 
 #. item "Bicycle/Rental" text "Name"
@@ -26633,7 +26628,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "american_football"
-msgstr "australian_football"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26664,7 +26658,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "canadian_football"
-msgstr "australian_football"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26710,7 +26703,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "gaelic_football"
-msgstr "australian_football"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26756,7 +26748,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "rugby_union"
-msgstr "rugby"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -27246,35 +27237,29 @@
 
 #: build/trans_presets.java:2076
-#, fuzzy
 msgid "American Football"
-msgstr "Australian Football"
+msgstr ""
 
 #. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-#, fuzzy
 msgid "Edit American Football"
-msgstr "Edit Australian Football"
+msgstr ""
 
 #: build/trans_presets.java:2082
-#, fuzzy
 msgid "Canadian Football"
-msgstr "Edit American Football"
+msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
 #: build/trans_presets.java:2083
-#, fuzzy
 msgid "Edit Canadian Football"
-msgstr "Edit Australian Football"
+msgstr ""
 
 #: build/trans_presets.java:2088
-#, fuzzy
 msgid "Gaelic Football"
-msgstr "Edit American Football"
+msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "Edit American Football"
+msgstr ""
 
 #: build/trans_presets.java:2094
@@ -27284,18 +27269,15 @@
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "Edit Rugby"
+msgstr ""
 
 #: build/trans_presets.java:2100
-#, fuzzy
 msgid "Rugby Union"
-msgstr "Rugby"
+msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "Edit Rugby"
+msgstr ""
 
 #: build/trans_presets.java:2106
@@ -34042,4 +34024,96 @@
 
 #~ msgid ""
+#~ "<html>There are {0} primitives in your local dataset which<br>might be "
+#~ "deleted on the server. If you later try to delete or<br>update them the "
+#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
+#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
+#~ "<strong>{2}</strong> to ignore.<br></html>"
+#~ msgstr ""
+#~ "<html>There are {0} primitives in your local dataset which<br>might be "
+#~ "deleted on the server. If you later try to delete or<br>update them the "
+#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
+#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
+#~ "<strong>{2}</strong> to ignore.<br></html>"
+
+#~ msgid "Deleted or moved primitives"
+#~ msgstr "Deleted or moved primitives"
+
+#~ msgid "Errors during Download"
+#~ msgstr "Errors during Download"
+
+#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
+#~ msgstr "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
+
+#~ msgid ""
+#~ "Target object with id {0} and version {1} is visible although source "
+#~ "object with lower version {2} is not visible. Cannot deal with this "
+#~ "inconsistency. Keeping target object. "
+#~ msgstr ""
+#~ "Target object with id {0} and version {1} is visible although source "
+#~ "object with lower version {2} is not visible. Cannot deal with this "
+#~ "inconsistency. Keeping target object. "
+
+#~ msgctxt "filter"
+#~ msgid "C"
+#~ msgstr "C"
+
+#~ msgid "Area style way is not closed."
+#~ msgstr "Area style way is not closed."
+
+#~ msgid "More than one \"from\" way found."
+#~ msgstr "More than one \"from\" way found."
+
+#~ msgid "More than one \"to\" way found."
+#~ msgstr "More than one \"to\" way found."
+
+#~ msgid "More than one \"via\" found."
+#~ msgstr "More than one \"via\" found."
+
+#~ msgid "Unknown role ''{0}''."
+#~ msgstr "Unknown role ''{0}''."
+
+#~ msgid "Unknown member type for ''{0}''."
+#~ msgstr "Unknown member type for ''{0}''."
+
+#~ msgid "No \"from\" way found."
+#~ msgstr "No \"from\" way found."
+
+#~ msgid "No \"to\" way found."
+#~ msgstr "No \"to\" way found."
+
+#~ msgid "No \"via\" node or way found."
+#~ msgstr "No \"via\" node or way found."
+
+#~ msgid "The \"from\" way does not start or end at a \"via\" node."
+#~ msgstr "The \"from\" way does not start or end at a \"via\" node."
+
+#~ msgid "The \"to\" way does not start or end at a \"via\" node."
+#~ msgstr "The \"to\" way does not start or end at a \"via\" node."
+
+#~ msgid "The \"from\" way does not start or end at the \"via\" way."
+#~ msgstr "The \"from\" way does not start or end at the \"via\" way."
+
+#~ msgid "The \"to\" way does not start or end at the \"via\" way."
+#~ msgstr "The \"to\" way does not start or end at the \"via\" way."
+
+#~ msgid "Style for restriction {0} not found."
+#~ msgstr "Style for restriction {0} not found."
+
+#~ msgid "Style for inner way ''{0}'' equals multipolygon."
+#~ msgstr "Style for inner way ''{0}'' equals multipolygon."
+
+#~ msgid "Style for outer way ''{0}'' mismatches."
+#~ msgstr "Style for outer way ''{0}'' mismatches."
+
+#~ msgid "Error: {0}"
+#~ msgstr "Error: {0}"
+
+#~ msgid "Warning: {0}"
+#~ msgstr "Warning: {0}"
+
+#~ msgid "Gauss-Laborde Réunion 1947"
+#~ msgstr "Gauss-Laborde Réunion 1947"
+
+#~ msgid ""
 #~ "<html>An error occurred while communicating with the server<br>Details: "
 #~ "{0}</html>"
@@ -34131,4 +34205,13 @@
 #~ msgid "Undecide conflict between visible state"
 #~ msgstr "Undecide conflict between visible state"
+
+#~ msgid "Command Stack: {0}"
+#~ msgstr "Command Stack: {0}"
+
+#~ msgid "Apply also for children"
+#~ msgstr "Apply also for children"
+
+#~ msgid "Uploading {0} objects ..."
+#~ msgstr "Uploading {0} objects ..."
 
 #~ msgid ""
@@ -34160,111 +34243,4 @@
 #~ "Dialogue and manually resolve them."
 
-#~ msgid "football"
-#~ msgstr "football"
-
-#~ msgid "Football"
-#~ msgstr "American Football"
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "Deleted or moved primitives"
-
-#~ msgid "Errors during Download"
-#~ msgstr "Errors during Download"
-
-#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-#~ msgstr "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-
-#~ msgid ""
-#~ "Target object with id {0} and version {1} is visible although source "
-#~ "object with lower version {2} is not visible. Cannot deal with this "
-#~ "inconsistency. Keeping target object. "
-#~ msgstr ""
-#~ "Target object with id {0} and version {1} is visible although source "
-#~ "object with lower version {2} is not visible. Cannot deal with this "
-#~ "inconsistency. Keeping target object. "
-
-#~ msgctxt "filter"
-#~ msgid "C"
-#~ msgstr "C"
-
-#~ msgid "Area style way is not closed."
-#~ msgstr "Area style way is not closed."
-
-#~ msgid "More than one \"from\" way found."
-#~ msgstr "More than one \"from\" way found."
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "More than one \"to\" way found."
-
-#~ msgid "More than one \"via\" found."
-#~ msgstr "More than one \"via\" found."
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Unknown role ''{0}''."
-
-#~ msgid "Unknown member type for ''{0}''."
-#~ msgstr "Unknown member type for ''{0}''."
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "No \"from\" way found."
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "No \"to\" way found."
-
-#~ msgid "No \"via\" node or way found."
-#~ msgstr "No \"via\" node or way found."
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" node."
-#~ msgstr "The \"from\" way does not start or end at a \"via\" node."
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" node."
-#~ msgstr "The \"to\" way does not start or end at a \"via\" node."
-
-#~ msgid "The \"from\" way does not start or end at the \"via\" way."
-#~ msgstr "The \"from\" way does not start or end at the \"via\" way."
-
-#~ msgid "The \"to\" way does not start or end at the \"via\" way."
-#~ msgstr "The \"to\" way does not start or end at the \"via\" way."
-
-#~ msgid "Style for restriction {0} not found."
-#~ msgstr "Style for restriction {0} not found."
-
-#~ msgid "Style for inner way ''{0}'' equals multipolygon."
-#~ msgstr "Style for inner way ''{0}'' equals multipolygon."
-
-#~ msgid "Style for outer way ''{0}'' mismatches."
-#~ msgstr "Style for outer way ''{0}'' mismatches."
-
-#~ msgid "Error: {0}"
-#~ msgstr "Error: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Warning: {0}"
-
-#~ msgid "Gauss-Laborde Réunion 1947"
-#~ msgstr "Gauss-Laborde Réunion 1947"
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Command Stack: {0}"
-
-#~ msgid "Apply also for children"
-#~ msgstr "Apply also for children"
-
-#~ msgid "Uploading {0} objects ..."
-#~ msgstr "Uploading {0} objects ..."
-
 #~ msgid "GPS point"
 #~ msgstr "GPS point"
@@ -34295,2 +34271,8 @@
 #~ msgid "Bikes"
 #~ msgstr "Bikes"
+
+#~ msgid "football"
+#~ msgstr "football"
+
+#~ msgid "Football"
+#~ msgstr "American Football"
Index: applications/editors/josm/i18n/po/en_GB.po
===================================================================
--- applications/editors/josm/i18n/po/en_GB.po	(revision 22209)
+++ applications/editors/josm/i18n/po/en_GB.po	(revision 22278)
@@ -11,5 +11,5 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
 "PO-Revision-Date: 2010-05-16 13:46+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -19,5 +19,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:13+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -270,5 +270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -663,9 +663,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1497,5 +1497,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2783,6 +2783,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2813,7 +2813,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "Enter a search expression"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -4395,5 +4394,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -4950,5 +4949,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -4960,5 +4959,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr "Down"
@@ -5564,5 +5563,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5667,9 +5666,9 @@
 msgstr "Resolve conflicts for ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr "Filter objects and hide/disable them."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5682,53 +5681,52 @@
 msgstr "Add"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr "Add filter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr "Edit filter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr "Delete filter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr "Move filter up."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr "Move filter down."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr "Enable filter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr "Hide elements"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr "Inverse filter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr "Filter mode"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr "Error loading file"
+msgstr ""
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5736,5 +5734,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5742,5 +5740,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5748,5 +5746,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5754,5 +5752,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5761,5 +5759,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5767,5 +5765,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5773,5 +5771,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5779,24 +5777,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -10565,10 +10563,10 @@
 msgstr[1] "{0} were found to be GPS tagged."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Delete image file from disk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10579,5 +10577,5 @@
 "permanently lost!</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr "Image file could not be deleted."
@@ -13322,5 +13320,5 @@
 msgstr "Choose a predefined licence"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -13331,5 +13329,5 @@
 msgstr "Markers from {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -13341,5 +13339,5 @@
 "available"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -13349,5 +13347,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -14038,9 +14036,9 @@
 msgstr "Parsing OSM data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr "Preparing data set..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14951,11 +14949,11 @@
 msgstr "Unable to find translation for the locale {0}. Reverting to {1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -14966,5 +14964,5 @@
 "was: {1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -15668,7 +15666,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
-#, fuzzy
 msgid "on polygon"
-msgstr "Multipolygon"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
@@ -15687,15 +15684,14 @@
 msgstr "Buildings"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
-msgstr "Next"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr "Street"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr ""
@@ -15875,5 +15871,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
@@ -17818,12 +17814,10 @@
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110
-#, fuzzy
 msgid "Create Stops from GTFS ..."
-msgstr "Create Stops from GPX ..."
+msgstr ""
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76
-#, fuzzy
 msgid "Create Stops from a GTFS file"
-msgstr "Create Stops from a GPX file"
+msgstr ""
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204
@@ -17834,7 +17828,6 @@
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85
-#, fuzzy
 msgid "GTFS-Stops"
-msgstr "Stops"
+msgstr ""
 
 #. item "Bicycle/Rental" text "Name"
@@ -26680,7 +26673,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "american_football"
-msgstr "australian_football"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26711,7 +26703,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "canadian_football"
-msgstr "australian_football"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26757,7 +26748,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "gaelic_football"
-msgstr "australian_football"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26803,7 +26793,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "rugby_union"
-msgstr "rugby"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -27293,35 +27282,29 @@
 
 #: build/trans_presets.java:2076
-#, fuzzy
 msgid "American Football"
-msgstr "Australian Football"
+msgstr ""
 
 #. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-#, fuzzy
 msgid "Edit American Football"
-msgstr "Edit Australian Football"
+msgstr ""
 
 #: build/trans_presets.java:2082
-#, fuzzy
 msgid "Canadian Football"
-msgstr "Edit American Football"
+msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
 #: build/trans_presets.java:2083
-#, fuzzy
 msgid "Edit Canadian Football"
-msgstr "Edit Australian Football"
+msgstr ""
 
 #: build/trans_presets.java:2088
-#, fuzzy
 msgid "Gaelic Football"
-msgstr "Edit American Football"
+msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "Edit American Football"
+msgstr ""
 
 #: build/trans_presets.java:2094
@@ -27331,18 +27314,15 @@
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "Edit Rugby"
+msgstr ""
 
 #: build/trans_presets.java:2100
-#, fuzzy
 msgid "Rugby Union"
-msgstr "Rugby"
+msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "Edit Rugby"
+msgstr ""
 
 #: build/trans_presets.java:2106
@@ -34088,129 +34068,4 @@
 msgstr "Sicily - Italy"
 
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "Communication with server failed"
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Yes, undelete them too"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "No, cancel operation"
-
-#~ msgid ""
-#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
-#~ "server.<br><br>Do you want to undelete this node too?"
-#~ msgid_plural ""
-#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
-#~ "the server.<br><br>Do you want to undelete these nodes too?"
-#~ msgstr[0] ""
-#~ ">There is {0} additional node used by way {1}<br>which is deleted on the "
-#~ "server.<br><br>Do you want to undelete this node too?"
-#~ msgstr[1] ""
-#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
-#~ "the server.<br><br>Do you want to undelete these nodes too?"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Undelete additional nodes?"
-
-#~ msgid ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgid_plural ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
-#~ msgstr[0] ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgstr[1] ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete them too?"
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Undelete dependent primitives?"
-
-#~ msgid "Visible State:"
-#~ msgstr "Visible State:"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "visible (on the server)"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "not visible (on the server)"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Keep a clone of the local version"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Physically delete from local dataset"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "Keep my visible state"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Yes, reset the id"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "Reset id to 0"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "Keep their visible state"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Yes, purge it"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Remove from dataset"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "Undecide conflict between visible state"
-
-#~ msgid ""
-#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
-#~ "{0} object<br>from the local dataset because it is deleted on the server."
-#~ msgid_plural ""
-#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
-#~ "purging {0} objects<br> from the local dataset because they are deleted "
-#~ "on the server."
-#~ msgstr[0] ""
-#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
-#~ "{0} object<br>from the local dataset because it is deleted on the server."
-#~ msgstr[1] ""
-#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
-#~ "purging {0} objects<br> from the local dataset because they are deleted "
-#~ "on the server."
-
-#~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialogue and manually resolve it."
-#~ msgstr[1] ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialogue and manually resolve them."
-
-#~ msgid "football"
-#~ msgstr "football"
-
-#~ msgid "Football"
-#~ msgstr "American Football"
-
 #~ msgid "Move"
 #~ msgstr "Move"
@@ -34400,4 +34255,7 @@
 #~ msgstr "E-Mail"
 
+#~ msgid "Football"
+#~ msgstr "American Football"
+
 #~ msgid "Navigation"
 #~ msgstr "Navigation"
@@ -34821,4 +34679,7 @@
 #~ msgid "bicyclemap"
 #~ msgstr "bicyclemap"
+
+#~ msgid "football"
+#~ msgstr "football"
 
 #~ msgid "Charge"
@@ -35399,4 +35260,7 @@
 #~ "and start a new layer on the new zone."
 
+#~ msgid "Yes, undelete them too"
+#~ msgstr "Yes, undelete them too"
+
 #~ msgid "Checking whether node {0} is gone ..."
 #~ msgstr "Checking whether node {0} is gone ..."
@@ -35404,4 +35268,13 @@
 #~ msgid "Undeleting relation..."
 #~ msgstr "Undeleting relation..."
+
+#~ msgid "No, cancel operation"
+#~ msgstr "No, cancel operation"
+
+#~ msgid "Undelete additional nodes?"
+#~ msgstr "Undelete additional nodes?"
+
+#~ msgid "Undelete dependent primitives?"
+#~ msgstr "Undelete dependent primitives?"
 
 #~ msgid "Undeleting Way..."
@@ -35564,6 +35437,59 @@
 #~ "<strong>{2}</strong> to ignore.<br></html>"
 
+#~ msgid ""
+#~ "<html>An error occurred while communicating with the server<br>Details: "
+#~ "{0}</html>"
+#~ msgstr ""
+#~ "<html>An error occurred while communicating with the server<br>Details: "
+#~ "{0}</html>"
+
 #~ msgid "removing reference from way {0}"
 #~ msgstr "removing reference from way {0}"
+
+#~ msgid "Communication with server failed"
+#~ msgstr "Communication with server failed"
+
+#~ msgid "Keep my visible state"
+#~ msgstr "Keep my visible state"
+
+#~ msgid "Yes, reset the id"
+#~ msgstr "Yes, reset the id"
+
+#~ msgid "not visible (on the server)"
+#~ msgstr "not visible (on the server)"
+
+#~ msgid "visible (on the server)"
+#~ msgstr "visible (on the server)"
+
+#~ msgid "Visible State:"
+#~ msgstr "Visible State:"
+
+#~ msgid "Physically delete from local dataset"
+#~ msgstr "Physically delete from local dataset"
+
+#~ msgid "Keep a clone of the local version"
+#~ msgstr "Keep a clone of the local version"
+
+#~ msgid "Yes, purge it"
+#~ msgstr "Yes, purge it"
+
+#~ msgid "Reset id to 0"
+#~ msgstr "Reset id to 0"
+
+#~ msgid "Keep their visible state"
+#~ msgstr "Keep their visible state"
+
+#~ msgid ""
+#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
+#~ "the dataset.<br>Do you agree?</html>"
+#~ msgstr ""
+#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
+#~ "the dataset.<br>Do you agree?</html>"
+
+#~ msgid "Remove from dataset"
+#~ msgstr "Remove from dataset"
+
+#~ msgid "Undecide conflict between visible state"
+#~ msgstr "Undecide conflict between visible state"
 
 #~ msgid "Copy defaults"
@@ -35924,4 +35850,30 @@
 #~ msgid "The \"to\" way does not start or end at the \"via\" way."
 #~ msgstr "The \"to\" way does not start or end at the \"via\" way."
+
+#~ msgid ""
+#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
+#~ "server.<br><br>Do you want to undelete this node too?"
+#~ msgid_plural ""
+#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
+#~ "the server.<br><br>Do you want to undelete these nodes too?"
+#~ msgstr[0] ""
+#~ ">There is {0} additional node used by way {1}<br>which is deleted on the "
+#~ "server.<br><br>Do you want to undelete this node too?"
+#~ msgstr[1] ""
+#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
+#~ "the server.<br><br>Do you want to undelete these nodes too?"
+
+#~ msgid ""
+#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
+#~ "deleted on the server.<br><br>Do you want to undelete this too?"
+#~ msgid_plural ""
+#~ "There are {0} additional primitives referred to by relation {1}<br>which "
+#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
+#~ msgstr[0] ""
+#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
+#~ "deleted on the server.<br><br>Do you want to undelete this too?"
+#~ msgstr[1] ""
+#~ "There are {0} additional primitives referred to by relation {1}<br>which "
+#~ "are deleted on the server.<br><br>Do you want to undelete them too?"
 
 #~ msgid "Enter a changset id"
@@ -35997,4 +35949,19 @@
 #~ msgstr "Uploading {0} objects ..."
 
+#~ msgid ""
+#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
+#~ "{0} object<br>from the local dataset because it is deleted on the server."
+#~ msgid_plural ""
+#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
+#~ "purging {0} objects<br> from the local dataset because they are deleted "
+#~ "on the server."
+#~ msgstr[0] ""
+#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
+#~ "{0} object<br>from the local dataset because it is deleted on the server."
+#~ msgstr[1] ""
+#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
+#~ "purging {0} objects<br> from the local dataset because they are deleted "
+#~ "on the server."
+
 #~ msgid "GPS point"
 #~ msgstr "GPS point"
@@ -36041,4 +36008,17 @@
 
 #~ msgid ""
+#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
+#~ "Dialog and manually resolve it."
+#~ msgid_plural ""
+#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
+#~ "Dialog and manually resolve them."
+#~ msgstr[0] ""
+#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
+#~ "Dialogue and manually resolve it."
+#~ msgstr[1] ""
+#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
+#~ "Dialogue and manually resolve them."
+
+#~ msgid ""
 #~ "Automaticly select first WMS layer when grabing if multiple layers exist."
 #~ msgstr ""
Index: applications/editors/josm/i18n/po/es.po
===================================================================
--- applications/editors/josm/i18n/po/es.po	(revision 22209)
+++ applications/editors/josm/i18n/po/es.po	(revision 22278)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
-"PO-Revision-Date: 2010-07-02 23:41+0000\n"
-"Last-Translator: mariomx08 <Unknown>\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
+"PO-Revision-Date: 2010-07-11 09:44+0000\n"
+"Last-Translator: Emilio Gomez Fernandez <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:07+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -270,5 +270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -662,9 +662,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1517,5 +1517,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2278,5 +2278,11 @@
 "report a conflict."
 msgstr[0] ""
+"Hay {0} objeto en su conjunto de datos local que puede ser borrado en el "
+"servidor. Si posteriormente trata de borrar o actualizar este, es probable "
+"que el servidor informe de un conflicto."
 msgstr[1] ""
+"Hay {0} objetos en su conjunto de datos local que pueden ser borrados en el "
+"servidor. Si posteriormente trata de borrar o actualizar este, es probable "
+"que el servidor informe de un conflicto."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:169
@@ -2759,5 +2765,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>role:</b>... - object with given role in a relation"
-msgstr ""
+msgstr "<b>rol:</b>... - objecto con un rol dado en una relación"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
@@ -2825,6 +2831,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2855,7 +2861,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "Introducir una expresión de búsqueda"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -2927,4 +2932,8 @@
 "{1}"
 msgstr ""
+"La expresión regular \"{0}\" tuvo un error de análisis sintáctico, error "
+"completo:\n"
+"\n"
+"{1}"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
@@ -3281,4 +3290,6 @@
 "because you don't see the real object.<br>Do you really want to delete?"
 msgstr ""
+"Esta a punto de borrar objetos incompletos.<br>Esto causará problemas porque "
+"usted no ve el objeto real.<br>¿Desea realmente borrarlos?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:42
@@ -4458,5 +4469,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -5032,5 +5043,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -5042,5 +5053,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr "Bajar"
@@ -5129,4 +5140,6 @@
 "adjustment."
 msgstr ""
+"Ajustable {0} no registrado aún. No se puede configurar la participación en "
+"el ajuste sincronizado."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:957
@@ -5668,5 +5681,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5776,9 +5789,9 @@
 msgstr "Resolver los conflictos de ''{0}'"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr "Filtra objetos y los oculta/visualiza."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5791,53 +5804,52 @@
 msgstr "Añadir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr "Añadir filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr "Editar filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr "Borrar filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr "Subir filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr "Bajar filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr "Activar filtro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr "Ocultar elementos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr "Invertir filtro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr "Modo de filtro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr "Filtrar Ocultos:{0} Desactivados:{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr "Error al leer el archivo"
+msgstr "Error al filtrar"
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5845,5 +5857,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5851,5 +5863,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5857,5 +5869,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5863,5 +5875,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5870,5 +5882,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5876,5 +5888,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5882,5 +5894,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5888,24 +5900,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filtro activo</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> objetos ocultos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> objetos deshabilitados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -7402,4 +7414,6 @@
 "layer"
 msgstr ""
+"Seleccionar las primitivas en el contenido de este conjunto de cambios en la "
+"capa de datos actual"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:365
@@ -8057,4 +8071,6 @@
 "html>"
 msgstr ""
+"<html>Esta relación ya posee uno o más miembros referidos a<br>la primitiva "
+"''{0}''<br><br>¿Desea realmente añadir otro miembro relacionado?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612
@@ -8218,4 +8234,6 @@
 msgid "Click to return to the relation editor and to resume relation editing"
 msgstr ""
+"Haga clic para regresar al editor de relación y para continuar editando la "
+"relación"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
@@ -8225,4 +8243,7 @@
 "conflict and close the editor?</html>"
 msgstr ""
+"<html>Esta relación ha sido cambiada fuera del editor.<br>No puede aplicar "
+"los cambios y continuar editando.<br><br>¿Desea crear un conflicto y cerrar "
+"el editor?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
@@ -8322,5 +8343,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
 msgid "Zoom to the object the first selected member refers to"
-msgstr ""
+msgstr "Acerque al objeto el primer miembro seleccionado se refiere a"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:211
@@ -8340,5 +8361,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
 msgid "Download referring relations"
-msgstr ""
+msgstr "Descargar relaciones referenciadas"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:186
@@ -8526,5 +8547,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:99
 msgid "Select to download OSM data in the selected download area."
-msgstr ""
+msgstr "Seleccione descargar datos OSM en el área de descarga seleccionada."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:101
@@ -8545,4 +8566,6 @@
 "into the currently active data layer.</html>"
 msgstr ""
+"<html>Seleccione descargar datos en una nueva capa de datos.<br>Deseleccione "
+"descargar en la actual capa de datos activa.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219
@@ -9612,5 +9635,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
 msgid "Illegal chunk size"
-msgstr ""
+msgstr "Tamaño ilegal de fragmento"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
@@ -10626,10 +10649,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Borrar archivo de imagen del disco"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10638,5 +10661,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr "El archivo de imagen no se pudo borrar."
@@ -11005,5 +11028,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
 msgid "Authorize now"
-msgstr ""
+msgstr "Autorizar ahora"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:331
@@ -12898,5 +12921,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 msgid "Available roles"
-msgstr ""
+msgstr "Roles disponibles"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564
@@ -13250,5 +13273,5 @@
 msgstr "Elegir una licencia predefinida"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -13259,5 +13282,5 @@
 msgstr "Marcadores desde {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -13267,5 +13290,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -13275,5 +13298,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -13940,9 +13963,9 @@
 msgstr "Analizando los datos de OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr "Preparando conjunto de datos..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14781,11 +14804,11 @@
 "No se puede encontrar la traducción para el idioma {0}. Revertiendo a {1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -14794,5 +14817,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -15498,7 +15521,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
-#, fuzzy
 msgid "on polygon"
-msgstr "Multipolígono"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
@@ -15517,15 +15539,14 @@
 msgstr "Edificios"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
-msgstr "Siguiente"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr ""
@@ -15692,5 +15713,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
@@ -18395,4 +18416,6 @@
 "relation representing this turn restriction."
 msgstr ""
+"En la siguiente tabla puede editar <strong>manualmente las etiquetas</"
+"strong> de la relación OSM que representa esta restricción de giro."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AdvancedEditorPanel.java:62
@@ -18401,4 +18424,6 @@
 "OSM relation representing this turn restriction."
 msgstr ""
+"En la siguiente tabla puede editar <strong>manualmente los miembros</strong> "
+"de la relación OSM que representa esta restricción de giro."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
@@ -18611,5 +18636,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:147
 msgid "please select a way"
-msgstr ""
+msgstr "Por favor, seleccione una vía"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:158
@@ -18670,5 +18695,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRenderer.java:75
 msgid "please select a turn restriction type"
-msgstr ""
+msgstr "Por favor, seleccione un tipo de restricción de giro"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:59
@@ -18989,8 +19014,10 @@
 msgid "An OSM way with role <tt>from</tt> is required in a turn restriction."
 msgstr ""
+"Se requiere una vía OSM con el rol <tt>from</tt> en una restricción de giro."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:39
 msgid "An OSM way with role <tt>to</tt> is required in a turn restriction."
 msgstr ""
+"Se requiere una vía OSM con el rol <tt>to</tt> en una restricción de giro."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:42
@@ -19004,9 +19031,9 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:51
 msgid "Add an OSM way with role ''from''"
-msgstr ""
+msgstr "Añadir una vía OSM con el rol \"from\""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:54
 msgid "Add an OSM way with role ''to''"
-msgstr ""
+msgstr "Añadir una vía OSM con el rol \"to\""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:37
@@ -20350,5 +20377,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71
 msgid "Rectified Image..."
-msgstr "Rectificar la imagen..."
+msgstr "Imagen rectificada..."
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69
@@ -25627,5 +25654,5 @@
 #: build/trans_presets.java:1683
 msgid "Nightclub"
-msgstr "Club nocturno"
+msgstr "Discoteca"
 
 #. item "Food+Drinks/Nightclub"
@@ -25633,5 +25660,5 @@
 #: build/trans_presets.java:1685
 msgid "Edit Nightclub"
-msgstr "Editar club nocturno"
+msgstr "Editar discoteca"
 
 #: build/trans_presets.java:1691
@@ -26565,7 +26592,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "american_football"
-msgstr "fútbol australiano"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26596,7 +26622,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "canadian_football"
-msgstr "fútbol australiano"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26642,7 +26667,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "gaelic_football"
-msgstr "fútbol australiano"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26688,7 +26712,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "rugby_union"
-msgstr "rugby"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -27178,35 +27201,29 @@
 
 #: build/trans_presets.java:2076
-#, fuzzy
 msgid "American Football"
-msgstr "Fútbol australiano"
+msgstr ""
 
 #. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-#, fuzzy
 msgid "Edit American Football"
-msgstr "Editar fútbol australiano"
+msgstr ""
 
 #: build/trans_presets.java:2082
-#, fuzzy
 msgid "Canadian Football"
-msgstr "Editar fútbol americano"
+msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
 #: build/trans_presets.java:2083
-#, fuzzy
 msgid "Edit Canadian Football"
-msgstr "Editar fútbol australiano"
+msgstr ""
 
 #: build/trans_presets.java:2088
-#, fuzzy
 msgid "Gaelic Football"
-msgstr "Editar fútbol americano"
+msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "Editar fútbol americano"
+msgstr ""
 
 #: build/trans_presets.java:2094
@@ -27216,18 +27233,15 @@
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "Editar rugby"
+msgstr ""
 
 #: build/trans_presets.java:2100
-#, fuzzy
 msgid "Rugby Union"
-msgstr "Rugby"
+msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "Editar rugby"
+msgstr ""
 
 #: build/trans_presets.java:2106
@@ -33443,5 +33457,5 @@
 #: build/trans_style.java:3509
 msgid "woodarea"
-msgstr "área forestal"
+msgstr "plantación forestal"
 
 #. color water
@@ -33985,123 +33999,4 @@
 msgstr "Sicilia - Italia"
 
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr ""
-#~ "<html>Ocurrió un error mientras se comunicaba con el "
-#~ "servidor<br>Detalles: {0}</html>"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "Comunicación fallida con el servidor"
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Sí, deshacer el borrado de ellos también"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "No, calcelar la operación"
-
-#~ msgid ""
-#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
-#~ "server.<br><br>Do you want to undelete this node too?"
-#~ msgid_plural ""
-#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
-#~ "the server.<br><br>Do you want to undelete these nodes too?"
-#~ msgstr[0] ""
-#~ "Hay {0} nodo adicional usado pur la vía {1}<br>que ha sido eliminada en "
-#~ "el servidor.<br><br>¿Quiere que este nodo vuelva a existir?"
-#~ msgstr[1] ""
-#~ "Hay {0} nodos adicionales usados por la vía {1}<br>que ha sido eliminada "
-#~ "en el servidor.<br><br> ¿Quiere que estos nodos vuelvan a existir?"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "¿Deshacer el borrado de los nodos adicionales?"
-
-#~ msgid ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgid_plural ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
-#~ msgstr[0] ""
-#~ "Hay {0} primitiva adicional referida en la relación a {1}<br>la cual está "
-#~ "borrada en el servidor.<br><br>¿Desea recuperarla también?"
-#~ msgstr[1] ""
-#~ "Hay {0} primitivas adicionales referidas en la relación a {1}<br>las "
-#~ "cuales están borradas en el servidor.<br><br>¿Desea recuperarlas también?"
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "¿Deshacer borrado de primitivos dependientes?"
-
-#~ msgid "Visible State:"
-#~ msgstr "Estado visible:"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "visible (en el servidor)"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "no visible (en el servidor)"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Mantener un clon de la versión local"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Eliminar físicamente del conjunto de datos locales"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "Mantener mi estado visible"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Sí, reiniciar el id"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>Para mantener su versión local JOSM<br> tiene que restablecer la ID "
-#~ "de la primitiva {0} a 0.<br>En la próxima subida el servidor le "
-#~ "asignará<br>una ID nueva.<br>¿Está de acuerdo?</html>"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "Reiniciar el id a 0"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "Mantener su estado visible"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Sí, purgarlo"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSM borrará la primitiva local con id {0}<br>del dataset.<br>¿Está "
-#~ "de acuerdo?</html>"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Eliminar desde el conjunto de datos"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "Conflicto entre estado visibles sin decidir"
-
-#~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "{0} conflicto sigue sin resolverse. <br> <br> Por favor, abra el cuadro "
-#~ "de dialogo de Conflictos y resuélvalo manualmente."
-#~ msgstr[1] ""
-#~ "{0} conflicto2 siguen sin resolverse. <br> <br> Por favor, abra el cuadro "
-#~ "de dialogo de Conflictos y resuélvalos manualmente."
-
-#~ msgid "football"
-#~ msgstr "fútbol"
-
-#~ msgid "Football"
-#~ msgstr "Fútbol americano"
-
 #~ msgid "Move"
 #~ msgstr "Mover"
@@ -34300,6 +34195,12 @@
 #~ msgstr "Usar preferencia ''{0}''"
 
+#~ msgid "Football"
+#~ msgstr "Fútbol americano"
+
 #~ msgid "<p>Thank you for your understanding</p>"
 #~ msgstr "<p>Gracias por su comprensión</p>"
+
+#~ msgid "football"
+#~ msgstr "fútbol"
 
 #~ msgid ""
@@ -35188,4 +35089,10 @@
 #~ "Por favor, seleccione una o más vías cerradas de al menos cuatro nodos."
 
+#~ msgid "Yes, undelete them too"
+#~ msgstr "Sí, deshacer el borrado de ellos también"
+
+#~ msgid "No, cancel operation"
+#~ msgstr "No, calcelar la operación"
+
 #~ msgid "Undeleting Way..."
 #~ msgstr "Deshaciendo borrado de vía..."
@@ -35252,4 +35159,7 @@
 #~ msgid "Checking whether primitive {0} is gone ..."
 #~ msgstr "Comprobando si falta el primitivo {0}..."
+
+#~ msgid "Undelete dependent primitives?"
+#~ msgstr "¿Deshacer borrado de primitivos dependientes?"
 
 #~ msgid ""
@@ -35301,4 +35211,37 @@
 #~ msgstr "el parámetro '{0}' no debe ser nulo"
 
+#~ msgid "not visible (on the server)"
+#~ msgstr "no visible (en el servidor)"
+
+#~ msgid "visible (on the server)"
+#~ msgstr "visible (en el servidor)"
+
+#~ msgid "Visible State:"
+#~ msgstr "Estado visible:"
+
+#~ msgid "Communication with server failed"
+#~ msgstr "Comunicación fallida con el servidor"
+
+#~ msgid "Keep a clone of the local version"
+#~ msgstr "Mantener un clon de la versión local"
+
+#~ msgid "Reset id to 0"
+#~ msgstr "Reiniciar el id a 0"
+
+#~ msgid "Keep my visible state"
+#~ msgstr "Mantener mi estado visible"
+
+#~ msgid "Yes, reset the id"
+#~ msgstr "Sí, reiniciar el id"
+
+#~ msgid "Keep their visible state"
+#~ msgstr "Mantener su estado visible"
+
+#~ msgid "Yes, purge it"
+#~ msgstr "Sí, purgarlo"
+
+#~ msgid "Remove from dataset"
+#~ msgstr "Eliminar desde el conjunto de datos"
+
 #~ msgid "Upload to OSM API failed"
 #~ msgstr "Subida a la API de OSM fallida"
@@ -35333,4 +35276,11 @@
 #~ msgstr "WGS84 Geográfico"
 
+#~ msgid ""
+#~ "<html>An error occurred while communicating with the server<br>Details: "
+#~ "{0}</html>"
+#~ msgstr ""
+#~ "<html>Ocurrió un error mientras se comunicaba con el "
+#~ "servidor<br>Detalles: {0}</html>"
+
 #~ msgid "Members: {0} (linked: {1})"
 #~ msgstr "Miembros: {0} (enlazados: {1})"
@@ -35349,4 +35299,7 @@
 #~ "No se encontró ninguna primitiva con ID {0} y versión {1} en este "
 #~ "conjunto de datos"
+
+#~ msgid "Undecide conflict between visible state"
+#~ msgstr "Conflicto entre estado visibles sin decidir"
 
 #~ msgid "Conflicts in data"
@@ -35411,4 +35364,10 @@
 #~ msgid "Linked"
 #~ msgstr "Vinculado"
+
+#~ msgid "Undelete additional nodes?"
+#~ msgstr "¿Deshacer el borrado de los nodos adicionales?"
+
+#~ msgid "Physically delete from local dataset"
+#~ msgstr "Eliminar físicamente del conjunto de datos locales"
 
 #~ msgid "Gauss-Laborde Réunion 1947"
@@ -35701,4 +35660,17 @@
 #~ msgstr "Por favor, reinicia JOSM"
 
+#~ msgid ""
+#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
+#~ "Dialog and manually resolve it."
+#~ msgid_plural ""
+#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
+#~ "Dialog and manually resolve them."
+#~ msgstr[0] ""
+#~ "{0} conflicto sigue sin resolverse. <br> <br> Por favor, abra el cuadro "
+#~ "de dialogo de Conflictos y resuélvalo manualmente."
+#~ msgstr[1] ""
+#~ "{0} conflicto2 siguen sin resolverse. <br> <br> Por favor, abra el cuadro "
+#~ "de dialogo de Conflictos y resuélvalos manualmente."
+
 #~ msgid "Uploading {0} objects ..."
 #~ msgstr "Subiendo {0} objetos..."
@@ -35741,4 +35713,11 @@
 #~ "Valor incorrecto del operador de la versión: {0}. Se esperaba un número."
 
+#~ msgid ""
+#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
+#~ "the dataset.<br>Do you agree?</html>"
+#~ msgstr ""
+#~ "<html>JOSM borrará la primitiva local con id {0}<br>del dataset.<br>¿Está "
+#~ "de acuerdo?</html>"
+
 #~ msgid "Enter a changset id"
 #~ msgstr "Introduzca un ID de modificación"
@@ -35793,4 +35772,39 @@
 #~ "inconsistencia. Mantengo el objeto. "
 
+#~ msgid ""
+#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
+#~ "server.<br><br>Do you want to undelete this node too?"
+#~ msgid_plural ""
+#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
+#~ "the server.<br><br>Do you want to undelete these nodes too?"
+#~ msgstr[0] ""
+#~ "Hay {0} nodo adicional usado pur la vía {1}<br>que ha sido eliminada en "
+#~ "el servidor.<br><br>¿Quiere que este nodo vuelva a existir?"
+#~ msgstr[1] ""
+#~ "Hay {0} nodos adicionales usados por la vía {1}<br>que ha sido eliminada "
+#~ "en el servidor.<br><br> ¿Quiere que estos nodos vuelvan a existir?"
+
 #~ msgid "GPS point"
 #~ msgstr "Punto GPS"
+
+#~ msgid ""
+#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
+#~ "deleted on the server.<br><br>Do you want to undelete this too?"
+#~ msgid_plural ""
+#~ "There are {0} additional primitives referred to by relation {1}<br>which "
+#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
+#~ msgstr[0] ""
+#~ "Hay {0} primitiva adicional referida en la relación a {1}<br>la cual está "
+#~ "borrada en el servidor.<br><br>¿Desea recuperarla también?"
+#~ msgstr[1] ""
+#~ "Hay {0} primitivas adicionales referidas en la relación a {1}<br>las "
+#~ "cuales están borradas en el servidor.<br><br>¿Desea recuperarlas también?"
+
+#~ msgid ""
+#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
+#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
+#~ "new id.<br>Do you agree?</html>"
+#~ msgstr ""
+#~ "<html>Para mantener su versión local JOSM<br> tiene que restablecer la ID "
+#~ "de la primitiva {0} a 0.<br>En la próxima subida el servidor le "
+#~ "asignará<br>una ID nueva.<br>¿Está de acuerdo?</html>"
Index: applications/editors/josm/i18n/po/et.po
===================================================================
--- applications/editors/josm/i18n/po/et.po	(revision 22209)
+++ applications/editors/josm/i18n/po/et.po	(revision 22278)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
-"PO-Revision-Date: 2010-06-28 16:19+0000\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
+"PO-Revision-Date: 2010-07-06 16:47+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:06+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -265,5 +265,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -654,9 +654,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1472,5 +1472,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2716,6 +2716,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2746,7 +2746,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "regulaaravaldis"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -4264,5 +4263,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -4788,5 +4787,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -4798,5 +4797,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr ""
@@ -5377,5 +5376,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5475,9 +5474,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5490,53 +5489,52 @@
 msgstr "Lisa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr "Ekspordi GPX fail"
+msgstr ""
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5544,5 +5542,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5550,5 +5548,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5556,5 +5554,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5562,5 +5560,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5569,5 +5567,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5575,5 +5573,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5581,5 +5579,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5587,24 +5585,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -10142,10 +10140,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10154,5 +10152,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr ""
@@ -12688,5 +12686,5 @@
 msgstr "Vali eeldefineeritud litsents"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -12697,5 +12695,5 @@
 msgstr "Markerid {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -12705,5 +12703,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -12713,5 +12711,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -13366,9 +13364,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14159,11 +14157,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -14172,5 +14170,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -14854,7 +14852,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
-#, fuzzy
 msgid "on polygon"
-msgstr "Hulknurk"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
@@ -14873,14 +14870,14 @@
 msgstr "Ehitised"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr ""
@@ -15045,5 +15042,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
@@ -25663,7 +25660,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "american_football"
-msgstr "ameerika_jalgpall"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -25694,7 +25690,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "canadian_football"
-msgstr "ameerika_jalgpall"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -25740,7 +25735,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "gaelic_football"
-msgstr "ameerika_jalgpall"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26293,13 +26287,11 @@
 
 #: build/trans_presets.java:2088
-#, fuzzy
 msgid "Gaelic Football"
-msgstr "ameerika_jalgpall"
+msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "Vali korvpall"
+msgstr ""
 
 #: build/trans_presets.java:2094
@@ -26309,18 +26301,15 @@
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "Vali ragbi"
+msgstr ""
 
 #: build/trans_presets.java:2100
-#, fuzzy
 msgid "Rugby Union"
-msgstr "Ragbi"
+msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "Vali ragbi"
+msgstr ""
 
 #: build/trans_presets.java:2106
Index: applications/editors/josm/i18n/po/eu.po
===================================================================
--- applications/editors/josm/i18n/po/eu.po	(revision 22209)
+++ applications/editors/josm/i18n/po/eu.po	(revision 22278)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
-"PO-Revision-Date: 2010-06-29 22:24+0000\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
+"PO-Revision-Date: 2010-07-06 17:47+0000\n"
 "Last-Translator: Mikel Lizarralde <mlizarralde@tagzania.com>\n"
 "Language-Team: Basque <eu@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:12+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -271,5 +271,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -663,9 +663,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1519,5 +1519,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2841,6 +2841,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2871,7 +2871,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "Sar ezazu bilatu nahi duzun adierazpidea"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -4480,5 +4479,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -5036,5 +5035,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -5046,5 +5045,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr "Behera"
@@ -5632,5 +5631,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5729,9 +5728,9 @@
 msgstr "Gatazkak konpondu \"{0}\"(r)entzat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5744,53 +5743,52 @@
 msgstr "Gehitu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr "Iragazkia gehitu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr "Iragazkia editatu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr "Iragazkia ezabatu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr "Iragazkia igo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr "Iragazkia jaitsi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr "Iragazkia aktibatu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr "Elementuak ezkutatu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr "Iragazkia alderantzikatu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr "Iragazki-modua"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr "Fitxategia kargatzean errorea"
+msgstr ""
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5798,5 +5796,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5804,5 +5802,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5810,5 +5808,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5816,5 +5814,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5823,5 +5821,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5829,5 +5827,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5835,5 +5833,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5841,24 +5839,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Iragazkia aktibatuta dago</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> objektuak ezkutaturik"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<p><b>{0}</b> objektuak desgaiturik"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -10397,10 +10395,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10409,5 +10407,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr ""
@@ -12939,5 +12937,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -12948,5 +12946,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -12956,5 +12954,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -12964,5 +12962,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -13617,9 +13615,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14410,11 +14408,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -14423,5 +14421,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -15098,7 +15096,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
-#, fuzzy
 msgid "on polygon"
-msgstr "Multipoligonoa"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
@@ -15117,14 +15114,14 @@
 msgstr "Eraikinak"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr ""
@@ -15289,5 +15286,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
@@ -26000,7 +25997,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "american_football"
-msgstr "futbol australiarra"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26031,7 +26027,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "canadian_football"
-msgstr "futbol australiarra"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26077,7 +26072,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "gaelic_football"
-msgstr "futbol australiarra"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26123,7 +26117,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "rugby_union"
-msgstr "errugbia"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26613,35 +26606,29 @@
 
 #: build/trans_presets.java:2076
-#, fuzzy
 msgid "American Football"
-msgstr "Futbol australiarra"
+msgstr ""
 
 #. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-#, fuzzy
 msgid "Edit American Football"
-msgstr "Futbol australiarra editatu"
+msgstr ""
 
 #: build/trans_presets.java:2082
-#, fuzzy
 msgid "Canadian Football"
-msgstr "Futbol amerikarra editatu"
+msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
 #: build/trans_presets.java:2083
-#, fuzzy
 msgid "Edit Canadian Football"
-msgstr "Futbol australiarra editatu"
+msgstr ""
 
 #: build/trans_presets.java:2088
-#, fuzzy
 msgid "Gaelic Football"
-msgstr "Futbol amerikarra editatu"
+msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "Futbol amerikarra editatu"
+msgstr ""
 
 #: build/trans_presets.java:2094
@@ -26651,18 +26638,15 @@
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "Rugby-a editatu"
+msgstr ""
 
 #: build/trans_presets.java:2100
-#, fuzzy
 msgid "Rugby Union"
-msgstr "Rugby-a"
+msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "Rugby-a editatu"
+msgstr ""
 
 #: build/trans_presets.java:2106
@@ -33408,4 +33392,16 @@
 msgstr "Sizilia - Italia"
 
+#~ msgid "Football"
+#~ msgstr "Futbol amerikarra"
+
+#~ msgid "football"
+#~ msgstr "futbola"
+
+#~ msgid "Yes, undelete them too"
+#~ msgstr "Bai, berreskuratu horiek ere bai"
+
+#~ msgid "No, cancel operation"
+#~ msgstr "Ez, utzi eragiketa"
+
 #~ msgid ""
 #~ "<html>An error occurred while communicating with the server<br>Details: "
@@ -33418,24 +33414,24 @@
 #~ msgstr "Zerbitzariarekin komunikazioak huts egin du"
 
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Bai, berreskuratu horiek ere bai"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "Ez, utzi eragiketa"
+#~ msgid "visible (on the server)"
+#~ msgstr "ikusgai (zerbitzarian)"
+
+#~ msgid "not visible (on the server)"
+#~ msgstr "ezkutuan (zerbitzarian)"
 
 #~ msgid "Visible State:"
 #~ msgstr "Ikusgai egoera:"
 
-#~ msgid "visible (on the server)"
-#~ msgstr "ikusgai (zerbitzarian)"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "ezkutuan (zerbitzarian)"
+#~ msgid "Physically delete from local dataset"
+#~ msgstr "Fisikoki ezabatu datu talde lokaletik"
 
 #~ msgid "Keep a clone of the local version"
 #~ msgstr "Bertsio lokalaren klon bat mantendu"
 
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Fisikoki ezabatu datu talde lokaletik"
+#~ msgid "Yes, purge it"
+#~ msgstr "Bai, garbitu."
+
+#~ msgid "Remove from dataset"
+#~ msgstr "Ezabatu datu taldetik"
 
 #~ msgid "Yes, reset the id"
@@ -33444,14 +33440,2 @@
 #~ msgid "Reset id to 0"
 #~ msgstr "IDa 0ra berrezarri"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Bai, garbitu."
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Ezabatu datu taldetik"
-
-#~ msgid "football"
-#~ msgstr "futbola"
-
-#~ msgid "Football"
-#~ msgstr "Futbol amerikarra"
Index: applications/editors/josm/i18n/po/fi.po
===================================================================
--- applications/editors/josm/i18n/po/fi.po	(revision 22209)
+++ applications/editors/josm/i18n/po/fi.po	(revision 22278)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
-"PO-Revision-Date: 2010-06-30 18:27+0000\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
+"PO-Revision-Date: 2010-07-06 16:24+0000\n"
 "Last-Translator: Mika Laari <laari@iki.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:08+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -267,5 +267,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -658,9 +658,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1499,5 +1499,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2805,6 +2805,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2835,7 +2835,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "Kirjoita hakulauseke"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -4417,5 +4416,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -4951,5 +4950,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -4961,5 +4960,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr "Alas"
@@ -5556,5 +5555,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5653,9 +5652,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr "Piilota tai himmennä objekteja suotimilla."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5668,53 +5667,52 @@
 msgstr "Lisää"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr "Lisää suodin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr "Muokkaa suodinta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr "Poista suodin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr "Nosta suodinta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr "Laske suodinta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr "Ota suodin käyttöön"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr "Piilota kohteet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr "Käänteinen suodatus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr "Suodatustapa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr "Suodin: {0} piilossa, {1} himmeänä"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr "Virhe ladattaessa tiedostoa"
+msgstr ""
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5722,5 +5720,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5728,5 +5726,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5734,5 +5732,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5740,5 +5738,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5747,5 +5745,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5753,5 +5751,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5759,5 +5757,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5765,24 +5763,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Suodatus päällä</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> kohdetta piilossa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> kohdetta himmeänä"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -10416,10 +10414,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10428,5 +10426,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr ""
@@ -12988,5 +12986,5 @@
 msgstr "Valitse ennaltamääritetty lisenssi"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -12997,5 +12995,5 @@
 msgstr "Merkinnät: {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -13005,5 +13003,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -13013,5 +13011,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -13679,9 +13677,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14494,11 +14492,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -14507,5 +14505,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -15207,15 +15205,14 @@
 msgstr "Rakennukset"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
-msgstr "Seuraava"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr ""
@@ -15380,5 +15377,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
@@ -26042,7 +26039,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "american_football"
-msgstr "australialainen jalkapallo"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26073,7 +26069,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "canadian_football"
-msgstr "australialainen jalkapallo"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26119,7 +26114,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "gaelic_football"
-msgstr "australialainen jalkapallo"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26165,7 +26159,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "rugby_union"
-msgstr "rugby"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26655,35 +26648,29 @@
 
 #: build/trans_presets.java:2076
-#, fuzzy
 msgid "American Football"
-msgstr "Australialainen jalkapallo"
+msgstr ""
 
 #. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-#, fuzzy
 msgid "Edit American Football"
-msgstr "Australialainen jalkapallo"
+msgstr ""
 
 #: build/trans_presets.java:2082
-#, fuzzy
 msgid "Canadian Football"
-msgstr "Australialainen jalkapallo"
+msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
 #: build/trans_presets.java:2083
-#, fuzzy
 msgid "Edit Canadian Football"
-msgstr "Australialainen jalkapallo"
+msgstr ""
 
 #: build/trans_presets.java:2088
-#, fuzzy
 msgid "Gaelic Football"
-msgstr "Australialainen jalkapallo"
+msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "Australialainen jalkapallo"
+msgstr ""
 
 #: build/trans_presets.java:2094
@@ -26693,18 +26680,15 @@
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "Muokkaa louhoksen ominaisuuksia"
+msgstr ""
 
 #: build/trans_presets.java:2100
-#, fuzzy
 msgid "Rugby Union"
-msgstr "Rugby"
+msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "Muokkaa raunioiden ominaisuuksia"
+msgstr ""
 
 #: build/trans_presets.java:2106
@@ -33450,36 +33434,767 @@
 msgstr "Sicily - Italy"
 
+#~ msgid "Unknown version"
+#~ msgstr "Tuntematon versio"
+
+#~ msgid "Preparing..."
+#~ msgstr "Valmistellaan..."
+
+#~ msgid "Uploading..."
+#~ msgstr "Lähetetään..."
+
+#~ msgid "Incorrect password or username."
+#~ msgstr "Virheellinen salasana tai käyttäjänimi."
+
+#~ msgid "Enter Password"
+#~ msgstr "Anna salasana"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Tallentamattomia muutoksia"
+
+#~ msgid "Download Area"
+#~ msgstr "Lataa alue"
+
+#~ msgid "Add all currently selected objects as members"
+#~ msgstr "Lisää valitut objektit jäseniksi"
+
+#~ msgid "Date"
+#~ msgstr "Päivämäärä"
+
+#~ msgid "name"
+#~ msgstr "nimi"
+
+#~ msgid "image"
+#~ msgid_plural "images"
+#~ msgstr[0] "kuva"
+#~ msgstr[1] "kuvat"
+
+#~ msgid "Image"
+#~ msgstr "Kuva"
+
+#~ msgid "Proxy server host"
+#~ msgstr "Välityspalvelimen osoite"
+
+#~ msgid "Anonymous"
+#~ msgstr "Anonyymi"
+
+#~ msgid "Proxy server username"
+#~ msgstr "Välityspalvelimen käyttäjänimi"
+
+#~ msgid "Proxy server port"
+#~ msgstr "Välityspalvelimen portti"
+
+#~ msgid "Proxy server password"
+#~ msgstr "Välityspalvelimen salasana"
+
+#~ msgid "File not found"
+#~ msgstr "Tiedostoa ei löytynyt"
+
+#~ msgid "Open in Browser"
+#~ msgstr "Avaa selaimessa"
+
+#~ msgid "Email"
+#~ msgstr "Sähköpostiosoite"
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Tuntematon tiedostopääte."
+
+#~ msgid "Do not show again"
+#~ msgstr "Älä näytä uudelleen"
+
+#~ msgid "Error parsing server response."
+#~ msgstr "Virhe palvelimen vastauksen käsittelyssä."
+
+#~ msgid "Merging conflicts."
+#~ msgstr "Yhdistämisristiriidat"
+
+#~ msgid "No time for point {0} x {1}"
+#~ msgstr "Ei aikaleimaa pisteelle {0} x {1}"
+
+#~ msgid "No images with readable timestamps found."
+#~ msgstr "Ei löytynyt aikaleimallisia kuvia."
+
+#~ msgid "Read GPX..."
+#~ msgstr "Lue GPX..."
+
+#~ msgid "GPS unit timezone (difference to photo)"
+#~ msgstr "GPS-yksikön aikavyöhyke (ero kuvaan)"
+
+#~ msgid "Sync clock"
+#~ msgstr "Tahdista kello"
+
+#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+#~ msgstr "Syötä näytetty päivämäärä (kk/pp/vvvv TT:MM:SS)"
+
+#~ msgid "There is no EXIF time within the file \"{0}\"."
+#~ msgstr "Tiedostossa \"{0}\" ei ole EXIF-aikaleimaa."
+
+#~ msgid "Enable proxy server"
+#~ msgstr "Käytä välityspalvelinta"
+
+#~ msgid "Set the language."
+#~ msgstr "Aseta kieli."
+
+#~ msgid "my version:"
+#~ msgstr "minun versioni:"
+
+#~ msgid "their version:"
+#~ msgstr "palvelimen versio:"
+
+#~ msgid "Change"
+#~ msgstr "Muokkaa"
+
+#~ msgid "Move"
+#~ msgstr "Siirrä"
+
+#~ msgid "false"
+#~ msgstr "epätosi"
+
+#~ msgid "true"
+#~ msgstr "tosi"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Ristiriidassa oleva relaatio"
+
+#~ msgid "different"
+#~ msgstr "eri"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Virhe ladattaessa sivua {0}"
+
+#~ msgid "unnamed"
+#~ msgstr "nimetön"
+
+#~ msgid "Load Selection"
+#~ msgstr "Lataa valinta"
+
+#~ msgid "Data Layer"
+#~ msgstr "Datataso"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Anna haettava merkkijono"
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "Tuo TCX-tiedosto GPS-jälkenä"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "Tuo TCX-tiedosto..."
+
+#~ msgid "zoom"
+#~ msgstr "zoom"
+
+#~ msgid "All images"
+#~ msgstr "Kaikki kuvat"
+
+#~ msgid "help"
+#~ msgstr "ohje"
+
+#~ msgid "Only two nodes allowed"
+#~ msgstr "Vain kaksi pistettä sallittu"
+
 #~ msgid ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr ""
+#~ "Valituilla pisteillä on eriävät relaatiojäsenyydet. Haluatko silti "
+#~ "yhdistää ne?"
+
+#~ msgid "Only one node selected"
+#~ msgstr "Vain yksi piste valittuna"
+
+#~ msgid "Split way segment"
+#~ msgstr "Katkaise polku"
+
+#~ msgid ""
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
+#~ msgstr ""
+#~ "Valituilla poluilla on eriävät relaatiojäsenyydet. Haluatko silti "
+#~ "yhdistää ne?"
+
+#~ msgid "All the ways were empty"
+#~ msgstr "Kaikki polut olivat tyhjiä"
+
+#~ msgid "Some of the nodes are (almost) in the line"
+#~ msgstr "Jotkin pisteet ovat (melkein) viivalla"
+
+#~ msgid "The date in file \"{0}\" could not be parsed."
+#~ msgstr "Päivämäärää tiedostosta \"{0}\" ei voitu tulkita."
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "<nd>-elementti muussa kuin polussa."
+
+#~ msgid "to"
+#~ msgstr "-"
+
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr ""
+#~ "Voit käyttää hiirtä tai Ctrl+nuolinäppäimet lähentääksesi/loitontaaksesi "
+#~ "ja siirtääksesi näkymää."
+
+#~ msgid "x from"
+#~ msgstr "x"
+
+#~ msgid "y from"
+#~ msgstr "y"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Napsauta ”Päivitä” päivittääksesi listan."
+
+#~ msgid "Error during parse."
+#~ msgstr "Virhe jäsennettäessä."
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Siirto keskeytettiin virheen takia (odotetaan viisi sekuntia):"
+
+#~ msgid "Plugin not found: {0}."
+#~ msgstr "Liitännäistä ei löytynyt: {0}."
+
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "(Voit vaihtaa päivien määrän, jonka jälkeen tämä varoitus tulee,"
+#~ "<br>asettamalla ”plginmanager.warntime”-asetuksen)"
+
+#~ msgid "Plugin requires JOSM update: {0}."
+#~ msgstr "Liitännäinen vaatii JOSM:n päivityksen: {0}."
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Palvelin palautti sisäisen virheen. Kokeile ladata pienempi alue tai "
+#~ "yritä myöhemmin uudestaan."
+
+#~ msgid "Include your steps to get to the error (as detailed as possible)!"
+#~ msgstr ""
+#~ "Kerro (mahdollisimman tarkasti) mitä teit eli mitkä toimet johtivat "
+#~ "virhetilanteeseen."
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Käytä esivalintaa ”{0}”"
+
+#~ msgid "Edit Properties"
+#~ msgstr "Muokkaa ominaisuuksia"
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "Tuonnin aikana oli ristiriitoja."
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Palauta kaikkien valittujen objektien tila historialistassa valittuun "
+#~ "versioon."
+
+#~ msgid "Cannot connect to server."
+#~ msgstr "Palvelimeen ei voida yhdistää."
+
+#~ msgid "Refresh the selection list."
+#~ msgstr "Päivitä valintalista."
+
+#~ msgid "Delete the selected layer."
+#~ msgstr "Poista valittu taso."
+
+#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
+#~ msgstr "Aikaleimaa \"{0}\" ei voitu lukea pisteestä {1} x {2}"
+
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr ""
+#~ "OSM-tilin salasana. Jätä tyhjäksi, jos et halua tallentaa salasanaa."
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Tagien esivalintojen lähteet"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Tagien esiasetusten lähde"
+
+#~ msgid "Add a new tagging preset source to the list."
+#~ msgstr "Lisää uusi tagien esivalintalähde listaan."
+
+#~ msgid "Download missing plugins"
+#~ msgstr "Lataa puuttuvat liitännäiset"
+
+#~ msgid "Plugin already exists"
+#~ msgstr "Liitännäinen on jo olemassa"
+
+#~ msgid "Add either site-josm.xml or Wiki Pages."
+#~ msgstr "Lisää joko site-josm.xml tai Wiki-sivusto."
+
+#~ msgid "<p>Thank you for your understanding</p>"
+#~ msgstr "<p>Kiitos ymmärtyksestäsi!</p>"
+
+#~ msgid ""
+#~ "Activating the updated plugins failed. Check if JOSM has the permission "
+#~ "to overwrite the existing ones."
+#~ msgstr ""
+#~ "Päivitettyjen liitännäisten aktivointi epäonnistui. Tarkista, että JOSM:"
+#~ "lla on oikeus korvata vanhat tiedostot."
+
+#~ msgid "Open file (as raw gps, if .gpx)"
+#~ msgstr "Avaa tiedosto (gps-datana, jos *.gpx)"
+
+#~ msgid "Could not download plugin: {0} from {1}"
+#~ msgstr "Liitännäistä ei voitu ladata: {0} kohteesta {1}"
+
+#~ msgid ""
+#~ "There were problems with the following plugins:\n"
+#~ "\n"
+#~ " {0}"
+#~ msgstr ""
+#~ "Seuraavissa litännäisissä oli ongelmia:\n"
+#~ "\n"
+#~ "{0}"
+
+#~ msgid ""
+#~ "You are about to delete nodes outside of the area you have downloaded."
+#~ "<br>This can cause problems because other objects (that you don't see) "
+#~ "might use them.<br>Do you really want to delete?"
+#~ msgstr ""
+#~ "Olet aikeissa poistaa pisteitä ladatun alueen ulkopuolelta.<br>Tämä voi "
+#~ "johtaa ongelmiin, koska objektit, joita et näe voivat käyttää niitä."
+#~ "<br>Oletko varma, että haluat poistaa ne?"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Virhe jäsennettäessä"
+
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "Voi muokata ainoastaan sivuja JOSM-verkko-ohjeesta"
+
+#~ msgid "JOSM Online Help"
+#~ msgstr "JOSM-verkko-ohje"
+
+#~ msgid "Combine ways with different memberships?"
+#~ msgstr "Yhdistetäänkö polut, joilla on eriävät jäsenyydet?"
+
+#~ msgid ""
+#~ "The plugin could not be removed. Please tell the people you got JOSM from "
+#~ "about the problem."
+#~ msgstr "Liitännäistä ei voitu poistaa. Tee ongelmasta virheilmoitus."
+
+#~ msgid "Be sure to include the following information:"
+#~ msgstr "Varmista, että ilmoituksesa on ainakin seuraavat tiedot:"
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Yhdistetäänkö pisteet, joilla on eriävät relaatiojäsenyydet?"
+
+#~ msgid "No data imported."
+#~ msgstr "Dataa ei tuotu."
+
+#~ msgid "Really mark this issue as ''done''?"
+#~ msgstr "Merkataanko tämä ongelma todella \"valmiiksi\"?"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Palvelimelta saatuja paikanhakutuloksia ei voida lukea"
+
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr "Tarkista joko nykyinen valitna tai koko data."
+
+#~ msgid ""
+#~ "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
+#~ "The selection contains {0} ways. Are you sure you want to simplify them "
+#~ "all?"
+#~ msgstr[0] "Valinnassa on {0} polku. Haluatko varmasti yksinkertaistaa sen?"
+#~ msgstr[1] ""
+#~ "Valinnassa on {0} polkua. Haluatko varmasti yksinkertaistaa ne kaikki?"
+
+#~ msgid "Boat"
+#~ msgstr "Vene"
+
+#~ msgid "Motorboat"
+#~ msgstr "Moottorivene"
+
+#~ msgid "Bridleway"
+#~ msgstr "Ratsastustie"
+
+#~ msgid "Cycleway"
+#~ msgstr "Pyörätie"
+
+#~ msgid "Footway"
+#~ msgstr "Jalankulkutie"
+
+#~ msgid "Drawbridge"
+#~ msgstr "Laskusilta"
+
+#~ msgid "Shop"
+#~ msgstr "Kauppa"
+
+#~ msgid "map"
+#~ msgstr "kartta"
+
+#~ msgid "bicyclemap"
+#~ msgstr "pyöräkartta"
+
+#~ msgid "Football"
+#~ msgstr "Amerikkalainen jalkapallo"
+
+#~ msgid "football"
+#~ msgstr "amerikkalainen jalkapallo"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "{0} objektilla on ristiriita:"
+#~ msgstr[1] "{0} objektilla on ristiriitoja:"
+
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Käytä esivalintaa \"{0}\" ryhmästä \"{1}\""
+
+#~ msgid ""
+#~ "Try updating to the newest version of JOSM and all plugins before "
+#~ "reporting a bug."
+#~ msgstr ""
+#~ "Päivitä JOSM ja liitännäiset uusimpiin versioihin ennen virheilmoituksen "
+#~ "kirjoittamista."
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "<member>-tagi muussa kuin relaatiossa."
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Vääränlainen pisteen id"
+
+#~ msgid ""
+#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
+#~ "This can lead to nodes being deleted accidentally.\n"
+#~ "Are you really sure to continue?"
+#~ msgstr ""
+#~ "Valituilla poluilla on pisteitä ladatun alueen ulkopuolella.\n"
+#~ "Tämä voi mahdollisesti johtaa muiden polkujen käytössä olevien pisteiden "
+#~ "poistamiseen.\n"
+#~ "Oletko varma, että haluat jatkaa?"
+
+#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
+#~ msgstr "Lataa suoristetun kuvan Metacartan Map Rectifier WMS:stä"
+
+#~ msgid "Hint: Some changes came from uploading new data to the server."
+#~ msgstr "Vihje: Osa muutoksista tuli lähetettäessä uutta dataa palvelimelle."
+
+#~ msgid "Occupied By"
+#~ msgstr "Jäsen"
+
+#~ msgid "Error: {0}"
+#~ msgstr "Virhe: {0}"
+
+#~ msgid "Warning: {0}"
+#~ msgstr "Varoitus: {0}"
+
+#~ msgid "Upload to OSM..."
+#~ msgstr "Lähetä OSM-palvelimelle..."
+
+#~ msgid ""
+#~ "The plugin {0} seems to be broken or could not be downloaded "
+#~ "automatically."
+#~ msgstr ""
+#~ "Liitännäinen {0} vaikuttaa rikkinäiseltä, tai sitä ei voitu ladata "
+#~ "automaattisesti."
+
+#~ msgid ""
+#~ "The projection \"{0}\" is designed for\n"
+#~ "latitudes between 46.1° and 57° only.\n"
+#~ "Use another projection system if you are not using\n"
+#~ "a French WMS server.\n"
+#~ "Do not upload any data after this message."
+#~ msgstr ""
+#~ "Projektio \"{0}\" on suunniteltu käytettäväksi\n"
+#~ "vain leveysasteiden 46.1° ja 57° välillä.\n"
+#~ "Käytä muuta projektiota, jos et käytä\n"
+#~ "ranskalaista WMS-palvelinta.\n"
+#~ "Älä lähetä mitään dataa palvelimelle tämän viestin jälkeen."
+
+#~ msgid ""
+#~ "Plugin archive already available. Do you want to download the current "
+#~ "version by deleting existing archive?\n"
+#~ "\n"
+#~ "{0}"
+#~ msgstr ""
+#~ "Liitännäispaketti on jo saatavilla. Haluatko ladata uusimman version ja "
+#~ "poistaa nykyisen paketin?\n"
+#~ "\n"
+#~ "{0}"
+
+#~ msgid "Expected closing parenthesis."
+#~ msgstr "Päättävä sulkumerkki puuttuu."
+
+#~ msgid "Metacarta Map Rectifier image id"
+#~ msgstr "Metacarta Map Rectifier:in kuvatunnus (id)"
+
+#~ msgid "Way ''{0}'' with less than two points."
+#~ msgstr "Polussa \"{0}\" on vähemmän kuin kaksi pistettä."
+
+#~ msgid "Authors: {0}"
+#~ msgstr "Muokkaajat: {0}"
+
+#~ msgid "Command Stack: {0}"
+#~ msgstr "Komentolista: {0}"
+
+#~ msgid "Painting problem"
+#~ msgstr "Piirto-ongelma"
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Ei mitään tallennettavaa: ei avoimia tiedostoja."
+
+#~ msgid ""
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
+#~ msgstr ""
+#~ "Sisäinen virhe: tallennuskelpoisuuden tarkistus ei onnistu ilman avoimia "
+#~ "tasoja. Ole hyvä ja ilmoita tämä ohjelmistovirheenä."
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Valitse vähintään yksi ladattava tietolaji."
+
+#~ msgid "Open images with AgPifoJ..."
+#~ msgstr "Avaa kuvia AgPifoJ:llä..."
+
+#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
+#~ msgstr "Avaa OpenStreetBugs-ikkuna ja aktivoi automaattinen lataus"
+
+#~ msgid "Synchronize Time with GPS Unit"
+#~ msgstr "Tahdista aika GPS-yksikön kanssa"
+
+#~ msgid "Could not read from URL: \"{0}\""
+#~ msgstr "Ei voitu lukea URL:stä: \"{0}\""
+
+#~ msgid "Portcullis"
+#~ msgstr "Laskuristikko"
+
+#~ msgid "Tags (empty value deletes tag)"
+#~ msgstr "Tagit (tyhjä arvo poistaa tagin)"
+
+#~ msgid "Cannot open preferences directory: {0}"
+#~ msgstr "Omien asetusten hakemistoa {0} ei voi avata."
+
+#~ msgid "Remove Selected"
+#~ msgstr "Poista valitut"
+
+#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
+#~ msgstr ""
+#~ "TÄMÄ ON KOKEELLINEN. Tallenna työsi ja tarkista lopputulos ennen "
+#~ "lähettämistä."
+
+#~ msgid "Please report a ticket at {0}"
+#~ msgstr "Tee virheilmoitus osoitteessa {0}"
+
+#~ msgid "NullPointerException, possibly some missing tags."
+#~ msgstr "Null-osoitinpoikkeus, mahdollisesti puuttuvia tageja."
+
+#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
+#~ msgstr "Ohitetaan polku, jonka jotain pistettä ei ole olemassa: {0}\n"
+
+#~ msgid "Login"
+#~ msgstr "Kirjaudu sisään"
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Valitse ensin kirjanmerkki."
+
+#~ msgid "Move Down"
+#~ msgstr "Siirrä alaspäin"
+
+#~ msgid "Move Up"
+#~ msgstr "Siirrä ylöspäin"
+
+#~ msgid "Relation Editor: {0}"
+#~ msgstr "Relaatioeditori: {0}"
+
+#~ msgid "More than one \"to\" way found."
+#~ msgstr "Löytyi enemmän kuin yksi \"to\" -polku"
+
+#~ msgid "More than one \"from\" way found."
+#~ msgstr "Löytyi enemmän kuin yksi \"from\" -polku"
+
+#~ msgid "Unknown role ''{0}''."
+#~ msgstr "Tuntematon rooli \"{0}\""
+
+#~ msgid "Edit Drawbridge"
+#~ msgstr "Muokkaa laskusillan ominaisuuksia"
+
+#~ msgid "Edit Portcullis"
+#~ msgstr "Muokkaa laskuristikkoa"
+
+#~ msgid "Merge Anyway"
+#~ msgstr "Yhdistä silti"
+
+#~ msgid "Please select one or more closed ways of at least four nodes."
+#~ msgstr ""
+#~ "Valitse yksi tai useampi suljettu polku, joissa on vähintään neljä "
+#~ "pistettä."
+
+#~ msgid ""
+#~ "Please select at least one node, way or relation. Only already uploaded "
+#~ "elements have a history."
+#~ msgstr ""
+#~ "Valitse ainakin yksi piste, polku tai relaatio. Vain jo aikaisemmin "
+#~ "lähetetyillä elementeillä on historia."
+
+#~ msgid ""
+#~ "This action will require {0} individual download requests. Do you wish to "
+#~ "continue?"
+#~ msgstr ""
+#~ "Tämä toiminto vaatii {0} erillistä latauspyyntyöä. Oletko varma, että "
+#~ "haluat jatkaa?"
+
+#~ msgid ""
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
+#~ msgstr ""
+#~ "Ei päivitettäviä karttatietoja. Et ole ladannut etkä avannut "
+#~ "karttatietoja."
+
+#~ msgid ""
+#~ "The sources (URL or filename) of tagging preset definition files. See "
+#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
+#~ msgstr ""
+#~ "Tagien esivalintatiedot (URL-osoite tai tiedostonimi). Lisätietoja "
+#~ "osoitteessa http://josm.openstreetmap.de/wiki/TaggingPresets"
+
+#~ msgid "Check if map painting found data errors."
+#~ msgstr ""
+#~ "Näytä kartan muokkausnäkymän piirrossa havaitut ongelmat tai puutteet."
+
+#~ msgid "Check for paint notes."
+#~ msgstr "Tarkista muokkausnäkymän piirto-ongelmat"
+
+#~ msgid "More than one \"via\" found."
+#~ msgstr "Useita \"via\" -jäseniä."
+
+#~ msgid "No \"to\" way found."
+#~ msgstr "Ei \"to\"-roolin tietä."
+
+#~ msgid "No \"from\" way found."
+#~ msgstr "Ei \"from\"-roolin tietä."
+
+#~ msgid "No \"via\" node or way found."
+#~ msgstr "Ei löytynyt pistettä tai tietä \"via\"-roolissa."
+
+#~ msgid "Non-Way ''{0}'' in multipolygon."
+#~ msgstr "Multipolygonissa jäsenenä muu kuin tie: {0}"
+
+#~ msgid "No outer way for multipolygon ''{0}''."
+#~ msgstr "Multipolygonilta \"{0}\" puuttuu jäsen \"outer\"-roolista."
+
+#~ msgid "Style for restriction {0} not found."
+#~ msgstr "Kiellolle {0} ei löydy piirtotyyliä."
+
+#~ msgid "Inner way ''{0}'' is outside."
+#~ msgstr "Inner-roolin tie \"{0}\" relaation teistä uloimpana."
+
+#~ msgid ""
+#~ "Current number of changes exceeds the max. number of changes, current is "
+#~ "{0}, max is {1}"
+#~ msgstr ""
+#~ "Nykyinen muutosten määrä ylittää muutosten enimmäismäärän, nykyinen on "
+#~ "{0}, enimmäismäärä on {1}"
+
+#~ msgid ""
+#~ "<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
+#~ "changeset will automatically be closed by the server after a timeout.</"
+#~ "html>"
+#~ msgstr ""
+#~ "<html>Muutoskokoelman ''{0}'' sulkeminen epäonnistui OSM-palvelimella "
+#~ "''{1}''.<br>Palvelin sulkee muutoskokoelman automaattisesti aikarajan "
+#~ "umpeuduttua</html>"
+
+#~ msgid "Update Data"
+#~ msgstr "Päivitä data"
+
+#~ msgid "Download referrers from OSM..."
+#~ msgstr "Lataa viittaavat objektit OSM-palvelimelta..."
+
+#~ msgid "GPX Track loaded"
+#~ msgstr "GPX-jälki ladattu"
+
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "parametri ''{0}'' ei saa olla tyhjä"
+
+#~ msgid "Could not read ''{0}''."
+#~ msgstr "Ei voitu lukea \"{0}\":aa"
+
+#~ msgid "Update Selection"
+#~ msgstr "Päivitä valinta"
+
+#~ msgid "Updates the currently selected primitives from the server"
+#~ msgstr "Päivittää valitut objektit palvelimelta"
+
+#~ msgid "Plugin {0} requires JOSM update to version {1}."
+#~ msgstr "Liitännäinen {0} tarvitsee vähintään version {1} JOSM:sta"
+
+#~ msgid "Plug-in named {0} is not available. Update skipped."
+#~ msgstr "Liitännäinen {0} ei ole saatavilla."
+
+#~ msgid ""
+#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
+#~ "resolve them first.</html>"
+#~ msgstr ""
+#~ "<html>Kerroksessa \"{0}\" on ratkaisemattomia konflikteja.<br>Ratkaise ne "
+#~ "ensin.</html>"
+
+#~ msgid "Id > 0 required, got {0}"
+#~ msgstr "ld > 0 vaadittu, saatiin {0}"
+
+#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+#~ msgstr "Odotettiin OsmDataLayer- tai GpxLayer-instanssia. Saatiin \"{0}\"."
+
+#~ msgid "Updating primitive"
+#~ msgstr "Päivitä objekti"
+
+#~ msgid "Uploading {0} objects ..."
+#~ msgstr "Lähetetään {0} objektia..."
+
+#~ msgid "Always move and don't show dialog again"
+#~ msgstr "Siirrä aina, äläkä näytä tätä kysymystä enää"
+
+#~ msgctxt "changeset.open"
+#~ msgid "Closed"
+#~ msgstr "Suljettu"
+
+#~ msgctxt "changeset.open"
+#~ msgid "Open"
+#~ msgstr "Avoin"
+
+#~ msgid "Enter a changset id"
+#~ msgstr "Anna muutoskokoelman ID"
+
+#~ msgid "Deleted or moved primitives"
+#~ msgstr "Poistetut tai siirretyt objektit"
+
+#~ msgid "The \"from\" way does not start or end at a \"via\" node."
+#~ msgstr ""
+#~ "\"via\" -roolin piste ei ole \"from\" -tien ensimmäinen eikä viimeinen."
+
+#~ msgid "The \"to\" way does not start or end at a \"via\" node."
+#~ msgstr ""
+#~ "\"via\" -roolin piste ei ole \"to\" -tien ensimmäinen eikä viimeinen."
+
+#~ msgid "The \"from\" way does not start or end at the \"via\" way."
+#~ msgstr ""
+#~ "\"via\" -roolin piste ei ole \"from\" -tien ensimmäinen eikä viimeinen."
+
+#~ msgid "The \"to\" way does not start or end at the \"via\" way."
+#~ msgstr ""
+#~ "\"via\" -roolin piste ei ole \"to\" -tien ensimmäinen eikä viimeinen."
+
+#~ msgctxt "filter"
+#~ msgid "C"
+#~ msgstr "L"
+
+#~ msgid ""
+#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
+#~ "Dialog and manually resolve it."
+#~ msgid_plural ""
+#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
+#~ "Dialog and manually resolve them."
 #~ msgstr[0] ""
-#~ "Datajoukossa on vielä {0} objekti, johon viitataan<br>palvelimelta "
-#~ "poistetusta relaatiosta {1}.<br>Haluatko palauttaa relaation?"
+#~ "Joudut selvittämään {0} ristiriidan.<br><br>Avaa lista selvittämättömistä "
+#~ "ristiriidoista ja käsittele se."
 #~ msgstr[1] ""
-#~ "Datajoukossa on vielä {0} objektia, joihin viitataan<br>palvelimelta "
-#~ "poistetusta relaatiosta {1}.<br>Haluatko palauttaa relaation?"
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Palautetaanko riippuvaiset objektit?"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>Jos haluat säilyttää tekemäsi paikallisen version,<br>JOSMin täytyy "
-#~ "asettaa objektin {0} tunniste nollaksi.<br>Seuraavan lähetyksen "
-#~ "yhteydessä palvelin asettaa<br>sille uuden tunnisteen.<br>Toteutetaanko "
-#~ "muutos?</html>"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSMin täytyy poistaa tekemäsi paikallinen objekti {0}"
-#~ "<br>datajoukosta.<br>Toteutetaanko muutos?</html>"
+#~ "Joudut selvittämään {0} ristiriitaa.<br><br>Avaa lista selvittämättömistä "
+#~ "ristiriidoista ja käsittele ne."
+
+#~ msgid "Apply also for children"
+#~ msgstr "Sovella myös lapsikohteisiin"
 
 #~ msgid ""
@@ -33498,768 +34213,4 @@
 
 #~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "Joudut selvittämään {0} ristiriidan.<br><br>Avaa lista selvittämättömistä "
-#~ "ristiriidoista ja käsittele se."
-#~ msgstr[1] ""
-#~ "Joudut selvittämään {0} ristiriitaa.<br><br>Avaa lista selvittämättömistä "
-#~ "ristiriidoista ja käsittele ne."
-
-#~ msgid "football"
-#~ msgstr "amerikkalainen jalkapallo"
-
-#~ msgid "Football"
-#~ msgstr "Amerikkalainen jalkapallo"
-
-#~ msgid "Unknown version"
-#~ msgstr "Tuntematon versio"
-
-#~ msgid "Preparing..."
-#~ msgstr "Valmistellaan..."
-
-#~ msgid "Uploading..."
-#~ msgstr "Lähetetään..."
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Virheellinen salasana tai käyttäjänimi."
-
-#~ msgid "Enter Password"
-#~ msgstr "Anna salasana"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Tallentamattomia muutoksia"
-
-#~ msgid "Download Area"
-#~ msgstr "Lataa alue"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Lisää valitut objektit jäseniksi"
-
-#~ msgid "Date"
-#~ msgstr "Päivämäärä"
-
-#~ msgid "name"
-#~ msgstr "nimi"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "kuva"
-#~ msgstr[1] "kuvat"
-
-#~ msgid "Image"
-#~ msgstr "Kuva"
-
-#~ msgid "Proxy server host"
-#~ msgstr "Välityspalvelimen osoite"
-
-#~ msgid "Anonymous"
-#~ msgstr "Anonyymi"
-
-#~ msgid "Proxy server username"
-#~ msgstr "Välityspalvelimen käyttäjänimi"
-
-#~ msgid "Proxy server port"
-#~ msgstr "Välityspalvelimen portti"
-
-#~ msgid "Proxy server password"
-#~ msgstr "Välityspalvelimen salasana"
-
-#~ msgid "File not found"
-#~ msgstr "Tiedostoa ei löytynyt"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Avaa selaimessa"
-
-#~ msgid "Email"
-#~ msgstr "Sähköpostiosoite"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Tuntematon tiedostopääte."
-
-#~ msgid "Do not show again"
-#~ msgstr "Älä näytä uudelleen"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Virhe palvelimen vastauksen käsittelyssä."
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Yhdistämisristiriidat"
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Ei aikaleimaa pisteelle {0} x {1}"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Ei löytynyt aikaleimallisia kuvia."
-
-#~ msgid "Read GPX..."
-#~ msgstr "Lue GPX..."
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "GPS-yksikön aikavyöhyke (ero kuvaan)"
-
-#~ msgid "Sync clock"
-#~ msgstr "Tahdista kello"
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Syötä näytetty päivämäärä (kk/pp/vvvv TT:MM:SS)"
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "Tiedostossa \"{0}\" ei ole EXIF-aikaleimaa."
-
-#~ msgid "Enable proxy server"
-#~ msgstr "Käytä välityspalvelinta"
-
-#~ msgid "Set the language."
-#~ msgstr "Aseta kieli."
-
-#~ msgid "my version:"
-#~ msgstr "minun versioni:"
-
-#~ msgid "their version:"
-#~ msgstr "palvelimen versio:"
-
-#~ msgid "Change"
-#~ msgstr "Muokkaa"
-
-#~ msgid "Move"
-#~ msgstr "Siirrä"
-
-#~ msgid "false"
-#~ msgstr "epätosi"
-
-#~ msgid "true"
-#~ msgstr "tosi"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Ristiriidassa oleva relaatio"
-
-#~ msgid "different"
-#~ msgstr "eri"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Virhe ladattaessa sivua {0}"
-
-#~ msgid "unnamed"
-#~ msgstr "nimetön"
-
-#~ msgid "Load Selection"
-#~ msgstr "Lataa valinta"
-
-#~ msgid "Data Layer"
-#~ msgstr "Datataso"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Anna haettava merkkijono"
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "Tuo TCX-tiedosto GPS-jälkenä"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "Tuo TCX-tiedosto..."
-
-#~ msgid "zoom"
-#~ msgstr "zoom"
-
-#~ msgid "All images"
-#~ msgstr "Kaikki kuvat"
-
-#~ msgid "help"
-#~ msgstr "ohje"
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Vain kaksi pistettä sallittu"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "Valituilla pisteillä on eriävät relaatiojäsenyydet. Haluatko silti "
-#~ "yhdistää ne?"
-
-#~ msgid "Only one node selected"
-#~ msgstr "Vain yksi piste valittuna"
-
-#~ msgid "Split way segment"
-#~ msgstr "Katkaise polku"
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "Valituilla poluilla on eriävät relaatiojäsenyydet. Haluatko silti "
-#~ "yhdistää ne?"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Kaikki polut olivat tyhjiä"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Jotkin pisteet ovat (melkein) viivalla"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "Päivämäärää tiedostosta \"{0}\" ei voitu tulkita."
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "<nd>-elementti muussa kuin polussa."
-
-#~ msgid "to"
-#~ msgstr "-"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr ""
-#~ "Voit käyttää hiirtä tai Ctrl+nuolinäppäimet lähentääksesi/loitontaaksesi "
-#~ "ja siirtääksesi näkymää."
-
-#~ msgid "x from"
-#~ msgstr "x"
-
-#~ msgid "y from"
-#~ msgstr "y"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Napsauta ”Päivitä” päivittääksesi listan."
-
-#~ msgid "Error during parse."
-#~ msgstr "Virhe jäsennettäessä."
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Siirto keskeytettiin virheen takia (odotetaan viisi sekuntia):"
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Liitännäistä ei löytynyt: {0}."
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "(Voit vaihtaa päivien määrän, jonka jälkeen tämä varoitus tulee,"
-#~ "<br>asettamalla ”plginmanager.warntime”-asetuksen)"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Liitännäinen vaatii JOSM:n päivityksen: {0}."
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Palvelin palautti sisäisen virheen. Kokeile ladata pienempi alue tai "
-#~ "yritä myöhemmin uudestaan."
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr ""
-#~ "Kerro (mahdollisimman tarkasti) mitä teit eli mitkä toimet johtivat "
-#~ "virhetilanteeseen."
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Käytä esivalintaa ”{0}”"
-
-#~ msgid "Edit Properties"
-#~ msgstr "Muokkaa ominaisuuksia"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Tuonnin aikana oli ristiriitoja."
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Palauta kaikkien valittujen objektien tila historialistassa valittuun "
-#~ "versioon."
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Palvelimeen ei voida yhdistää."
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Päivitä valintalista."
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Poista valittu taso."
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Aikaleimaa \"{0}\" ei voitu lukea pisteestä {1} x {2}"
-
-#~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-#~ msgstr ""
-#~ "OSM-tilin salasana. Jätä tyhjäksi, jos et halua tallentaa salasanaa."
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Tagien esivalintojen lähteet"
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Tagien esiasetusten lähde"
-
-#~ msgid "Add a new tagging preset source to the list."
-#~ msgstr "Lisää uusi tagien esivalintalähde listaan."
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Lataa puuttuvat liitännäiset"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Liitännäinen on jo olemassa"
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Lisää joko site-josm.xml tai Wiki-sivusto."
-
-#~ msgid "<p>Thank you for your understanding</p>"
-#~ msgstr "<p>Kiitos ymmärtyksestäsi!</p>"
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "Päivitettyjen liitännäisten aktivointi epäonnistui. Tarkista, että JOSM:"
-#~ "lla on oikeus korvata vanhat tiedostot."
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "Avaa tiedosto (gps-datana, jos *.gpx)"
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Liitännäistä ei voitu ladata: {0} kohteesta {1}"
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "Seuraavissa litännäisissä oli ongelmia:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Olet aikeissa poistaa pisteitä ladatun alueen ulkopuolelta.<br>Tämä voi "
-#~ "johtaa ongelmiin, koska objektit, joita et näe voivat käyttää niitä."
-#~ "<br>Oletko varma, että haluat poistaa ne?"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Virhe jäsennettäessä"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Voi muokata ainoastaan sivuja JOSM-verkko-ohjeesta"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "JOSM-verkko-ohje"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Yhdistetäänkö polut, joilla on eriävät jäsenyydet?"
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr "Liitännäistä ei voitu poistaa. Tee ongelmasta virheilmoitus."
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Varmista, että ilmoituksesa on ainakin seuraavat tiedot:"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Yhdistetäänkö pisteet, joilla on eriävät relaatiojäsenyydet?"
-
-#~ msgid "No data imported."
-#~ msgstr "Dataa ei tuotu."
-
-#~ msgid "Really mark this issue as ''done''?"
-#~ msgstr "Merkataanko tämä ongelma todella \"valmiiksi\"?"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Palvelimelta saatuja paikanhakutuloksia ei voida lukea"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Tarkista joko nykyinen valitna tai koko data."
-
-#~ msgid ""
-#~ "The selection contains {0} way. Are you sure you want to simplify it?"
-#~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them "
-#~ "all?"
-#~ msgstr[0] "Valinnassa on {0} polku. Haluatko varmasti yksinkertaistaa sen?"
-#~ msgstr[1] ""
-#~ "Valinnassa on {0} polkua. Haluatko varmasti yksinkertaistaa ne kaikki?"
-
-#~ msgid "Boat"
-#~ msgstr "Vene"
-
-#~ msgid "Motorboat"
-#~ msgstr "Moottorivene"
-
-#~ msgid "Bridleway"
-#~ msgstr "Ratsastustie"
-
-#~ msgid "Cycleway"
-#~ msgstr "Pyörätie"
-
-#~ msgid "Footway"
-#~ msgstr "Jalankulkutie"
-
-#~ msgid "Drawbridge"
-#~ msgstr "Laskusilta"
-
-#~ msgid "Shop"
-#~ msgstr "Kauppa"
-
-#~ msgid "map"
-#~ msgstr "kartta"
-
-#~ msgid "bicyclemap"
-#~ msgstr "pyöräkartta"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} objektilla on ristiriita:"
-#~ msgstr[1] "{0} objektilla on ristiriitoja:"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Käytä esivalintaa \"{0}\" ryhmästä \"{1}\""
-
-#~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
-#~ msgstr ""
-#~ "Päivitä JOSM ja liitännäiset uusimpiin versioihin ennen virheilmoituksen "
-#~ "kirjoittamista."
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "<member>-tagi muussa kuin relaatiossa."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Vääränlainen pisteen id"
-
-#~ msgid ""
-#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
-#~ "This can lead to nodes being deleted accidentally.\n"
-#~ "Are you really sure to continue?"
-#~ msgstr ""
-#~ "Valituilla poluilla on pisteitä ladatun alueen ulkopuolella.\n"
-#~ "Tämä voi mahdollisesti johtaa muiden polkujen käytössä olevien pisteiden "
-#~ "poistamiseen.\n"
-#~ "Oletko varma, että haluat jatkaa?"
-
-#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
-#~ msgstr "Lataa suoristetun kuvan Metacartan Map Rectifier WMS:stä"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr "Vihje: Osa muutoksista tuli lähetettäessä uutta dataa palvelimelle."
-
-#~ msgid "Occupied By"
-#~ msgstr "Jäsen"
-
-#~ msgid "Error: {0}"
-#~ msgstr "Virhe: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Varoitus: {0}"
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "Lähetä OSM-palvelimelle..."
-
-#~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr ""
-#~ "Liitännäinen {0} vaikuttaa rikkinäiseltä, tai sitä ei voitu ladata "
-#~ "automaattisesti."
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 46.1° and 57° only.\n"
-#~ "Use another projection system if you are not using\n"
-#~ "a French WMS server.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "Projektio \"{0}\" on suunniteltu käytettäväksi\n"
-#~ "vain leveysasteiden 46.1° ja 57° välillä.\n"
-#~ "Käytä muuta projektiota, jos et käytä\n"
-#~ "ranskalaista WMS-palvelinta.\n"
-#~ "Älä lähetä mitään dataa palvelimelle tämän viestin jälkeen."
-
-#~ msgid ""
-#~ "Plugin archive already available. Do you want to download the current "
-#~ "version by deleting existing archive?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Liitännäispaketti on jo saatavilla. Haluatko ladata uusimman version ja "
-#~ "poistaa nykyisen paketin?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "Päättävä sulkumerkki puuttuu."
-
-#~ msgid "Metacarta Map Rectifier image id"
-#~ msgstr "Metacarta Map Rectifier:in kuvatunnus (id)"
-
-#~ msgid "Way ''{0}'' with less than two points."
-#~ msgstr "Polussa \"{0}\" on vähemmän kuin kaksi pistettä."
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Muokkaajat: {0}"
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Komentolista: {0}"
-
-#~ msgid "Painting problem"
-#~ msgstr "Piirto-ongelma"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Ei mitään tallennettavaa: ei avoimia tiedostoja."
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Sisäinen virhe: tallennuskelpoisuuden tarkistus ei onnistu ilman avoimia "
-#~ "tasoja. Ole hyvä ja ilmoita tämä ohjelmistovirheenä."
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Valitse vähintään yksi ladattava tietolaji."
-
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "Avaa kuvia AgPifoJ:llä..."
-
-#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
-#~ msgstr "Avaa OpenStreetBugs-ikkuna ja aktivoi automaattinen lataus"
-
-#~ msgid "Synchronize Time with GPS Unit"
-#~ msgstr "Tahdista aika GPS-yksikön kanssa"
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "Ei voitu lukea URL:stä: \"{0}\""
-
-#~ msgid "Portcullis"
-#~ msgstr "Laskuristikko"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Tagit (tyhjä arvo poistaa tagin)"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Omien asetusten hakemistoa {0} ei voi avata."
-
-#~ msgid "Remove Selected"
-#~ msgstr "Poista valitut"
-
-#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
-#~ msgstr ""
-#~ "TÄMÄ ON KOKEELLINEN. Tallenna työsi ja tarkista lopputulos ennen "
-#~ "lähettämistä."
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Tee virheilmoitus osoitteessa {0}"
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "Null-osoitinpoikkeus, mahdollisesti puuttuvia tageja."
-
-#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr "Ohitetaan polku, jonka jotain pistettä ei ole olemassa: {0}\n"
-
-#~ msgid "Login"
-#~ msgstr "Kirjaudu sisään"
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Valitse ensin kirjanmerkki."
-
-#~ msgid "Move Down"
-#~ msgstr "Siirrä alaspäin"
-
-#~ msgid "Move Up"
-#~ msgstr "Siirrä ylöspäin"
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "Relaatioeditori: {0}"
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "Löytyi enemmän kuin yksi \"to\" -polku"
-
-#~ msgid "More than one \"from\" way found."
-#~ msgstr "Löytyi enemmän kuin yksi \"from\" -polku"
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Tuntematon rooli \"{0}\""
-
-#~ msgid "Edit Drawbridge"
-#~ msgstr "Muokkaa laskusillan ominaisuuksia"
-
-#~ msgid "Edit Portcullis"
-#~ msgstr "Muokkaa laskuristikkoa"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Yhdistä silti"
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr ""
-#~ "Valitse yksi tai useampi suljettu polku, joissa on vähintään neljä "
-#~ "pistettä."
-
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "Valitse ainakin yksi piste, polku tai relaatio. Vain jo aikaisemmin "
-#~ "lähetetyillä elementeillä on historia."
-
-#~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr ""
-#~ "Tämä toiminto vaatii {0} erillistä latauspyyntyöä. Oletko varma, että "
-#~ "haluat jatkaa?"
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Ei päivitettäviä karttatietoja. Et ole ladannut etkä avannut "
-#~ "karttatietoja."
-
-#~ msgid ""
-#~ "The sources (URL or filename) of tagging preset definition files. See "
-#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
-#~ msgstr ""
-#~ "Tagien esivalintatiedot (URL-osoite tai tiedostonimi). Lisätietoja "
-#~ "osoitteessa http://josm.openstreetmap.de/wiki/TaggingPresets"
-
-#~ msgid "Check if map painting found data errors."
-#~ msgstr ""
-#~ "Näytä kartan muokkausnäkymän piirrossa havaitut ongelmat tai puutteet."
-
-#~ msgid "Check for paint notes."
-#~ msgstr "Tarkista muokkausnäkymän piirto-ongelmat"
-
-#~ msgid "More than one \"via\" found."
-#~ msgstr "Useita \"via\" -jäseniä."
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "Ei \"to\"-roolin tietä."
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "Ei \"from\"-roolin tietä."
-
-#~ msgid "No \"via\" node or way found."
-#~ msgstr "Ei löytynyt pistettä tai tietä \"via\"-roolissa."
-
-#~ msgid "Non-Way ''{0}'' in multipolygon."
-#~ msgstr "Multipolygonissa jäsenenä muu kuin tie: {0}"
-
-#~ msgid "No outer way for multipolygon ''{0}''."
-#~ msgstr "Multipolygonilta \"{0}\" puuttuu jäsen \"outer\"-roolista."
-
-#~ msgid "Style for restriction {0} not found."
-#~ msgstr "Kiellolle {0} ei löydy piirtotyyliä."
-
-#~ msgid "Inner way ''{0}'' is outside."
-#~ msgstr "Inner-roolin tie \"{0}\" relaation teistä uloimpana."
-
-#~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
-#~ msgstr ""
-#~ "Nykyinen muutosten määrä ylittää muutosten enimmäismäärän, nykyinen on "
-#~ "{0}, enimmäismäärä on {1}"
-
-#~ msgid ""
-#~ "<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
-#~ "changeset will automatically be closed by the server after a timeout.</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Muutoskokoelman ''{0}'' sulkeminen epäonnistui OSM-palvelimella "
-#~ "''{1}''.<br>Palvelin sulkee muutoskokoelman automaattisesti aikarajan "
-#~ "umpeuduttua</html>"
-
-#~ msgid "Update Data"
-#~ msgstr "Päivitä data"
-
-#~ msgid "Download referrers from OSM..."
-#~ msgstr "Lataa viittaavat objektit OSM-palvelimelta..."
-
-#~ msgid "GPX Track loaded"
-#~ msgstr "GPX-jälki ladattu"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parametri ''{0}'' ei saa olla tyhjä"
-
-#~ msgid "Could not read ''{0}''."
-#~ msgstr "Ei voitu lukea \"{0}\":aa"
-
-#~ msgid "Update Selection"
-#~ msgstr "Päivitä valinta"
-
-#~ msgid "Updates the currently selected primitives from the server"
-#~ msgstr "Päivittää valitut objektit palvelimelta"
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr "Liitännäinen {0} tarvitsee vähintään version {1} JOSM:sta"
-
-#~ msgid "Plug-in named {0} is not available. Update skipped."
-#~ msgstr "Liitännäinen {0} ei ole saatavilla."
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.</html>"
-#~ msgstr ""
-#~ "<html>Kerroksessa \"{0}\" on ratkaisemattomia konflikteja.<br>Ratkaise ne "
-#~ "ensin.</html>"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "ld > 0 vaadittu, saatiin {0}"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "Odotettiin OsmDataLayer- tai GpxLayer-instanssia. Saatiin \"{0}\"."
-
-#~ msgid "Updating primitive"
-#~ msgstr "Päivitä objekti"
-
-#~ msgid "Uploading {0} objects ..."
-#~ msgstr "Lähetetään {0} objektia..."
-
-#~ msgid "Always move and don't show dialog again"
-#~ msgstr "Siirrä aina, äläkä näytä tätä kysymystä enää"
-
-#~ msgctxt "changeset.open"
-#~ msgid "Closed"
-#~ msgstr "Suljettu"
-
-#~ msgctxt "changeset.open"
-#~ msgid "Open"
-#~ msgstr "Avoin"
-
-#~ msgid "Enter a changset id"
-#~ msgstr "Anna muutoskokoelman ID"
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "Poistetut tai siirretyt objektit"
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" node."
-#~ msgstr ""
-#~ "\"via\" -roolin piste ei ole \"from\" -tien ensimmäinen eikä viimeinen."
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" node."
-#~ msgstr ""
-#~ "\"via\" -roolin piste ei ole \"to\" -tien ensimmäinen eikä viimeinen."
-
-#~ msgid "The \"from\" way does not start or end at the \"via\" way."
-#~ msgstr ""
-#~ "\"via\" -roolin piste ei ole \"from\" -tien ensimmäinen eikä viimeinen."
-
-#~ msgid "The \"to\" way does not start or end at the \"via\" way."
-#~ msgstr ""
-#~ "\"via\" -roolin piste ei ole \"to\" -tien ensimmäinen eikä viimeinen."
-
-#~ msgctxt "filter"
-#~ msgid "C"
-#~ msgstr "L"
-
-#~ msgid "Apply also for children"
-#~ msgstr "Sovella myös lapsikohteisiin"
-
-#~ msgid ""
 #~ "<html>There are {0} primitives in your local dataset which<br>might be "
 #~ "deleted on the server. If you later try to delete or<br>update them the "
@@ -34275,4 +34226,37 @@
 #~ "<strong>{2}</strong>.<br></html>"
 
+#~ msgid ""
+#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
+#~ "deleted on the server.<br><br>Do you want to undelete this too?"
+#~ msgid_plural ""
+#~ "There are {0} additional primitives referred to by relation {1}<br>which "
+#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
+#~ msgstr[0] ""
+#~ "Datajoukossa on vielä {0} objekti, johon viitataan<br>palvelimelta "
+#~ "poistetusta relaatiosta {1}.<br>Haluatko palauttaa relaation?"
+#~ msgstr[1] ""
+#~ "Datajoukossa on vielä {0} objektia, joihin viitataan<br>palvelimelta "
+#~ "poistetusta relaatiosta {1}.<br>Haluatko palauttaa relaation?"
+
+#~ msgid ""
+#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
+#~ "the dataset.<br>Do you agree?</html>"
+#~ msgstr ""
+#~ "<html>JOSMin täytyy poistaa tekemäsi paikallinen objekti {0}"
+#~ "<br>datajoukosta.<br>Toteutetaanko muutos?</html>"
+
+#~ msgid ""
+#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
+#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
+#~ "new id.<br>Do you agree?</html>"
+#~ msgstr ""
+#~ "<html>Jos haluat säilyttää tekemäsi paikallisen version,<br>JOSMin täytyy "
+#~ "asettaa objektin {0} tunniste nollaksi.<br>Seuraavan lähetyksen "
+#~ "yhteydessä palvelin asettaa<br>sille uuden tunnisteen.<br>Toteutetaanko "
+#~ "muutos?</html>"
+
+#~ msgid "Undelete dependent primitives?"
+#~ msgstr "Palautetaanko riippuvaiset objektit?"
+
 #~ msgid "Errors during Download"
 #~ msgstr "Virheitä latauksen aikana"
Index: applications/editors/josm/i18n/po/fr.po
===================================================================
--- applications/editors/josm/i18n/po/fr.po	(revision 22209)
+++ applications/editors/josm/i18n/po/fr.po	(revision 22278)
@@ -6,6 +6,6 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
-"PO-Revision-Date: 2010-06-28 16:46+0000\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
+"PO-Revision-Date: 2010-07-09 09:48+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Fr <>\n"
@@ -14,5 +14,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:07+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Language: French\n"
@@ -268,5 +268,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -662,9 +662,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1513,5 +1513,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2832,6 +2832,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2862,7 +2862,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "Entrer une expression"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -4486,5 +4485,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -5048,5 +5047,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -5058,5 +5057,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr "Descendre"
@@ -5679,5 +5678,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5785,9 +5784,9 @@
 msgstr "Résoudre les conflits pour ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr "Filtrer les objets et les masquer/désactiver."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5800,53 +5799,52 @@
 msgstr "Ajouter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr "Ajouter un filtre."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr "Modifier le filtre."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr "Supprimer le filtre."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr "Déplacer le filtre vers le haut."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr "Déplacer le filtre vers le bas."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr "Activer le filtre"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr "Masquer les éléments"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr "Inverser le filtre"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr "Mode filtre"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr "FIltre caché:{0} Désactivé:{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr "Erreur lors du chargement du fichier"
+msgstr ""
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5854,5 +5852,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5860,5 +5858,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5866,5 +5864,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5872,5 +5870,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5879,5 +5877,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5885,5 +5883,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5891,5 +5889,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5897,24 +5895,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filtre actif</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> objets cachés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> objets désactivés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -10789,10 +10787,10 @@
 msgstr[1] "{0} ont un attribut GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Supprimer le fichier de l'image du disque"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10803,5 +10801,5 @@
 "perdu !</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr "Le fichier de l'image n'a pas pu être supprimé."
@@ -13610,5 +13608,5 @@
 msgstr "Choisir une licence prédéfinie"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -13619,5 +13617,5 @@
 msgstr "Marqueurs de {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -13629,5 +13627,5 @@
 "partie du fichier sera disponible"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -13637,5 +13635,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -14376,9 +14374,9 @@
 msgstr "Récupération des données d’OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr "Préparation des données..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -15315,5 +15313,5 @@
 "{1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -15321,6 +15319,6 @@
 "Attention : l’ouverture du fichier zip ''{0}'' a échoué. Exception : {1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -15331,5 +15329,5 @@
 "sécurité. Exception : {1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -15869,4 +15867,16 @@
 "</html>"
 msgstr ""
+"<html>\n"
+"<div style=\"font-family: 'sans-serif'; font-weight: bold; font-style: "
+"italic;\">\n"
+"<span style=\"font-size: large;\">Bienvenue dans le greffon</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> <br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...ou plutot le bien nommé <br>\n"
+"Greffon <span style=\"font-size: large;\">AlignWayS(egments) [NDT] (Aligne "
+"Segments de Chemins)</span>...</span>\n"
+"</div>\n"
+"</html>"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:79
@@ -16098,7 +16108,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
-#, fuzzy
 msgid "on polygon"
-msgstr "Multipolygone"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
@@ -16117,15 +16126,14 @@
 msgstr "Bâtiments"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
-msgstr "Suivant"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr "Rue"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr ""
@@ -16308,5 +16316,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
@@ -18289,12 +18297,10 @@
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110
-#, fuzzy
 msgid "Create Stops from GTFS ..."
-msgstr "Créer des Stops depuis un fichier GPX"
+msgstr ""
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76
-#, fuzzy
 msgid "Create Stops from a GTFS file"
-msgstr "Créer des Stops depuis un fichier GPX"
+msgstr ""
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204
@@ -18305,7 +18311,6 @@
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85
-#, fuzzy
 msgid "GTFS-Stops"
-msgstr "Arrêts"
+msgstr ""
 
 #. item "Bicycle/Rental" text "Name"
@@ -20159,5 +20164,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:169
 msgid "Style for inner way equals multipolygon"
-msgstr ""
+msgstr "Le style du chemin intérieur est égal à \"multipolygon\""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:180
@@ -20187,5 +20192,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:230
 msgid "Non-Way in multipolygon"
-msgstr ""
+msgstr "Non-chemin dans le multipolygone"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:36
@@ -20390,9 +20395,9 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485
 msgid "Tag value longer than allowed"
-msgstr ""
+msgstr "Valeur de la balise plus longue qu'autorisée"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:491
 msgid "Tag key longer than allowed"
-msgstr ""
+msgstr "Clé de la balise plus longue qu'autorisée"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
@@ -27249,7 +27254,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "american_football"
-msgstr "football australien"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -27280,7 +27284,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "canadian_football"
-msgstr "football australien"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -27326,7 +27329,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "gaelic_football"
-msgstr "football australien"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -27372,7 +27374,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "rugby_union"
-msgstr "rugby"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -27862,35 +27863,29 @@
 
 #: build/trans_presets.java:2076
-#, fuzzy
 msgid "American Football"
-msgstr "Football australien"
+msgstr ""
 
 #. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-#, fuzzy
 msgid "Edit American Football"
-msgstr "Modifier le football australien"
+msgstr ""
 
 #: build/trans_presets.java:2082
-#, fuzzy
 msgid "Canadian Football"
-msgstr "Modifier le football américain"
+msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
 #: build/trans_presets.java:2083
-#, fuzzy
 msgid "Edit Canadian Football"
-msgstr "Modifier le football australien"
+msgstr ""
 
 #: build/trans_presets.java:2088
-#, fuzzy
 msgid "Gaelic Football"
-msgstr "Modifier le football américain"
+msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "Modifier le football américain"
+msgstr ""
 
 #: build/trans_presets.java:2094
@@ -27900,18 +27895,15 @@
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "Modifier le rugby"
+msgstr ""
 
 #: build/trans_presets.java:2100
-#, fuzzy
 msgid "Rugby Union"
-msgstr "Rugby"
+msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "Modifier le rugby"
+msgstr ""
 
 #: build/trans_presets.java:2106
@@ -34657,128 +34649,4 @@
 msgid "Sicily - Italy"
 msgstr "Sicile - Italie"
-
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr ""
-#~ "<html>Une erreur est survenue lors de la communication avec le "
-#~ "serveur<br>Détails :{0}</html>"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "La communication avec le serveur a échoué"
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Oui, les restaurer également"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "Non, annuler l’opération"
-
-#~ msgid ""
-#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
-#~ "server.<br><br>Do you want to undelete this node too?"
-#~ msgid_plural ""
-#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
-#~ "the server.<br><br>Do you want to undelete these nodes too?"
-#~ msgstr[0] ""
-#~ "{0} nœud utilisé sur le chemin {1}<br>a été supprimé sur le serveur."
-#~ "<br>Voulez-vous récupérer ce nœud ?"
-#~ msgstr[1] ""
-#~ "{0} nœuds utilisés sur le chemin {1}<br>ont été supprimé sur le serveur."
-#~ "<br>Voulez-vous récupérer ces nœuds ?"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Restaurer ces nœuds également ?"
-
-#~ msgid ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgid_plural ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
-#~ msgstr[0] ""
-#~ "{0} primitive se rapportant à la relation {1}<br>a été supprimée sur le "
-#~ "serveur.<br>Voulez-vous récupérer cette primitive ?"
-#~ msgstr[1] ""
-#~ "{0} primitives se rapportant à la relation {1}<br>ont été supprimées sur "
-#~ "le serveur.<br>Voulez-vous récupérer ces primitives ?"
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Restaurer les primitives ?"
-
-#~ msgid "Visible State:"
-#~ msgstr "État visible :"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "visible (sur le serveur)"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "non visible (sur le serveur)"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Garder une copie de la version locale"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Supprimer physiquement du jeu de données local"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "Conserver mon état de visibilité"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Oui, réinitialiser l’identifiant"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "Réinitialisation de l’identifiant à 0"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "Conserver l’état de visbilité du serveur"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Oui, le supprimer"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSM doit supprimer votre primitive locale avec l’identifiant {0}"
-#~ "<br>du jeu de données.<br>Êtes-vous d’accord ?</html>"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Suppression du jeu de données"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "Conflit non résolu entre deux états de visiblité"
-
-#~ msgid ""
-#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
-#~ "{0} object<br>from the local dataset because it is deleted on the server."
-#~ msgid_plural ""
-#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
-#~ "purging {0} objects<br> from the local dataset because they are deleted "
-#~ "on the server."
-#~ msgstr[0] ""
-#~ "{0} conflit a été <strong>résolu automatiquement</strong> en enlevant {0} "
-#~ "objet<br>du jeu de données car il était supprimé sur le serveur."
-#~ msgstr[1] ""
-#~ "{0} conflits ont été <strong>résolus automatiquement</strong> en enlevant "
-#~ "{0} objets<br>du jeu de données car ils étaient supprimés sur le serveur."
-
-#~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "{0} conflit reste non résolu.<br>Veuillez ouvrir la fenêtre Listes des "
-#~ "conflits pour le résoudre manuellement."
-#~ msgstr[1] ""
-#~ "{0} conflits restent non résolus.<br>Veuillez ouvrir la fenêtre Listes "
-#~ "des conflits pour les résoudre manuellement."
-
-#~ msgid "football"
-#~ msgstr "football américain"
-
-#~ msgid "Football"
-#~ msgstr "Football américain"
 
 #~ msgid "Move"
@@ -35907,4 +35775,13 @@
 #~ msgstr "Restauration de la relation..."
 
+#~ msgid "Yes, undelete them too"
+#~ msgstr "Oui, les restaurer également"
+
+#~ msgid "No, cancel operation"
+#~ msgstr "Non, annuler l’opération"
+
+#~ msgid "Undelete additional nodes?"
+#~ msgstr "Restaurer ces nœuds également ?"
+
 #~ msgid "Undeleting Way..."
 #~ msgstr "Restauration du chemin..."
@@ -35912,4 +35789,7 @@
 #~ msgid "Checking whether primitive {0} is gone ..."
 #~ msgstr "Vérification si la primitive {0} est supprimée..."
+
+#~ msgid "Undelete dependent primitives?"
+#~ msgstr "Restaurer les primitives ?"
 
 #~ msgid ""
@@ -36073,4 +35953,34 @@
 #~ msgstr "suppression de la référence du chemin {0}"
 
+#~ msgid "Keep a clone of the local version"
+#~ msgstr "Garder une copie de la version locale"
+
+#~ msgid "not visible (on the server)"
+#~ msgstr "non visible (sur le serveur)"
+
+#~ msgid "visible (on the server)"
+#~ msgstr "visible (sur le serveur)"
+
+#~ msgid "Communication with server failed"
+#~ msgstr "La communication avec le serveur a échoué"
+
+#~ msgid "Yes, purge it"
+#~ msgstr "Oui, le supprimer"
+
+#~ msgid "Remove from dataset"
+#~ msgstr "Suppression du jeu de données"
+
+#~ msgid "Visible State:"
+#~ msgstr "État visible :"
+
+#~ msgid "Keep my visible state"
+#~ msgstr "Conserver mon état de visibilité"
+
+#~ msgid "Physically delete from local dataset"
+#~ msgstr "Supprimer physiquement du jeu de données local"
+
+#~ msgid "Undecide conflict between visible state"
+#~ msgstr "Conflit non résolu entre deux états de visiblité"
+
 #~ msgid "Conflict created"
 #~ msgstr "conflit créé"
@@ -36408,4 +36318,7 @@
 #~ "Le chemin \"from\" ne commence ou ne fini pas par le chemin \"via\"."
 
+#~ msgid "Keep their visible state"
+#~ msgstr "Conserver l’état de visbilité du serveur"
+
 #~ msgid "GPS point"
 #~ msgstr "Point GPS"
@@ -36453,4 +36366,10 @@
 #~ msgstr "Utiliser tous leurs éléments"
 
+#~ msgid "Football"
+#~ msgstr "Football américain"
+
+#~ msgid "football"
+#~ msgstr "football américain"
+
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Pile de commandes : {0}"
@@ -36478,4 +36397,18 @@
 #~ msgstr "Erreur de syntaxe du motif : le motif {0} dans {1} est erroné !"
 
+#~ msgid ""
+#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
+#~ "{0} object<br>from the local dataset because it is deleted on the server."
+#~ msgid_plural ""
+#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
+#~ "purging {0} objects<br> from the local dataset because they are deleted "
+#~ "on the server."
+#~ msgstr[0] ""
+#~ "{0} conflit a été <strong>résolu automatiquement</strong> en enlevant {0} "
+#~ "objet<br>du jeu de données car il était supprimé sur le serveur."
+#~ msgstr[1] ""
+#~ "{0} conflits ont été <strong>résolus automatiquement</strong> en enlevant "
+#~ "{0} objets<br>du jeu de données car ils étaient supprimés sur le serveur."
+
 #~ msgid "More than one \"via\" found."
 #~ msgstr "Plus d’un chemin \"via\" trouvé."
@@ -36486,4 +36419,30 @@
 #~ msgid "The \"from\" way does not start or end at a \"via\" node."
 #~ msgstr "Le chemin \"from\" ne commence ou ne fini pas par un nœud \"via\"."
+
+#~ msgid ""
+#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
+#~ "deleted on the server.<br><br>Do you want to undelete this too?"
+#~ msgid_plural ""
+#~ "There are {0} additional primitives referred to by relation {1}<br>which "
+#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
+#~ msgstr[0] ""
+#~ "{0} primitive se rapportant à la relation {1}<br>a été supprimée sur le "
+#~ "serveur.<br>Voulez-vous récupérer cette primitive ?"
+#~ msgstr[1] ""
+#~ "{0} primitives se rapportant à la relation {1}<br>ont été supprimées sur "
+#~ "le serveur.<br>Voulez-vous récupérer ces primitives ?"
+
+#~ msgid ""
+#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
+#~ "server.<br><br>Do you want to undelete this node too?"
+#~ msgid_plural ""
+#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
+#~ "the server.<br><br>Do you want to undelete these nodes too?"
+#~ msgstr[0] ""
+#~ "{0} nœud utilisé sur le chemin {1}<br>a été supprimé sur le serveur."
+#~ "<br>Voulez-vous récupérer ce nœud ?"
+#~ msgstr[1] ""
+#~ "{0} nœuds utilisés sur le chemin {1}<br>ont été supprimé sur le serveur."
+#~ "<br>Voulez-vous récupérer ces nœuds ?"
 
 #~ msgid ""
@@ -36501,9 +36460,42 @@
 #~ "<strong>{2}</strong> pour ignorer.<br></html>"
 
+#~ msgid ""
+#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
+#~ "Dialog and manually resolve it."
+#~ msgid_plural ""
+#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
+#~ "Dialog and manually resolve them."
+#~ msgstr[0] ""
+#~ "{0} conflit reste non résolu.<br>Veuillez ouvrir la fenêtre Listes des "
+#~ "conflits pour le résoudre manuellement."
+#~ msgstr[1] ""
+#~ "{0} conflits restent non résolus.<br>Veuillez ouvrir la fenêtre Listes "
+#~ "des conflits pour les résoudre manuellement."
+
+#~ msgid "Reset id to 0"
+#~ msgstr "Réinitialisation de l’identifiant à 0"
+
+#~ msgid "Yes, reset the id"
+#~ msgstr "Oui, réinitialiser l’identifiant"
+
 #~ msgid "Uploading {0} objects ..."
 #~ msgstr "Envoi de {0} objets..."
 
+#~ msgid ""
+#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
+#~ "the dataset.<br>Do you agree?</html>"
+#~ msgstr ""
+#~ "<html>JOSM doit supprimer votre primitive locale avec l’identifiant {0}"
+#~ "<br>du jeu de données.<br>Êtes-vous d’accord ?</html>"
+
 #~ msgid "Style for outer way ''{0}'' mismatches."
 #~ msgstr "Le modèle du chemin extérieur \"{0}\" ne correspond pas."
+
+#~ msgid ""
+#~ "<html>An error occurred while communicating with the server<br>Details: "
+#~ "{0}</html>"
+#~ msgstr ""
+#~ "<html>Une erreur est survenue lors de la communication avec le "
+#~ "serveur<br>Détails :{0}</html>"
 
 #~ msgid "Point on angle of building to start drawing"
Index: applications/editors/josm/i18n/po/gl.po
===================================================================
--- applications/editors/josm/i18n/po/gl.po	(revision 22209)
+++ applications/editors/josm/i18n/po/gl.po	(revision 22278)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
 "PO-Revision-Date: 2010-06-15 17:32+0000\n"
 "Last-Translator: Dario <dario.villar.v@gmail.com>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:11+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -268,5 +268,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -660,9 +660,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1510,5 +1510,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2811,6 +2811,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2841,7 +2841,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "Introduce a expresion de búsqueda"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -4441,5 +4440,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -5005,5 +5004,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -5015,5 +5014,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr "Abaixo"
@@ -5637,5 +5636,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5744,9 +5743,9 @@
 msgstr "Resolver conflictos de ''{0}'"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr "Filtrar obxectos e agochaos/desactivaos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5759,53 +5758,52 @@
 msgstr "Engadir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr "Engadir filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr "Editar filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr "Borrar filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr "Subir filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr "Baixar filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr "Activar filtro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr "Ocultar elementos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr "Invertir filtro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr "Modo de filtro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr "Filtro Agochado:{0} Desactivado:{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr "Erro cargando ficheiro"
+msgstr ""
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5813,5 +5811,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5819,5 +5817,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5825,5 +5823,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5831,5 +5829,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5838,5 +5836,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5844,5 +5842,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5850,5 +5848,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5856,24 +5854,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filtro Activo</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b>obxectos agochados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> obxectos deshabilitados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -10487,10 +10485,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10499,5 +10497,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr ""
@@ -13082,5 +13080,5 @@
 msgstr "Escoller unha licencia predefinida"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -13091,5 +13089,5 @@
 msgstr "Marcas de {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -13099,5 +13097,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -13107,5 +13105,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -13790,9 +13788,9 @@
 msgstr "Procesando daros de OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr "Preparando o conxunto de cambios..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14627,11 +14625,11 @@
 "Non se puido atopar traducción para a localización {0}. Volvendo a {1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -14640,5 +14638,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -15324,7 +15322,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
-#, fuzzy
 msgid "on polygon"
-msgstr "Convertir a un multipolígono"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
@@ -15343,15 +15340,14 @@
 msgstr "Construccións"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
-msgstr "Seguinte"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr ""
@@ -15524,5 +15520,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
@@ -17418,12 +17414,10 @@
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110
-#, fuzzy
 msgid "Create Stops from GTFS ..."
-msgstr "Crear paradas desde GPX..."
+msgstr ""
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76
-#, fuzzy
 msgid "Create Stops from a GTFS file"
-msgstr "Crear paradas desde un arquivo GPX"
+msgstr ""
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204
@@ -17434,7 +17428,6 @@
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85
-#, fuzzy
 msgid "GTFS-Stops"
-msgstr "Paradas"
+msgstr ""
 
 #. item "Bicycle/Rental" text "Name"
@@ -26182,7 +26175,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "american_football"
-msgstr "fútbol australiano"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26213,7 +26205,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "canadian_football"
-msgstr "fútbol australiano"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26259,7 +26250,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "gaelic_football"
-msgstr "fútbol australiano"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26305,7 +26295,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "rugby_union"
-msgstr "rugby"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26795,35 +26784,29 @@
 
 #: build/trans_presets.java:2076
-#, fuzzy
 msgid "American Football"
-msgstr "Fútbol australiano"
+msgstr ""
 
 #. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-#, fuzzy
 msgid "Edit American Football"
-msgstr "Editar fútbol australiano"
+msgstr ""
 
 #: build/trans_presets.java:2082
-#, fuzzy
 msgid "Canadian Football"
-msgstr "Editar fútbol americano"
+msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
 #: build/trans_presets.java:2083
-#, fuzzy
 msgid "Edit Canadian Football"
-msgstr "Editar fútbol australiano"
+msgstr ""
 
 #: build/trans_presets.java:2088
-#, fuzzy
 msgid "Gaelic Football"
-msgstr "Editar fútbol americano"
+msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "Editar fútbol americano"
+msgstr ""
 
 #: build/trans_presets.java:2094
@@ -26833,18 +26816,15 @@
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "Editar rugby"
+msgstr ""
 
 #: build/trans_presets.java:2100
-#, fuzzy
 msgid "Rugby Union"
-msgstr "Rugby"
+msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "Editar rugby"
+msgstr ""
 
 #: build/trans_presets.java:2106
@@ -33590,101 +33570,4 @@
 msgstr "Sicilia - Italia"
 
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr ""
-#~ "<html>Ocurriu un erro mentres se comunicaba co servidor<br>Detalles: {0} "
-#~ "</html>"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "Comunicación fallida co servidor"
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Si, desfacer o borrado de eles tamén"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "Non, cancelar a operación"
-
-#~ msgid ""
-#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
-#~ "server.<br><br>Do you want to undelete this node too?"
-#~ msgid_plural ""
-#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
-#~ "the server.<br><br>Do you want to undelete these nodes too?"
-#~ msgstr[0] ""
-#~ "Hai {0} nodo adicional usado pola vía {1}<br>que foi eliminado no "
-#~ "servidor.<br><br>Quere que ese nodo volva a existir?"
-#~ msgstr[1] ""
-#~ "Hai {0} nodos adicionais usados pola vía {1}<br>que foron eliminados no "
-#~ "servidor.<br><br>Quere que eses nodos volvan a existir?"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Desfacer o borrado de nodos adicionais?"
-
-#~ msgid ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgid_plural ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
-#~ msgstr[0] ""
-#~ "Hay {0} primitiva adicional referida na relación a {1}<br>a cal está "
-#~ "borrada no servidor.<br><br>Desexa recuperala tamén?"
-#~ msgstr[1] ""
-#~ "Hay {0} primitivas adicionais referidas nas relacións a {1}<br>as cales "
-#~ "están borradas no servidor.<br><br>Desexa recuperalas tamén?"
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Desfacer o borrado de primitivas dependentes?"
-
-#~ msgid "Visible State:"
-#~ msgstr "Estado visible:"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "visible (no servidor)"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "non visible (no servidor)"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Manter unha copia da versión local"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Eliminar fisicamente do conxunto de cambios local"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "Manter o meu estado visible"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Sí, reiniciar  o id"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "Reiniciar o id a 0"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "Mantener o seu estado visible"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Sí, purgalo"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSM terá que borrar a túa primitiva local con id {0}<br>do "
-#~ "conxunto de datos.<br>Esta de acordo?</html>"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Eliminar do conxunto de datos"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "Conflicto entre estados visibles sen resolver"
-
-#~ msgid "football"
-#~ msgstr "fútbol"
-
-#~ msgid "Football"
-#~ msgstr "Fútbol americano"
-
 #~ msgid "Do not show again"
 #~ msgstr "Non amosar de novo"
@@ -34234,4 +34117,13 @@
 #~ msgstr "Comprobando se o nodo {0} falta ..."
 
+#~ msgid "Yes, undelete them too"
+#~ msgstr "Si, desfacer o borrado de eles tamén"
+
+#~ msgid "No, cancel operation"
+#~ msgstr "Non, cancelar a operación"
+
+#~ msgid "Undelete additional nodes?"
+#~ msgstr "Desfacer o borrado de nodos adicionais?"
+
 #~ msgid "Undeleting relation..."
 #~ msgstr "Desfacendo o borrado da relación.."
@@ -34239,4 +34131,7 @@
 #~ msgid "Checking whether primitive {0} is gone ..."
 #~ msgstr "Comprobando se a primitiva {0} falta ..."
+
+#~ msgid "Undelete dependent primitives?"
+#~ msgstr "Desfacer o borrado de primitivas dependentes?"
 
 #~ msgid ""
@@ -34414,4 +34309,34 @@
 #~ msgstr "O estilo da vía exterior \"{0}\" non coincide."
 
+#~ msgid "Communication with server failed"
+#~ msgstr "Comunicación fallida co servidor"
+
+#~ msgid "not visible (on the server)"
+#~ msgstr "non visible (no servidor)"
+
+#~ msgid "visible (on the server)"
+#~ msgstr "visible (no servidor)"
+
+#~ msgid "Visible State:"
+#~ msgstr "Estado visible:"
+
+#~ msgid "Keep a clone of the local version"
+#~ msgstr "Manter unha copia da versión local"
+
+#~ msgid "Keep their visible state"
+#~ msgstr "Mantener o seu estado visible"
+
+#~ msgid "Reset id to 0"
+#~ msgstr "Reiniciar o id a 0"
+
+#~ msgid "Yes, purge it"
+#~ msgstr "Sí, purgalo"
+
+#~ msgid "Keep my visible state"
+#~ msgstr "Manter o meu estado visible"
+
+#~ msgid "Yes, reset the id"
+#~ msgstr "Sí, reiniciar  o id"
+
 #~ msgid ""
 #~ "<html>There are {0} primitives in your local dataset which<br>might be "
@@ -34428,4 +34353,59 @@
 #~ "<br></html>"
 
+#~ msgid "Football"
+#~ msgstr "Fútbol americano"
+
+#~ msgid "football"
+#~ msgstr "fútbol"
+
+#~ msgid ""
+#~ "<html>An error occurred while communicating with the server<br>Details: "
+#~ "{0}</html>"
+#~ msgstr ""
+#~ "<html>Ocurriu un erro mentres se comunicaba co servidor<br>Detalles: {0} "
+#~ "</html>"
+
+#~ msgid ""
+#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
+#~ "server.<br><br>Do you want to undelete this node too?"
+#~ msgid_plural ""
+#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
+#~ "the server.<br><br>Do you want to undelete these nodes too?"
+#~ msgstr[0] ""
+#~ "Hai {0} nodo adicional usado pola vía {1}<br>que foi eliminado no "
+#~ "servidor.<br><br>Quere que ese nodo volva a existir?"
+#~ msgstr[1] ""
+#~ "Hai {0} nodos adicionais usados pola vía {1}<br>que foron eliminados no "
+#~ "servidor.<br><br>Quere que eses nodos volvan a existir?"
+
+#~ msgid "Physically delete from local dataset"
+#~ msgstr "Eliminar fisicamente do conxunto de cambios local"
+
+#~ msgid ""
+#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
+#~ "the dataset.<br>Do you agree?</html>"
+#~ msgstr ""
+#~ "<html>JOSM terá que borrar a túa primitiva local con id {0}<br>do "
+#~ "conxunto de datos.<br>Esta de acordo?</html>"
+
+#~ msgid "Undecide conflict between visible state"
+#~ msgstr "Conflicto entre estados visibles sen resolver"
+
+#~ msgid "Remove from dataset"
+#~ msgstr "Eliminar do conxunto de datos"
+
 #~ msgid "Apply also for children"
 #~ msgstr "Aplicar tamen aos fillos"
+
+#~ msgid ""
+#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
+#~ "deleted on the server.<br><br>Do you want to undelete this too?"
+#~ msgid_plural ""
+#~ "There are {0} additional primitives referred to by relation {1}<br>which "
+#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
+#~ msgstr[0] ""
+#~ "Hay {0} primitiva adicional referida na relación a {1}<br>a cal está "
+#~ "borrada no servidor.<br><br>Desexa recuperala tamén?"
+#~ msgstr[1] ""
+#~ "Hay {0} primitivas adicionais referidas nas relacións a {1}<br>as cales "
+#~ "están borradas no servidor.<br><br>Desexa recuperalas tamén?"
Index: applications/editors/josm/i18n/po/he.po
===================================================================
--- applications/editors/josm/i18n/po/he.po	(revision 22209)
+++ applications/editors/josm/i18n/po/he.po	(revision 22278)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
-"PO-Revision-Date: 2010-06-28 16:34+0000\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
+"PO-Revision-Date: 2010-07-06 17:31+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:12+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -265,5 +265,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -651,9 +651,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1464,5 +1464,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2700,6 +2700,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2730,7 +2730,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "ביטוי רגולרי"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -4253,5 +4252,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -4785,5 +4784,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -4795,5 +4794,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr "מטה"
@@ -5374,5 +5373,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5471,9 +5470,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5486,53 +5485,52 @@
 msgstr "הוסף"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr "שגיאה בטעינת קובץ"
+msgstr ""
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5540,5 +5538,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5546,5 +5544,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5552,5 +5550,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5558,5 +5556,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5565,5 +5563,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5571,5 +5569,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5577,5 +5575,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5583,24 +5581,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -10145,10 +10143,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10157,5 +10155,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr ""
@@ -12693,5 +12691,5 @@
 msgstr "בחר רשיון המוגדר מראש"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -12702,5 +12700,5 @@
 msgstr "סמנים מהמיקום {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -12710,5 +12708,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -12718,5 +12716,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -13371,9 +13369,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14164,11 +14162,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -14177,5 +14175,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -14877,15 +14875,14 @@
 msgstr "מבנים"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
-msgstr "הבאה"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr ""
@@ -15050,5 +15047,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
@@ -25680,7 +25677,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "american_football"
-msgstr "כדורגל אוסטרלי"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -25711,7 +25707,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "canadian_football"
-msgstr "כדורגל אוסטרלי"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -25757,7 +25752,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "gaelic_football"
-msgstr "כדורגל אוסטרלי"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -25803,7 +25797,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "rugby_union"
-msgstr "רוגבי"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26293,35 +26286,29 @@
 
 #: build/trans_presets.java:2076
-#, fuzzy
 msgid "American Football"
-msgstr "כדורגל אוסטרלי"
+msgstr ""
 
 #. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-#, fuzzy
 msgid "Edit American Football"
-msgstr "ערוך כדורגל אוסטרלי"
+msgstr ""
 
 #: build/trans_presets.java:2082
-#, fuzzy
 msgid "Canadian Football"
-msgstr "ערוך כדורגל אמריקאי"
+msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
 #: build/trans_presets.java:2083
-#, fuzzy
 msgid "Edit Canadian Football"
-msgstr "ערוך כדורגל אוסטרלי"
+msgstr ""
 
 #: build/trans_presets.java:2088
-#, fuzzy
 msgid "Gaelic Football"
-msgstr "ערוך כדורגל אמריקאי"
+msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "ערוך כדורגל אמריקאי"
+msgstr ""
 
 #: build/trans_presets.java:2094
@@ -26331,18 +26318,15 @@
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "ערוך רוגבי"
+msgstr ""
 
 #: build/trans_presets.java:2100
-#, fuzzy
 msgid "Rugby Union"
-msgstr "רוגבי"
+msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "ערוך רוגבי"
+msgstr ""
 
 #: build/trans_presets.java:2106
@@ -33088,19 +33072,4 @@
 msgstr ""
 
-#~ msgid "Yes, undelete them too"
-#~ msgstr "כן, בטל גם את המחיקה שלהם"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "לא, בטל את הפעולה"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "בטל מחיקת נקודות נוספות?"
-
-#~ msgid "football"
-#~ msgstr "כדורגל אמריקאי"
-
-#~ msgid "Football"
-#~ msgstr "כדורגל אמריקאי"
-
 #~ msgid "Move"
 #~ msgstr "הזז"
@@ -33634,4 +33603,10 @@
 #~ msgstr "מפת רכיבה"
 
+#~ msgid "football"
+#~ msgstr "כדורגל אמריקאי"
+
+#~ msgid "Football"
+#~ msgstr "כדורגל אמריקאי"
+
 #~ msgid "Edit Demanding Alpine Hiking"
 #~ msgstr "ערוך צעידה אלפינית מאומצת"
@@ -33660,4 +33635,13 @@
 #~ msgid "Undeleting relation..."
 #~ msgstr "ביטול מחיקת יחס..."
+
+#~ msgid "Yes, undelete them too"
+#~ msgstr "כן, בטל גם את המחיקה שלהם"
+
+#~ msgid "No, cancel operation"
+#~ msgstr "לא, בטל את הפעולה"
+
+#~ msgid "Undelete additional nodes?"
+#~ msgstr "בטל מחיקת נקודות נוספות?"
 
 #~ msgid "Update Selection"
Index: applications/editors/josm/i18n/po/is.po
===================================================================
--- applications/editors/josm/i18n/po/is.po	(revision 22209)
+++ applications/editors/josm/i18n/po/is.po	(revision 22278)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
-"PO-Revision-Date: 2010-06-28 16:23+0000\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
+"PO-Revision-Date: 2010-07-06 16:37+0000\n"
 "Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n"
 "Language-Team: Icelandic <is@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:06+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -261,5 +261,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -651,9 +651,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1464,5 +1464,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2707,6 +2707,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2737,7 +2737,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "regluleg segð"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -4254,5 +4253,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -4778,5 +4777,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -4788,5 +4787,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr ""
@@ -5367,5 +5366,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5464,9 +5463,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5479,46 +5478,46 @@
 msgstr "Bæta við"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
 msgstr ""
@@ -5526,5 +5525,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5532,5 +5531,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5538,5 +5537,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5544,5 +5543,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5550,5 +5549,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5557,5 +5556,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5563,5 +5562,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5569,5 +5568,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5575,24 +5574,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -10141,10 +10140,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10153,5 +10152,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr ""
@@ -12688,5 +12687,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -12697,5 +12696,5 @@
 msgstr "Punktar frá {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -12705,5 +12704,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -12713,5 +12712,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -13366,9 +13365,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr "Undirbý gögn..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14160,11 +14159,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -14173,5 +14172,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -14855,7 +14854,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
-#, fuzzy
 msgid "on polygon"
-msgstr "Marghyrningur"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
@@ -14874,15 +14872,14 @@
 msgstr "Byggingar"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
-msgstr "Næsta"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr ""
@@ -15047,5 +15044,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
@@ -25665,7 +25662,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "american_football"
-msgstr "ástralskur fótbolti"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -25696,7 +25692,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "canadian_football"
-msgstr "ástralskur fótbolti"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -25742,7 +25737,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "gaelic_football"
-msgstr "ástralskur fótbolti"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26277,35 +26271,29 @@
 
 #: build/trans_presets.java:2076
-#, fuzzy
 msgid "American Football"
-msgstr "Ástralskur fótbolti"
+msgstr ""
 
 #. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-#, fuzzy
 msgid "Edit American Football"
-msgstr "Breyti Áströlskum fótbolta"
+msgstr ""
 
 #: build/trans_presets.java:2082
-#, fuzzy
 msgid "Canadian Football"
-msgstr "Breyti Amerískum fótbolta"
+msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
 #: build/trans_presets.java:2083
-#, fuzzy
 msgid "Edit Canadian Football"
-msgstr "Breyti Áströlskum fótbolta"
+msgstr ""
 
 #: build/trans_presets.java:2088
-#, fuzzy
 msgid "Gaelic Football"
-msgstr "Breyti Amerískum fótbolta"
+msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "Breyti Amerískum fótbolta"
+msgstr ""
 
 #: build/trans_presets.java:2094
@@ -26315,7 +26303,6 @@
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "Breyti smásölulandnýtingu"
+msgstr ""
 
 #: build/trans_presets.java:2100
@@ -26325,7 +26312,6 @@
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "Breyti svæði"
+msgstr ""
 
 #: build/trans_presets.java:2106
@@ -33071,10 +33057,4 @@
 msgstr ""
 
-#~ msgid "football"
-#~ msgstr "fótbolti"
-
-#~ msgid "Football"
-#~ msgstr "Amerískur fótbolti"
-
 #~ msgid "Incorrect password or username."
 #~ msgstr "Rangt lykilorð eða notandanafn"
@@ -33268,4 +33248,7 @@
 #~ "fyrir það?"
 
+#~ msgid "Football"
+#~ msgstr "Amerískur fótbolti"
+
 #~ msgid "Sync clock"
 #~ msgstr "Samstilla klukkur"
@@ -33393,4 +33376,7 @@
 #~ msgid "Please select the row to copy."
 #~ msgstr "Veldu hlut til að afrita fyrst."
+
+#~ msgid "football"
+#~ msgstr "fótbolti"
 
 #~ msgid ""
Index: applications/editors/josm/i18n/po/it.po
===================================================================
--- applications/editors/josm/i18n/po/it.po	(revision 22209)
+++ applications/editors/josm/i18n/po/it.po	(revision 22278)
@@ -5,7 +5,7 @@
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
-"PO-Revision-Date: 2010-06-29 20:25+0000\n"
-"Last-Translator: Miellino <Unknown>\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
+"PO-Revision-Date: 2010-07-09 13:59+0000\n"
+"Last-Translator: Davide Prade <davalv@alice.it>\n"
 "Language-Team: Italian <talk-it@lists.openstreetmap.org>\n"
 "MIME-Version: 1.0\n"
@@ -13,5 +13,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:11+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -267,5 +267,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -660,9 +660,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1515,5 +1515,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2847,6 +2847,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2875,9 +2875,11 @@
 " {0}"
 msgstr ""
+"L''espressione di ricerca non è valida: \n"
+"\n"
+" {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "Inserire una espressione di ricerca"
+msgstr "Espressione di ricerca non valida"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -4501,5 +4503,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -5072,5 +5074,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -5082,5 +5084,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr "Giù"
@@ -5717,5 +5719,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5824,9 +5826,9 @@
 msgstr "Risolvi i conflitti per ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr "Filtra oggetti e nascondili/disabilitali."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5839,53 +5841,52 @@
 msgstr "Aggiungi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr "Aggiungi filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr "Modifica filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr "Elimina filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr "Sposta filtro in alto."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr "Sposta filtro in basso."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr "Abilita filtro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr "Nascondi elementi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr "Filtro inverso"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr "Modalità filtro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr "Filtri nascosti:{0} Disabilitati:{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr "Errore durante il caricamento del file"
+msgstr "Errore nel filtro"
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5893,5 +5894,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5899,5 +5900,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5905,5 +5906,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5911,5 +5912,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5918,5 +5919,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5924,5 +5925,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5930,5 +5931,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5936,24 +5937,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filtro attivo</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> oggetti nascosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> oggetti disabilitati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -10872,10 +10873,10 @@
 msgstr[1] "Trovate {0} contenti informazioni GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Elimina il file immagine dal disco"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10886,5 +10887,5 @@
 "definitivamente perduto!</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr "Il file dell''immagine non può essere eliminato."
@@ -13752,5 +13753,5 @@
 msgstr "Scegliere una licenza predefinita"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -13761,5 +13762,5 @@
 msgstr "Marcatori da {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -13771,5 +13772,5 @@
 "disponibile solamente parte del file"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -13779,5 +13780,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -14510,9 +14511,9 @@
 msgstr "Analisi dei dati OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr "Preparazione dell''insieme di dati..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -15460,5 +15461,5 @@
 "{1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -15467,6 +15468,6 @@
 "{1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -15477,5 +15478,5 @@
 "sicurezza. L''eccezione è stata: {1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -16282,5 +16283,5 @@
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:381
 msgid "Point on opposite end of the building"
-msgstr ""
+msgstr "Posizionati sull''angolo opposto dell'edificio"
 
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:383
@@ -16289,7 +16290,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
-#, fuzzy
 msgid "on polygon"
-msgstr "Multi-poligono"
+msgstr "sul poligono"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
@@ -16299,5 +16299,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96
 msgid "Helping tool for tag address"
-msgstr ""
+msgstr "Strumento per etichettare l''indirizzo"
 
 #. group "Man-Made"
@@ -16308,15 +16308,14 @@
 msgstr "Edifici"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
-msgstr "Successivo"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+msgstr "Prossimo numero"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr "Strada"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr "Inserisci indirizzo"
@@ -16498,6 +16497,9 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
-msgstr ""
+#, fuzzy
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
+msgstr ""
+"Non utilizzare la relazione per gli indirizzi (bensì \"addr:street\" sui "
+"nodi)."
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -16825,5 +16827,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342
 msgid "Enable this to use the tag \"add:street\" on nodes."
-msgstr ""
+msgstr "Seleziona questo per utilizzare l''etichetta \"add:street\" sui nodi."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81
@@ -18475,12 +18477,10 @@
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110
-#, fuzzy
 msgid "Create Stops from GTFS ..."
-msgstr "Crea fermate da GPX ..."
+msgstr "Crea fermate da GTFS ..."
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76
-#, fuzzy
 msgid "Create Stops from a GTFS file"
-msgstr "Crea fermate da file GPX"
+msgstr "Crea fermate da un file GTFS"
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204
@@ -18491,7 +18491,6 @@
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85
-#, fuzzy
 msgid "GTFS-Stops"
-msgstr "Fermate"
+msgstr "Fermate GTFS"
 
 #. item "Bicycle/Rental" text "Name"
@@ -18720,20 +18719,20 @@
 #, java-format
 msgid "Could not read tagging preset source: ''{0}''"
-msgstr ""
+msgstr "Impossibile leggere la sorgente delle etichette preimpostate: \"{0}\""
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:97
 #, java-format
 msgid "Error parsing tagging preset from ''{0}'':\n"
-msgstr ""
+msgstr "Errore nell''analisi delle etichette preimpostate da ''{0}'':\n"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107
 #, java-format
 msgid "Sign {0}"
-msgstr ""
+msgstr "Segnale stradale {0}"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114
 #, java-format
 msgid "Additional sign {0}"
-msgstr ""
+msgstr "Segnale stradale supplementare {0}"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -20949,30 +20948,30 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109
 msgid "Unconnected nodes without physical tags"
-msgstr ""
+msgstr "Nodi non connessi senza etichette fisiche"
 
 #. translation note: don't translate quoted words
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77
 msgid "Has tag containing ''fixme'' or ''FIXME''"
-msgstr ""
+msgstr "Contiene una etichetta ''fixme'' o ''FIXME''"
 
 #. translation note: don't translate quoted words
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87
 msgid "Has key ''note'' or ''comment'' or ''description''"
-msgstr ""
+msgstr "Contiene una chiave ''note'', ''comment'' o ''description''"
 
 #. translation note: don't translate quoted words
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91
 msgid "Has key ''created_by'' or ''converted_by''"
-msgstr ""
+msgstr "Contiene una chiave ''created_by'' o ''converted_by''"
 
 #. translation note: don't translate quoted words
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95
 msgid "Has key ''watch''"
-msgstr ""
+msgstr "Contiene una chiave ''watch''"
 
 #. translation note: don't translate quoted words
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99
 msgid "Has key ''source''"
-msgstr ""
+msgstr "Contiene una chiave ''source''"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:62
@@ -21105,9 +21104,9 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:102
 msgid "loop"
-msgstr ""
+msgstr "ripeti"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:183
 msgid "loops n sec around current position"
-msgstr ""
+msgstr "ripete per n secondi in prossimità della posizione corrente"
 
 #. now the options menu
@@ -21141,5 +21140,5 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:214
 msgid "Set the length around a looppoint"
-msgstr ""
+msgstr "Imposta la lunghezza in corrispondenza di un punto di ripetizione"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:227
@@ -22285,4 +22284,8 @@
 "properties window. Available country presets: Germany."
 msgstr ""
+"Estensione per l''etichettatura di oggetti basata su una selezione di "
+"segnali stradali. La finestra può essere aperta cliccando su una piccola "
+"icona posizionata nell''angolo superiore destro del pannello delle "
+"proprietà. Paesi per cui le preimpostazioni sono disponibili: Germania."
 
 #. Plugin routes
@@ -27511,7 +27514,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "american_football"
-msgstr "football_australiano"
+msgstr "football americano"
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -27542,7 +27544,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "canadian_football"
-msgstr "football_australiano"
+msgstr "calcio canadese"
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -27588,7 +27589,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "gaelic_football"
-msgstr "football_australiano"
+msgstr "calcio gaelico"
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -27630,11 +27630,10 @@
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "rugby_league"
-msgstr ""
+msgstr "rugby a 13"
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "rugby_union"
-msgstr "rugby"
+msgstr "rugby a 15"
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -28124,56 +28123,47 @@
 
 #: build/trans_presets.java:2076
-#, fuzzy
 msgid "American Football"
-msgstr "Football australiano"
+msgstr "Football americano"
 
 #. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-#, fuzzy
 msgid "Edit American Football"
-msgstr "Modifica football australiano"
+msgstr "Modifica football americano"
 
 #: build/trans_presets.java:2082
-#, fuzzy
 msgid "Canadian Football"
-msgstr "Modifica football"
+msgstr "Calcio canadese"
 
 #. item "Sport (Ball)/Canadian Football"
 #: build/trans_presets.java:2083
-#, fuzzy
 msgid "Edit Canadian Football"
-msgstr "Modifica football australiano"
+msgstr "Modifica calcio canadese"
 
 #: build/trans_presets.java:2088
-#, fuzzy
 msgid "Gaelic Football"
-msgstr "Modifica football"
+msgstr "Calcio gaelico"
 
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "Modifica football"
+msgstr "Modifica calcio gaelico"
 
 #: build/trans_presets.java:2094
 msgid "Rugby League"
-msgstr ""
+msgstr "Rugby a 13 (rugby league)"
 
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "Modifica Rugby"
+msgstr "Modifica rugby a 13 (rugby league)"
 
 #: build/trans_presets.java:2100
-#, fuzzy
 msgid "Rugby Union"
-msgstr "Rugby"
+msgstr "Rugby a 15 (rugby union)"
 
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "Modifica Rugby"
+msgstr "Modifica rugby a 15 (rugby union)"
 
 #: build/trans_presets.java:2106
@@ -34920,145 +34910,4 @@
 msgstr "Sicilia - Italia"
 
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr ""
-#~ "<html>E'' stato generato un errore durante la comunicazione con il "
-#~ "server<br>Dettagli: {0}</html>"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "Comunicazione con il server fallita"
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Si, ripristina anche questo"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "No, annulla l''operazione"
-
-#~ msgid ""
-#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
-#~ "server.<br><br>Do you want to undelete this node too?"
-#~ msgid_plural ""
-#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
-#~ "the server.<br><br>Do you want to undelete these nodes too?"
-#~ msgstr[0] ""
-#~ "C'è {0} ulteriore nodo utilizzato dal percorso {1}<br>il quale è stato "
-#~ "eliminato sul server.<br><br>Si desidera ripristinare anche questo nodo?"
-#~ msgstr[1] ""
-#~ "Ci sono {0} ulteriori nodi utilizzati dal percorso {1}<br>i quali sono "
-#~ "stati eliminati sul server.<br><br>Si desidera ripristinare anche questi "
-#~ "nodi?"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Ripristina i nodi addizionali?"
-
-#~ msgid ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgid_plural ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
-#~ msgstr[0] ""
-#~ "C'è {0} ulteriore primitiva a cui fa riferimento la relazione {1}<br>la "
-#~ "quale è stata eliminata sul server.<br><br>Si desidera ripristinare anche "
-#~ "questa primitiva?"
-#~ msgstr[1] ""
-#~ "Ci sono {0} ulteriori primitive a cui fa riferimento la relazione {1}"
-#~ "<br>le quali sono state eliminate sul server.<br><br>Si desidera "
-#~ "ripristinare anche queste primitive?"
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Ripristina le primitive dipendenti?"
-
-#~ msgid "Visible State:"
-#~ msgstr "Stato visibile:"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "visibile (sul server)"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "non visibile (sul server)"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Mantieni un clone della versione locale"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Elimina fisicamente dall''insieme di dati locale"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "Mantieni il mio stato visibile"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Si, reimposta l''id"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>Per mantenere la propria versione locale, JOSM<br>deve ripristinare "
-#~ "l''id della primitiva {0} a 0.<br>Al prossimo caricamento il server gli "
-#~ "assegnerà <br>un nuovo id.<br>Sei d''accordo?</html>"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "Reimposta l''id a 0"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "Mantieni il loro stato visibile"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Si, elimina"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSM dovrà eliminare la tua primitiva locale con identificativo {0}"
-#~ "<br>dall''insieme di dati.<br>Si è d''accordo?</html>"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Elimina dall''insieme di dati"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "Conflitto irrisolto tra stati di visibilità"
-
-#~ msgid ""
-#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
-#~ "{0} object<br>from the local dataset because it is deleted on the server."
-#~ msgid_plural ""
-#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
-#~ "purging {0} objects<br> from the local dataset because they are deleted "
-#~ "on the server."
-#~ msgstr[0] ""
-#~ "{0} conflitto è stato <strong>risolto automaticamente</strong> eliminando "
-#~ "{0} oggetto<br>dall''insieme di dati locale perché è stato eliminato dal "
-#~ "server."
-#~ msgstr[1] ""
-#~ "{0} conflitti sono stati <strong>risolti automaticamente</strong> "
-#~ "eliminando {0} oggetti<br> dall''insieme di dati locale perché sono stati "
-#~ "eliminati dal server."
-
-#~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "{0} conflitto in attesa di essere risolto.<br><br>Aprire la lista dei "
-#~ "conflitti e risolverlo manualmente."
-#~ msgstr[1] ""
-#~ "{0} conflitti in attesa di essere risolti.<br><br>Aprire la lista dei "
-#~ "conflitti e risolverli manualmente."
-
-#~ msgid "Create house number and street name relation"
-#~ msgstr "Crea una relazione tra numero civico e nome della strada"
-
-#~ msgid "football"
-#~ msgstr "football_americano"
-
-#~ msgid "Football"
-#~ msgstr "Football"
-
 #~ msgid "No data imported."
 #~ msgstr "Nessun dato importato."
@@ -35460,4 +35309,7 @@
 #~ msgstr "Modifica stazione"
 
+#~ msgid "football"
+#~ msgstr "football_americano"
+
 #~ msgid "Help / About"
 #~ msgstr "Aiuto / Informazioni su"
@@ -35478,4 +35330,7 @@
 #~ "I percorsi selezionati appartengono a relazioni differenti. Vuoi comunque "
 #~ "unirli?"
+
+#~ msgid "Football"
+#~ msgstr "Football"
 
 #~ msgid "Charge"
@@ -36244,4 +36099,7 @@
 #~ msgstr "Ripristino relazione..."
 
+#~ msgid "Yes, undelete them too"
+#~ msgstr "Si, ripristina anche questo"
+
 #~ msgid "Undeleting Way..."
 #~ msgstr "Ripristino via"
@@ -36285,4 +36143,28 @@
 #~ msgid "removing reference from way {0}"
 #~ msgstr "rimozione del riferimento dal percorso {0}"
+
+#~ msgid "Communication with server failed"
+#~ msgstr "Comunicazione con il server fallita"
+
+#~ msgid "Undelete additional nodes?"
+#~ msgstr "Ripristina i nodi addizionali?"
+
+#~ msgid "Keep my visible state"
+#~ msgstr "Mantieni il mio stato visibile"
+
+#~ msgid "Undelete dependent primitives?"
+#~ msgstr "Ripristina le primitive dipendenti?"
+
+#~ msgid "not visible (on the server)"
+#~ msgstr "non visibile (sul server)"
+
+#~ msgid "visible (on the server)"
+#~ msgstr "visibile (sul server)"
+
+#~ msgid "Visible State:"
+#~ msgstr "Stato visibile:"
+
+#~ msgid "Keep a clone of the local version"
+#~ msgstr "Mantieni un clone della versione locale"
 
 #~ msgid "OSM username (e-mail)"
@@ -36298,4 +36180,11 @@
 #~ msgid "Failed to initialize API. Please try again later."
 #~ msgstr "E' fallita l'inizializzazione delle API. Riprovare più tardi."
+
+#~ msgid ""
+#~ "<html>An error occurred while communicating with the server<br>Details: "
+#~ "{0}</html>"
+#~ msgstr ""
+#~ "<html>E'' stato generato un errore durante la comunicazione con il "
+#~ "server<br>Dettagli: {0}</html>"
 
 #~ msgid "Layer {0} must be in list of layers"
@@ -36379,4 +36268,10 @@
 #~ "di {0}."
 
+#~ msgid "Yes, purge it"
+#~ msgstr "Si, elimina"
+
+#~ msgid "Keep their visible state"
+#~ msgstr "Mantieni il loro stato visibile"
+
 #~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
@@ -36826,4 +36721,7 @@
 #~ "inglese</a>.</p></html>"
 
+#~ msgid "Undecide conflict between visible state"
+#~ msgstr "Conflitto irrisolto tra stati di visibilità"
+
 #~ msgid "Uploading {0} objects ..."
 #~ msgstr "Caricamento di {0} oggetti ..."
@@ -36865,4 +36763,33 @@
 #~ "richiede il numero di etichette o un intervallo, per esempio tags:1 "
 #~ "oppure tags:2-5"
+
+#~ msgid ""
+#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
+#~ "{0} object<br>from the local dataset because it is deleted on the server."
+#~ msgid_plural ""
+#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
+#~ "purging {0} objects<br> from the local dataset because they are deleted "
+#~ "on the server."
+#~ msgstr[0] ""
+#~ "{0} conflitto è stato <strong>risolto automaticamente</strong> eliminando "
+#~ "{0} oggetto<br>dall''insieme di dati locale perché è stato eliminato dal "
+#~ "server."
+#~ msgstr[1] ""
+#~ "{0} conflitti sono stati <strong>risolti automaticamente</strong> "
+#~ "eliminando {0} oggetti<br> dall''insieme di dati locale perché sono stati "
+#~ "eliminati dal server."
+
+#~ msgid ""
+#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
+#~ "Dialog and manually resolve it."
+#~ msgid_plural ""
+#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
+#~ "Dialog and manually resolve them."
+#~ msgstr[0] ""
+#~ "{0} conflitto in attesa di essere risolto.<br><br>Aprire la lista dei "
+#~ "conflitti e risolverlo manualmente."
+#~ msgstr[1] ""
+#~ "{0} conflitti in attesa di essere risolti.<br><br>Aprire la lista dei "
+#~ "conflitti e risolverli manualmente."
 
 #~ msgid ""
@@ -37062,4 +36989,26 @@
 #~ msgstr "Il percorso \"to\" non inizia o finisce sul percorso \"via\"."
 
+#~ msgid "No, cancel operation"
+#~ msgstr "No, annulla l''operazione"
+
+#~ msgid "Physically delete from local dataset"
+#~ msgstr "Elimina fisicamente dall''insieme di dati locale"
+
+#~ msgid "Yes, reset the id"
+#~ msgstr "Si, reimposta l''id"
+
+#~ msgid "Reset id to 0"
+#~ msgstr "Reimposta l''id a 0"
+
+#~ msgid ""
+#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
+#~ "the dataset.<br>Do you agree?</html>"
+#~ msgstr ""
+#~ "<html>JOSM dovrà eliminare la tua primitiva locale con identificativo {0}"
+#~ "<br>dall''insieme di dati.<br>Si è d''accordo?</html>"
+
+#~ msgid "Remove from dataset"
+#~ msgstr "Elimina dall''insieme di dati"
+
 #~ msgid ""
 #~ "<html>Select to restrict the query to your changsets only.<br>Unselect to "
@@ -37128,4 +37077,33 @@
 
 #~ msgid ""
+#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
+#~ "deleted on the server.<br><br>Do you want to undelete this too?"
+#~ msgid_plural ""
+#~ "There are {0} additional primitives referred to by relation {1}<br>which "
+#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
+#~ msgstr[0] ""
+#~ "C'è {0} ulteriore primitiva a cui fa riferimento la relazione {1}<br>la "
+#~ "quale è stata eliminata sul server.<br><br>Si desidera ripristinare anche "
+#~ "questa primitiva?"
+#~ msgstr[1] ""
+#~ "Ci sono {0} ulteriori primitive a cui fa riferimento la relazione {1}"
+#~ "<br>le quali sono state eliminate sul server.<br><br>Si desidera "
+#~ "ripristinare anche queste primitive?"
+
+#~ msgid ""
+#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
+#~ "server.<br><br>Do you want to undelete this node too?"
+#~ msgid_plural ""
+#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
+#~ "the server.<br><br>Do you want to undelete these nodes too?"
+#~ msgstr[0] ""
+#~ "C'è {0} ulteriore nodo utilizzato dal percorso {1}<br>il quale è stato "
+#~ "eliminato sul server.<br><br>Si desidera ripristinare anche questo nodo?"
+#~ msgstr[1] ""
+#~ "Ci sono {0} ulteriori nodi utilizzati dal percorso {1}<br>i quali sono "
+#~ "stati eliminati sul server.<br><br>Si desidera ripristinare anche questi "
+#~ "nodi?"
+
+#~ msgid ""
 #~ "Automaticly select first WMS layer when grabing if multiple layers exist."
 #~ msgstr ""
@@ -37145,2 +37123,14 @@
 #~ msgid " Video"
 #~ msgstr " Video"
+
+#~ msgid ""
+#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
+#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
+#~ "new id.<br>Do you agree?</html>"
+#~ msgstr ""
+#~ "<html>Per mantenere la propria versione locale, JOSM<br>deve ripristinare "
+#~ "l''id della primitiva {0} a 0.<br>Al prossimo caricamento il server gli "
+#~ "assegnerà <br>un nuovo id.<br>Sei d''accordo?</html>"
+
+#~ msgid "Create house number and street name relation"
+#~ msgstr "Crea una relazione tra numero civico e nome della strada"
Index: applications/editors/josm/i18n/po/ja.po
===================================================================
--- applications/editors/josm/i18n/po/ja.po	(revision 22209)
+++ applications/editors/josm/i18n/po/ja.po	(revision 22278)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
-"PO-Revision-Date: 2010-07-01 03:58+0000\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
+"PO-Revision-Date: 2010-07-09 03:08+0000\n"
 "Last-Translator: higa4 <higa432@gmail.com>\n"
 "Language-Team: Japanese <tr@openstreetmap.jp>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:09+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: JAPAN\n"
@@ -271,5 +271,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -663,9 +663,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1493,5 +1493,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2771,6 +2771,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2801,7 +2801,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "検索表現を入力してください"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -4374,5 +4373,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -4921,5 +4920,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -4931,5 +4930,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr "下"
@@ -5523,5 +5522,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5621,9 +5620,9 @@
 msgstr "''{0}'' の競合を解決する"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr "オブジェクトにフィルターをかけ、非表示/無効にします。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5636,53 +5635,52 @@
 msgstr "追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr "フィルターを追加。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr "フィルターを編集。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr "フィルターを削除。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr "フィルターを上に移動。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr "フィルターを下に移動。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr "フィルターを有効化"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr "要素を非表示にする"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr "反転フィルター"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr "フィルターモード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr "ファイルの読み込みエラー"
+msgstr "フィルタ内にエラー"
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5690,5 +5688,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5696,5 +5694,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5702,5 +5700,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5708,5 +5706,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5715,5 +5713,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5721,5 +5719,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5727,5 +5725,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5733,24 +5731,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>有効なフィルタ</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> 件の非表示オブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> 件の無効化オブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>フィルタのダイアログを閉じて全オブジェクトを見る。<p></html>"
@@ -10452,10 +10450,10 @@
 msgstr[0] "GPSタグが必要なものが {0}見つかりました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "ディスクから画像ファイルを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10466,5 +10464,5 @@
 "に失われます。</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr "画像ファイルが削除できません。"
@@ -12775,5 +12773,5 @@
 #, java-format
 msgid "Unknown requisite: {0}"
-msgstr ""
+msgstr "不明な必要条件: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
@@ -13145,5 +13143,5 @@
 msgstr "事前定義のライセンスを選択"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -13154,5 +13152,5 @@
 msgstr "{0}　のマーカー"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -13164,5 +13162,5 @@
 "われます"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -13172,5 +13170,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -13855,9 +13853,9 @@
 msgstr "OSMデータ解析中..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr "データセット準備中..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14732,11 +14730,11 @@
 msgstr "Unable to find translation for the locale {0}. Reverting to {1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr "警告: zipファイル ''{0}'' のハンドルに失敗。例外コード: {1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -14747,5 +14745,5 @@
 "コード: {1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -15453,7 +15451,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
-#, fuzzy
 msgid "on polygon"
-msgstr "マルチポリゴン"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
@@ -15472,15 +15469,14 @@
 msgstr "建物"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
-msgstr "次へ"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr "ストリート"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr ""
@@ -15658,5 +15654,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
@@ -26440,7 +26436,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "american_football"
-msgstr "オーストラリアフットボール"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26471,7 +26466,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "canadian_football"
-msgstr "オーストラリアフットボール"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26517,7 +26511,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "gaelic_football"
-msgstr "オーストラリアフットボール"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26563,7 +26556,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "rugby_union"
-msgstr "ラグビー"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -27053,35 +27045,29 @@
 
 #: build/trans_presets.java:2076
-#, fuzzy
 msgid "American Football"
-msgstr "オーストラリアフットボール"
+msgstr ""
 
 #. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-#, fuzzy
 msgid "Edit American Football"
-msgstr "オーストラリアフットボールの編集"
+msgstr ""
 
 #: build/trans_presets.java:2082
-#, fuzzy
 msgid "Canadian Football"
-msgstr "フットボール場の編集"
+msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
 #: build/trans_presets.java:2083
-#, fuzzy
 msgid "Edit Canadian Football"
-msgstr "オーストラリアフットボールの編集"
+msgstr ""
 
 #: build/trans_presets.java:2088
-#, fuzzy
 msgid "Gaelic Football"
-msgstr "フットボール場の編集"
+msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "フットボール場の編集"
+msgstr ""
 
 #: build/trans_presets.java:2094
@@ -27091,18 +27077,15 @@
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "ラグビー場の編集"
+msgstr ""
 
 #: build/trans_presets.java:2100
-#, fuzzy
 msgid "Rugby Union"
-msgstr "ラグビー"
+msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "ラグビー場の編集"
+msgstr ""
 
 #: build/trans_presets.java:2106
@@ -33849,112 +33832,4 @@
 msgstr "Sicily - Italy"
 
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr "<html>サーバとの通信中にエラー発生<br>詳細: {0}</html>"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "サーバとの通信失敗"
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "はい、これも削除を取り消します"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "いいえ、操作をキャンセルします"
-
-#~ msgid ""
-#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
-#~ "server.<br><br>Do you want to undelete this node too?"
-#~ msgid_plural ""
-#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
-#~ "the server.<br><br>Do you want to undelete these nodes too?"
-#~ msgstr[0] ""
-#~ "{0} 件の付加的なノードをウェイ {1} が使用していますがサーバ上から削除され"
-#~ "ています。<br><br>このノードも削除を取り消しますか？"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "追加のノードの削除を取り消しますか？"
-
-#~ msgid ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgid_plural ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
-#~ msgstr[0] ""
-#~ "{0} 件の付加的なプリミティブをリレーション {1} が参照していますがサーバ上"
-#~ "から削除されています。<br><br>これも削除を取り消しますか？"
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "依存するプリミティブの削除を取り消しますか？"
-
-#~ msgid "Visible State:"
-#~ msgstr "表示状態:"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "表示(サーバ上)"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "非表示(サーバ上)"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "ローカルバージョンのクローンを残す"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "ローカルデータセットから物理的に削除"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "自分の表示状態を残す"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "はい、id をリセットします"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>あなたのローカルバージョンを保持するために、JOSM<br>はプリミティブ "
-#~ "{0} のIDを0にリセットしなければなりません。<br>次回アップロード時にサーバ"
-#~ "はこれに新しいIDを<br>割り当てます。<br>同意しますか？</html>"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "id を0 にリセット"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "相手の表示状態を残す"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "はい、破棄します"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSM はid {0} のあなたのローカルプリミティブをデータセットから<br>削"
-#~ "除しなければなりません。<br>よろしいですか？</html>"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "データセットから削除"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "表示状態間の競合を未決にする"
-
-#~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "{0} 件の競合が未解決です。<br><br>競合リストダイアログをオープンして手動で"
-#~ "解決してください。"
-
-#~ msgid "football"
-#~ msgstr "フットボール"
-
-#~ msgid "Football"
-#~ msgstr "フットボール"
-
 #~ msgid "Move"
 #~ msgstr "移動"
@@ -34390,4 +34265,10 @@
 #~ msgid "bicyclemap"
 #~ msgstr "自転車マップ"
+
+#~ msgid "football"
+#~ msgstr "フットボール"
+
+#~ msgid "Football"
+#~ msgstr "フットボール"
 
 #~ msgid "sports"
@@ -35047,4 +34928,19 @@
 #~ msgstr "競合が検出されました"
 
+#~ msgid "Keep their visible state"
+#~ msgstr "相手の表示状態を残す"
+
+#~ msgid "Keep my visible state"
+#~ msgstr "自分の表示状態を残す"
+
+#~ msgid "Visible State:"
+#~ msgstr "表示状態:"
+
+#~ msgid "Undecide conflict between visible state"
+#~ msgstr "表示状態間の競合を未決にする"
+
+#~ msgid "Yes, purge it"
+#~ msgstr "はい、破棄します"
+
 #~ msgid ""
 #~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
@@ -35060,4 +34956,10 @@
 #~ msgstr ""
 #~ "このデータセットには id {0} バージョン {1} のプリミティブはありません"
+
+#~ msgid "Remove from dataset"
+#~ msgstr "データセットから削除"
+
+#~ msgid "Physically delete from local dataset"
+#~ msgstr "ローカルデータセットから物理的に削除"
 
 #~ msgid ""
@@ -35093,4 +34995,30 @@
 #~ "ティブは既に削除されています。<br><br>エラーメッセージ:<br>{0}</html>"
 
+#~ msgid "No, cancel operation"
+#~ msgstr "いいえ、操作をキャンセルします"
+
+#~ msgid ""
+#~ "<html>An error occurred while communicating with the server<br>Details: "
+#~ "{0}</html>"
+#~ msgstr "<html>サーバとの通信中にエラー発生<br>詳細: {0}</html>"
+
+#~ msgid "Communication with server failed"
+#~ msgstr "サーバとの通信失敗"
+
+#~ msgid "not visible (on the server)"
+#~ msgstr "非表示(サーバ上)"
+
+#~ msgid "visible (on the server)"
+#~ msgstr "表示(サーバ上)"
+
+#~ msgid "Keep a clone of the local version"
+#~ msgstr "ローカルバージョンのクローンを残す"
+
+#~ msgid "Reset id to 0"
+#~ msgstr "id を0 にリセット"
+
+#~ msgid "Yes, reset the id"
+#~ msgstr "はい、id をリセットします"
+
 #~ msgid "not yet decided"
 #~ msgstr "未決定です"
@@ -35098,4 +35026,20 @@
 #~ msgid "parameter '{0}' must not be null"
 #~ msgstr "パラメータ '{0}' はヌル以外でなければなりません"
+
+#~ msgid "Yes, undelete them too"
+#~ msgstr "はい、これも削除を取り消します"
+
+#~ msgid "Undelete additional nodes?"
+#~ msgstr "追加のノードの削除を取り消しますか？"
+
+#~ msgid "Undelete dependent primitives?"
+#~ msgstr "依存するプリミティブの削除を取り消しますか？"
+
+#~ msgid ""
+#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
+#~ "the dataset.<br>Do you agree?</html>"
+#~ msgstr ""
+#~ "<html>JOSM はid {0} のあなたのローカルプリミティブをデータセットから<br>削"
+#~ "除しなければなりません。<br>よろしいですか？</html>"
 
 #~ msgid "Dialog not created yet. Invoke createInstance() first"
@@ -35722,4 +35666,43 @@
 #~ msgstr "摂氏"
 
+#~ msgid ""
+#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
+#~ "Dialog and manually resolve it."
+#~ msgid_plural ""
+#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
+#~ "Dialog and manually resolve them."
+#~ msgstr[0] ""
+#~ "{0} 件の競合が未解決です。<br><br>競合リストダイアログをオープンして手動で"
+#~ "解決してください。"
+
+#~ msgid ""
+#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
+#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
+#~ "new id.<br>Do you agree?</html>"
+#~ msgstr ""
+#~ "<html>あなたのローカルバージョンを保持するために、JOSM<br>はプリミティブ "
+#~ "{0} のIDを0にリセットしなければなりません。<br>次回アップロード時にサーバ"
+#~ "はこれに新しいIDを<br>割り当てます。<br>同意しますか？</html>"
+
+#~ msgid ""
+#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
+#~ "server.<br><br>Do you want to undelete this node too?"
+#~ msgid_plural ""
+#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
+#~ "the server.<br><br>Do you want to undelete these nodes too?"
+#~ msgstr[0] ""
+#~ "{0} 件の付加的なノードをウェイ {1} が使用していますがサーバ上から削除され"
+#~ "ています。<br><br>このノードも削除を取り消しますか？"
+
+#~ msgid ""
+#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
+#~ "deleted on the server.<br><br>Do you want to undelete this too?"
+#~ msgid_plural ""
+#~ "There are {0} additional primitives referred to by relation {1}<br>which "
+#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
+#~ msgstr[0] ""
+#~ "{0} 件の付加的なプリミティブをリレーション {1} が参照していますがサーバ上"
+#~ "から削除されています。<br><br>これも削除を取り消しますか？"
+
 #~ msgid "Point on angle of building to start drawing"
 #~ msgstr "描画を始める建物の角度をポイント"
Index: applications/editors/josm/i18n/po/nb.po
===================================================================
--- applications/editors/josm/i18n/po/nb.po	(revision 22209)
+++ applications/editors/josm/i18n/po/nb.po	(revision 22278)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
-"PO-Revision-Date: 2010-06-28 16:31+0000\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
+"PO-Revision-Date: 2010-07-06 17:43+0000\n"
 "Last-Translator: Stian Ellingsen <stiell@gmail.com>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:12+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -263,5 +263,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -654,9 +654,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1467,5 +1467,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2722,6 +2722,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2752,7 +2752,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "regulært uttrykk"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -4283,5 +4282,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -4830,5 +4829,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -4840,5 +4839,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr "Ned"
@@ -5425,5 +5424,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5522,9 +5521,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5537,53 +5536,52 @@
 msgstr "Legg til"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr "Feil ved lasting av fil"
+msgstr ""
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5591,5 +5589,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5597,5 +5595,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5603,5 +5601,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5609,5 +5607,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5616,5 +5614,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5622,5 +5620,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5628,5 +5626,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5634,24 +5632,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -10221,10 +10219,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10233,5 +10231,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr ""
@@ -12799,5 +12797,5 @@
 msgstr "Velg en lisens"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -12808,5 +12806,5 @@
 msgstr "Markører fra {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -12816,5 +12814,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -12824,5 +12822,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -13488,9 +13486,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14287,11 +14285,11 @@
 msgstr "Fant ikke oversettelsen for {0}. Bruker {1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -14300,5 +14298,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -14984,7 +14982,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
-#, fuzzy
 msgid "on polygon"
-msgstr "Multipolygon"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
@@ -15003,15 +15000,14 @@
 msgstr "Bygninger"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
-msgstr "Neste"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr ""
@@ -15180,5 +15176,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
@@ -25895,7 +25891,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "american_football"
-msgstr "australsk fotball"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -25926,7 +25921,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "canadian_football"
-msgstr "australsk fotball"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -25972,7 +25966,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "gaelic_football"
-msgstr "australsk fotball"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26018,7 +26011,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "rugby_union"
-msgstr "rugby"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26508,35 +26500,29 @@
 
 #: build/trans_presets.java:2076
-#, fuzzy
 msgid "American Football"
-msgstr "Australsk fotball"
+msgstr ""
 
 #. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-#, fuzzy
 msgid "Edit American Football"
-msgstr "Rediger australsk fotball"
+msgstr ""
 
 #: build/trans_presets.java:2082
-#, fuzzy
 msgid "Canadian Football"
-msgstr "Rediger amerikansk fotball"
+msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
 #: build/trans_presets.java:2083
-#, fuzzy
 msgid "Edit Canadian Football"
-msgstr "Rediger australsk fotball"
+msgstr ""
 
 #: build/trans_presets.java:2088
-#, fuzzy
 msgid "Gaelic Football"
-msgstr "Rediger amerikansk fotball"
+msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "Rediger amerikansk fotball"
+msgstr ""
 
 #: build/trans_presets.java:2094
@@ -26546,18 +26532,15 @@
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "Rediger rugby"
+msgstr ""
 
 #: build/trans_presets.java:2100
-#, fuzzy
 msgid "Rugby Union"
-msgstr "Rugby"
+msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "Rediger rugby"
+msgstr ""
 
 #: build/trans_presets.java:2106
@@ -33302,75 +33285,4 @@
 msgid "Sicily - Italy"
 msgstr "Sicilia, Italia"
-
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr ""
-#~ "<html>Det oppstod en feil under kommunikasjon med tjeneren.<br>Detaljer: "
-#~ "{0}</html>"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "Kommunikasjon med tjener feilet"
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Ja, gjenopprett også dem"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "Nei, avbryt operasjonen"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Gjenopprette ytterligere noder?"
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Gjenopprette avhengige objekter?"
-
-#~ msgid "Visible State:"
-#~ msgstr "Synlighetsstatus:"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "synlig (på tjeneren)"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "ikke synlig (på tjeneren)"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Behold en klone av den lokale versjonen"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Slett fra det lokale datasettet"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "Behold lokal synlighetsstatus"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Ja, nullstill ID"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "Nullstill ID"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "Behold tjenerens synlighetsstatus"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Ja, rydd ut objektet"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSM må fjerne lokalt element med ID {0} fra datasettet.<br>Er "
-#~ "dette OK?</html>"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Fjern fra datasett"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "Fjern avgjørelse fra visningskonflikt"
-
-#~ msgid "football"
-#~ msgstr "football"
-
-#~ msgid "Football"
-#~ msgstr "Amerikansk fotball"
 
 #~ msgid "Move"
@@ -34096,4 +34008,7 @@
 #~ msgstr "sykkelkart"
 
+#~ msgid "football"
+#~ msgstr "football"
+
 #~ msgid "Image with path {0} does not exist or is not readable."
 #~ msgstr "Bilde fra {0} finnes ikke eller er ikke lesbart."
@@ -34327,4 +34242,40 @@
 #~ msgstr "Fant ikke noe objekt med ID {0} og versjon {1} i dette datasettet"
 
+#~ msgid "No, cancel operation"
+#~ msgstr "Nei, avbryt operasjonen"
+
+#~ msgid "Yes, undelete them too"
+#~ msgstr "Ja, gjenopprett også dem"
+
+#~ msgid "Undelete additional nodes?"
+#~ msgstr "Gjenopprette ytterligere noder?"
+
+#~ msgid "Undelete dependent primitives?"
+#~ msgstr "Gjenopprette avhengige objekter?"
+
+#~ msgid "not visible (on the server)"
+#~ msgstr "ikke synlig (på tjeneren)"
+
+#~ msgid "visible (on the server)"
+#~ msgstr "synlig (på tjeneren)"
+
+#~ msgid "Visible State:"
+#~ msgstr "Synlighetsstatus:"
+
+#~ msgid "Keep their visible state"
+#~ msgstr "Behold tjenerens synlighetsstatus"
+
+#~ msgid "Yes, purge it"
+#~ msgstr "Ja, rydd ut objektet"
+
+#~ msgid "Keep my visible state"
+#~ msgstr "Behold lokal synlighetsstatus"
+
+#~ msgid "Yes, reset the id"
+#~ msgstr "Ja, nullstill ID"
+
+#~ msgid "Remove from dataset"
+#~ msgstr "Fjern fra datasett"
+
 #~ msgid "Login name (e-mail) to the OSM account."
 #~ msgstr "E-postadresse for OSM-kontoen"
@@ -34427,4 +34378,7 @@
 #~ msgid "Board Type"
 #~ msgstr "Tavletype"
+
+#~ msgid "Football"
+#~ msgstr "Amerikansk fotball"
 
 #~ msgid "YAHOO (WebKit)"
@@ -34524,4 +34478,17 @@
 #~ msgstr "parameter «{0}» må ha en verdi"
 
+#~ msgid "Communication with server failed"
+#~ msgstr "Kommunikasjon med tjener feilet"
+
+#~ msgid "Reset id to 0"
+#~ msgstr "Nullstill ID"
+
+#~ msgid ""
+#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
+#~ "the dataset.<br>Do you agree?</html>"
+#~ msgstr ""
+#~ "<html>JOSM må fjerne lokalt element med ID {0} fra datasettet.<br>Er "
+#~ "dette OK?</html>"
+
 #~ msgid "Apply partial resolutions"
 #~ msgstr "Bruk ufullstendige løsninger"
@@ -34533,6 +34500,22 @@
 #~ msgstr "Velg en startnode i enden av en linje"
 
+#~ msgid "Undecide conflict between visible state"
+#~ msgstr "Fjern avgjørelse fra visningskonflikt"
+
+#~ msgid ""
+#~ "<html>An error occurred while communicating with the server<br>Details: "
+#~ "{0}</html>"
+#~ msgstr ""
+#~ "<html>Det oppstod en feil under kommunikasjon med tjeneren.<br>Detaljer: "
+#~ "{0}</html>"
+
+#~ msgid "Keep a clone of the local version"
+#~ msgstr "Behold en klone av den lokale versjonen"
+
 #~ msgid ">"
 #~ msgstr ">"
+
+#~ msgid "Physically delete from local dataset"
+#~ msgstr "Slett fra det lokale datasettet"
 
 #~ msgid "Reached the end of the line"
Index: applications/editors/josm/i18n/po/nl.po
===================================================================
--- applications/editors/josm/i18n/po/nl.po	(revision 22209)
+++ applications/editors/josm/i18n/po/nl.po	(revision 22278)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
-"PO-Revision-Date: 2010-06-28 16:08+0000\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
+"PO-Revision-Date: 2010-07-09 09:49+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:06+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -270,5 +270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -665,9 +665,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -801,4 +801,6 @@
 msgid "Download primitives referring to one of the selected primitives"
 msgstr ""
+"Download primitieven met verwijzingen naar een van de geselecteerde "
+"primitieven"
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
@@ -932,5 +934,7 @@
 "The selected ways have nodes outside of the downloaded data region."
 msgstr[0] ""
+"De geselecteerde weg heeft knopen buiten de binnengehaalde kaart gegevens"
 msgstr[1] ""
+"De geselecteerde wegen hebben knopen buiten de binnengehaalde kaart gegevens"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
@@ -938,9 +942,9 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
 msgid "This can lead to nodes being deleted accidentally."
-msgstr ""
+msgstr "Er kunnen hierdoor knopen verloren gaan"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:156
 msgid "Are you really sure to continue?"
-msgstr ""
+msgstr "Weet u het echt zeker dat u door wil gaan?"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157
@@ -1208,5 +1212,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map layer."
-msgstr ""
+msgstr "Een nieuwe kaart laag aanmaken"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:47
@@ -1238,5 +1242,9 @@
 "Cannot open {0} files because no suitable file importer is available."
 msgstr[0] ""
+"Kan {0} bestand niet openen wegens een ontbrekende geschikte bestand import "
+"toepassing."
 msgstr[1] ""
+"Kan {0} bestanden niet openen wegens een ontbrekende geschikte bestand "
+"import toepassing."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:189
@@ -1244,4 +1252,5 @@
 msgid "<html>Cannot open directory ''{0}''.<br>Please select a file.</html>"
 msgstr ""
+"<html>Kan map ''{0}' niet openen'.<br>Graag een bestand selecteren.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:190
@@ -1257,6 +1266,6 @@
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} bestand aan het openen..."
+msgstr[1] "{0} bestanden aan het openen..."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:262
@@ -1306,4 +1315,10 @@
 "shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
 msgstr ""
+"<h3>Als een of meer van de wegen geselecteerd zijn, is de form aangepast "
+"zodat alle hoeken 90 of 180 graden zijn.</h3>Je mag twee knopen aan de "
+"selectie toevoegen. De richting is door deze twee knopen vastgesteld. "
+"(Daarna, is het altijd mogelijk bewegingen van bepaalde knopen ongedaan te "
+"maken:<br>Selecteer deze knopen en druk de korte kies toets voor Orthogonaal "
+"Trekken / Ongedaan Maken. Default is dit Shift+Q."
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45
@@ -1315,5 +1330,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
 msgid "Move nodes so all angles are 90 or 180 degrees"
-msgstr ""
+msgstr "Verplaats de knopen zo dat alle hoeken 90 of 180 graden worden"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
@@ -1347,4 +1362,7 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 msgstr ""
+"<html>Het EPSG:4326 projectie wordt gebruikt.<br>Dit kan leiden tot "
+"onverwachte resultaten bij rechthoekige uitlijnen.<br>Verander de projectie "
+"type om deze waarschuwing te sussen.<br>Wilt u doorgaan?</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:148
@@ -1405,4 +1423,7 @@
 "incomplete primitives?"
 msgstr ""
+"De gekopieerde data bevat onvolledige primitieven. Bij het plakken hiervan "
+"worden de onvolledige primitieven verwijderd. Wilt u deze data toch plakken "
+"zonder de onvolledige primitieven?"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
@@ -1435,5 +1456,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Open a preferences dialog for global settings."
-msgstr ""
+msgstr "Voorkeuren dialoog voor de algemeene instellingen openen"
 
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
@@ -1489,5 +1510,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2771,6 +2792,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2801,7 +2822,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "Geef de zoekterm"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -4353,5 +4373,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -4880,5 +4900,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -4890,5 +4910,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr "Omlaag"
@@ -5469,5 +5489,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5570,9 +5590,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5585,53 +5605,52 @@
 msgstr "Toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr "Laden bestand is mislukt"
+msgstr ""
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5639,5 +5658,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5645,5 +5664,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5651,5 +5670,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5657,5 +5676,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5664,5 +5683,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5670,5 +5689,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5676,5 +5695,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5682,24 +5701,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -10281,10 +10300,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10293,5 +10312,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr ""
@@ -12871,5 +12890,5 @@
 msgstr "Kies een voorgedefineerde licentie"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -12880,5 +12899,5 @@
 msgstr "Markers van {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -12888,5 +12907,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -12896,5 +12915,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -13549,9 +13568,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14349,11 +14368,11 @@
 msgstr "Kan geen vertaling voor taalgebied {0} vinden. Naar {1} terugvallen."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -14362,5 +14381,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -15044,7 +15063,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
-#, fuzzy
 msgid "on polygon"
-msgstr "Multipolygoon"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
@@ -15063,15 +15081,14 @@
 msgstr "Gebouwen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
-msgstr "Volgende"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr ""
@@ -15236,5 +15253,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
@@ -25930,7 +25947,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "american_football"
-msgstr "Australisch football"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -25961,7 +25977,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "canadian_football"
-msgstr "Australisch football"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26007,7 +26022,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "gaelic_football"
-msgstr "Australisch football"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26053,7 +26067,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "rugby_union"
-msgstr "Rugby"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26543,35 +26556,29 @@
 
 #: build/trans_presets.java:2076
-#, fuzzy
 msgid "American Football"
-msgstr "Australisch football"
+msgstr ""
 
 #. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-#, fuzzy
 msgid "Edit American Football"
-msgstr "Australisch football bewerken"
+msgstr ""
 
 #: build/trans_presets.java:2082
-#, fuzzy
 msgid "Canadian Football"
-msgstr "Football bewerken"
+msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
 #: build/trans_presets.java:2083
-#, fuzzy
 msgid "Edit Canadian Football"
-msgstr "Australisch football bewerken"
+msgstr ""
 
 #: build/trans_presets.java:2088
-#, fuzzy
 msgid "Gaelic Football"
-msgstr "Football bewerken"
+msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "Football bewerken"
+msgstr ""
 
 #: build/trans_presets.java:2094
@@ -26581,18 +26588,15 @@
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "Rugby bewerken"
+msgstr ""
 
 #: build/trans_presets.java:2100
-#, fuzzy
 msgid "Rugby Union"
-msgstr "Rugby"
+msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "Rugby bewerken"
+msgstr ""
 
 #: build/trans_presets.java:2106
@@ -33337,10 +33341,4 @@
 msgid "Sicily - Italy"
 msgstr "Sicilië - Italië"
-
-#~ msgid "football"
-#~ msgstr "Football"
-
-#~ msgid "Football"
-#~ msgstr "Football"
 
 #~ msgid "Select a bookmark first."
@@ -34122,4 +34120,7 @@
 #~ msgstr "fietskaart"
 
+#~ msgid "football"
+#~ msgstr "Football"
+
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "Een weg overslaan omdat het een niet bestaande knoop bevat: {0}\n"
@@ -34127,4 +34128,7 @@
 #~ msgid "Please select one or more closed ways of at least four nodes."
 #~ msgstr "Één of meer gesloten wegen met minstens vier knopen selecteren."
+
+#~ msgid "Football"
+#~ msgstr "Football"
 
 #~ msgid "Charge"
Index: applications/editors/josm/i18n/po/pl.po
===================================================================
--- applications/editors/josm/i18n/po/pl.po	(revision 22209)
+++ applications/editors/josm/i18n/po/pl.po	(revision 22278)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
-"PO-Revision-Date: 2010-06-29 18:59+0000\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
+"PO-Revision-Date: 2010-07-11 16:56+0000\n"
 "Last-Translator: Rafał <Unknown>\n"
 "Language-Team: Polish <josm-lang-pl@googlegroups.com>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:11+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: POLAND\n"
@@ -272,5 +272,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -665,9 +665,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1306,4 +1306,9 @@
 "shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
 msgstr ""
+"<h3>Kiedy jedna lub więcej dróg jest zaznaczonych, kształt jest "
+"dostosowywany tak że każdy kąt ma 90 lub 180 stopni.</h3>Możesz dodać dwa "
+"węzły do zaznaczenia. Wtedy kierunek ustalony jest na podstawie tych dwóch "
+"węzłów. (Pyzatym możesz cofnąć zmiany dla niektórych węzłów:<br>Zaznacz je i "
+"naciśnij skrót dla Korekta prostopadłości / Cofnij. Domyślnie Shift-Q.)"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45
@@ -1421,7 +1426,7 @@
 msgid "Pasting {0} tag"
 msgid_plural "Pasting {0} tags"
-msgstr[0] "Wkelajm tag {0}"
-msgstr[1] "Wklejam tagi {0}"
-msgstr[2] "Wklejam tagi {0}"
+msgstr[0] "Wklejam {0} tag"
+msgstr[1] "Wklejam {0} tagi"
+msgstr[2] "Wklejam {0} tagi"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
@@ -1429,6 +1434,7 @@
 msgid "to {0} primitive"
 msgid_plural "to {0} primtives"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "do {0} elementu"
+msgstr[1] "do {0} elementów"
+msgstr[2] "do {0} elementów"
 
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
@@ -1492,5 +1498,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2755,6 +2761,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2785,7 +2791,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "Wpisz szukane wyrażenie"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -4275,5 +4280,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
-msgstr ""
+msgstr "Zmień folder dla ustawień wszystkich użytkowników."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
@@ -4337,5 +4342,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -4531,5 +4536,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167
 msgid "Delete objects"
-msgstr ""
+msgstr "Usuwa obiekty"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310
@@ -4877,5 +4882,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -4887,5 +4892,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr "W dół"
@@ -5401,9 +5406,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:43
 msgid "<html>Please select the values to keep for the following tags.</html>"
-msgstr ""
+msgstr "<html>Wybierz wartości odpowiadające tagom.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:48
 msgid "Show tags with conflicts only"
-msgstr ""
+msgstr "Pokaż tylko tagi z konfliktami"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:49
@@ -5480,5 +5485,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5577,9 +5582,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr "Filtruj obiekty i ukrywaj/blokuj je."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5592,53 +5597,52 @@
 msgstr "Dodaj"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr "Dodaje filtr."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr "Edytuje filtr."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr "Usuwa filtr."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr "Przesuwa filtr do góry."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr "Przesuwa filtr na dół."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr "Zastosuj filtr"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr "Ukryj elementy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr "Odwróć filtr"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr "Tryb filtru"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr "Filtry ukryte:{0}, wyłączone:{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr "Błąd podczas ładowania pliku"
+msgstr ""
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5646,5 +5650,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5652,5 +5656,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5658,5 +5662,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5664,5 +5668,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5671,5 +5675,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5677,5 +5681,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5683,5 +5687,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5689,24 +5693,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr "Z"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filtr aktywny</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> ukrytych obiektów"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> wyłączonych obiektów"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>Zamknij okno filtrów aby zobaczyć wszystkie obiekty.<p></html>"
@@ -7347,5 +7351,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
-msgstr ""
+msgstr "Tylko zestawy zmian zamknięte po i stworzone przed podaną datą/czsem"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
@@ -7354,4 +7358,6 @@
 "valid."
 msgstr ""
+"Nie można stworzyć zapytania na podstawie podanych wytycznych. Niewłaściwe "
+"dane wejścia."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
@@ -7753,5 +7759,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149
 msgid "Tags and Members"
-msgstr ""
+msgstr "Tagi i Członkowie"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151
@@ -7811,10 +7817,10 @@
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
-msgstr ""
+msgstr "Dodaje wszystkie obecnie zaznaczone elementy przed pierwszym członkiem"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
-msgstr ""
+msgstr "Dodaje wszystkie obecnie zaznaczone elementy po ostatnim członku"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724
@@ -7823,4 +7829,6 @@
 "member"
 msgstr ""
+"Dodaje wszystkie obecnie zaznaczone elementy przed pierwszym zaznaczonym "
+"członkiem"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758
@@ -7829,4 +7837,6 @@
 "member"
 msgstr ""
+"Dodaje wszystkie obecnie zaznaczone elementy za ostatnim zaznaczonym "
+"członkiem"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790
@@ -7854,9 +7864,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861
 msgid "Select primitives for selected relation members"
-msgstr ""
+msgstr "Zaznacza elementy dla wybranych członków relacji"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881
 msgid "Sort the relation members"
-msgstr ""
+msgstr "Sortuj członków relacji"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883
@@ -7870,5 +7880,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
 msgid "Reverse the order of the relation members"
-msgstr ""
+msgstr "Odwróć kolejność członków relacji"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
@@ -7985,9 +7995,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
 msgid "Download selected incomplete members"
-msgstr ""
+msgstr "Pobiera zaznaczonych niekompletnych członków"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Sets a role for the selected members"
-msgstr ""
+msgstr "Ustaw rolę dla zaznzczonych członków"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300
@@ -8893,5 +8903,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238
 msgid "Please enter the password of your OSM account"
-msgstr ""
+msgstr "Wprowadź hasło do konta OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240
@@ -10274,10 +10284,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10286,5 +10296,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr ""
@@ -12315,4 +12325,9 @@
 "server. <strong>Do not use a valuable password.</strong></p></body></html>"
 msgstr ""
+"<html><body><p class=\"warning-body\"><strong>Ostrzeżenie:</strong> Hasło "
+"jest przechowywane jako zwykły tekst w pliku ustawień JOSM. Poza tym przy "
+"każdym zapytaniu do serwera OSM jest wysyłane w postaci "
+"<strong>niezakodowanej</strong>. Jeśli to możliwe <strong>nie używaj "
+"wartościowego hasła.</strong></p></body></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:117
@@ -12375,5 +12390,5 @@
 #, java-format
 msgid "<html>Use the default OSM server URL (<strong>{0}</strong>)</html>"
-msgstr ""
+msgstr "<html>Używaj domyślnego URL serwera (<strong>{0}</strong>)</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:88
@@ -12387,9 +12402,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:153
 msgid "Test the API URL"
-msgstr ""
+msgstr "Sprawdza URL API"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:169
 msgid "The API URL is valid."
-msgstr ""
+msgstr "URL API działa poprawnie."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:174
@@ -12424,4 +12439,6 @@
 "Please enter a username and a password if your proxy requires authentication."
 msgstr ""
+"Wprowadź nazwę użytkownika i hasło jeśli twój serwer proxy wymaga "
+"autoryzacji."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:144
@@ -12445,5 +12462,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:256
 msgid "Manually configure a HTTP proxy"
-msgstr ""
+msgstr "Ręczna konfiguracja serwerów proxy"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:274
@@ -12471,9 +12488,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:184
 msgid "Delete the selection in the tag table"
-msgstr ""
+msgstr "Usuwa zaaznaczenie w tabeli tagów"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:276
 msgid "Add a new tag"
-msgstr ""
+msgstr "Dodaje nowy tag"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342
@@ -12496,17 +12513,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 msgid "Available roles"
-msgstr ""
+msgstr "Dostępne role"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564
 msgid "role"
-msgstr ""
+msgstr "rola"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565
 msgid "count"
-msgstr ""
+msgstr "liczba"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566
 msgid "elements"
-msgstr ""
+msgstr "elementy"
 
 #. space
@@ -12849,5 +12866,5 @@
 msgstr "Wybierz jedną z gotowych licencji"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -12858,5 +12875,5 @@
 msgstr "Znaczniki z {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -12866,5 +12883,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -12874,5 +12891,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -13529,9 +13546,9 @@
 msgstr "Analizowanie danych OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr "Przygotowanie zestawu danych..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -13720,5 +13737,5 @@
 #, java-format
 msgid "Downloading Plugin {0}..."
-msgstr ""
+msgstr "Pobieranie wtyczki {0}..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18
@@ -14181,4 +14198,6 @@
 "html>"
 msgstr ""
+"<html>Logowanie do serwera OSM jako ''{0}'' zakończone niepowodzeniem."
+"<br>Sprawdź nazwę użytkownika i hasło w ustawieniach JOSM.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
@@ -14336,11 +14355,11 @@
 "Nie udało się odnaleźć tłumaczenia dla języka: {0}. Użyty zostanie {1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -14349,5 +14368,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -15049,14 +15068,14 @@
 msgstr "Budynki"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr ""
@@ -15221,5 +15240,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
@@ -16981,26 +17000,26 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/LoadPictureCalibrationAction.java:53
 msgid "Load Picture Calibration..."
-msgstr ""
+msgstr "Wczytaj kalibrację"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/LoadPictureCalibrationAction.java:53
 msgid "Loads calibration data to a file"
-msgstr ""
+msgstr "Wczytuje zapisaną kalinrację dla obrazu"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/LoadPictureCalibrationAction.java:79
 #, java-format
 msgid "Loading file failed: {0}"
-msgstr ""
+msgstr "Wczytywanie pliku zakończone niepowodzeniem: {0}"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/MovePictureAction.java:55
 msgid "PicLayer move"
-msgstr ""
+msgstr "Przesuń PicLayer"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/MovePictureAction.java:55
 msgid "Drag to move the picture"
-msgstr ""
+msgstr "Przesuwa obraz"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromClipboardAction.java:42
 msgid "New picture layer from clipboard"
-msgstr ""
+msgstr "Nowa warstwa ze schowka"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:64
@@ -17010,5 +17029,5 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:73
 msgid "New picture layer from file..."
-msgstr ""
+msgstr "Nowa warstwa z pliku"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
@@ -18858,5 +18877,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:120
 msgid "Area style way is not closed"
-msgstr ""
+msgstr "Niezamknięty obszar"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:134
@@ -18976,5 +18995,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115
 msgid "Relation type is unknown"
-msgstr ""
+msgstr "Nieustalony rodzaj relacji"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145
@@ -18998,5 +19017,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201
 msgid "Role verification problem"
-msgstr ""
+msgstr "Problem z weryfikacją roli"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169
@@ -19074,5 +19093,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:458
 msgid "Illegal tag/value combinations"
-msgstr ""
+msgstr "Niewłaściwa kombinacja tag/wartość"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
@@ -19455,5 +19474,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:96
 msgid "Unnamed junction"
-msgstr ""
+msgstr "Skrzyżowanie naz nazwy"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
@@ -20603,5 +20622,5 @@
 #: build/trans_plugins.java:50
 msgid "Imports issues from OpenStreetBugs"
-msgstr ""
+msgstr "Importuje zgłoszone problemy z OpenStreetBugs"
 
 #. Plugin openvisible
@@ -22275,5 +22294,5 @@
 #: build/trans_presets.java:466 build/trans_presets.java:489
 msgid "MTB Scale"
-msgstr ""
+msgstr "Skala MTB"
 
 #. item "Ways/Track" text "Width (meters)"
@@ -22293,5 +22312,5 @@
 #: build/trans_presets.java:487
 msgid "SAC Scale"
-msgstr ""
+msgstr "Skala SAC"
 
 #. item "Ways/Path" combo "SAC Scale"
@@ -23090,5 +23109,5 @@
 #: build/trans_presets.java:962
 msgid "Edit Ditch"
-msgstr ""
+msgstr "Edytuj rów"
 
 #. item "Water/Water/Ditch" combo "Layer"
@@ -24165,60 +24184,60 @@
 #: build/trans_presets.java:1344
 msgid "Diesel"
-msgstr ""
+msgstr "Diesel (olej napędowy)"
 
 #. item "Car/Fuel" check "Diesel"
 #: build/trans_presets.java:1345
 msgid "Bio Diesel"
-msgstr ""
+msgstr "Biodiesel"
 
 #. item "Car/Fuel" check "Bio Diesel"
 #: build/trans_presets.java:1346
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
+msgstr "Ultimate Diesel (GTL)"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
 #: build/trans_presets.java:1347
 msgid "Diesel for Heavy Good Vehicles"
-msgstr ""
+msgstr "Diesel dla ciężarówek"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
 #: build/trans_presets.java:1348
 msgid "Octane 91"
-msgstr ""
+msgstr "Benzyna bezołowiowa 91"
 
 #. item "Car/Fuel" check "Octane 91"
 #: build/trans_presets.java:1349
 msgid "Octane 95"
-msgstr ""
+msgstr "Benzyna bezołowiowa 95"
 
 #. item "Car/Fuel" check "Octane 95"
 #: build/trans_presets.java:1350
 msgid "Octane 98"
-msgstr ""
+msgstr "Benzyna bezołowiowa 98"
 
 #. item "Car/Fuel" check "Octane 98"
 #: build/trans_presets.java:1351
 msgid "Octane 100"
-msgstr ""
+msgstr "Benzyna bezołowiowa 100"
 
 #. item "Car/Fuel" check "Octane 100"
 #: build/trans_presets.java:1352
 msgid "E10 (10% Ethanol mix)"
-msgstr ""
+msgstr "E10 (bioetanol 10%)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
 #: build/trans_presets.java:1353
 msgid "E85 (85% Ethanol mix)"
-msgstr ""
+msgstr "E85 (bioetanol 85%)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
 #: build/trans_presets.java:1354
 msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
+msgstr "Gaz LPG"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
 #: build/trans_presets.java:1355
 msgid "CNG (Compressed Natural Gas)"
-msgstr ""
+msgstr "Gaz CNG (sprężony gaz ziemny)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
@@ -24235,5 +24254,5 @@
 #: build/trans_presets.java:1358
 msgid "With kiosk"
-msgstr ""
+msgstr "Kiosk"
 
 #. item "Car/Fuel" check "With kiosk"
@@ -24572,5 +24591,5 @@
 #: build/trans_presets.java:1529
 msgid "Runway"
-msgstr ""
+msgstr "pas startowy"
 
 #. item "Airport/Runway"
@@ -24578,5 +24597,5 @@
 #: build/trans_presets.java:1531
 msgid "Edit Runway"
-msgstr ""
+msgstr "Edycja pasa startowego"
 
 #. item "Airport/Runway" text "Reference"
@@ -24584,5 +24603,5 @@
 #: build/trans_presets.java:1537
 msgid "Taxiway"
-msgstr ""
+msgstr "droga kołowania"
 
 #. item "Airport/Taxiway"
@@ -24590,5 +24609,5 @@
 #: build/trans_presets.java:1539
 msgid "Edit Taxiway"
-msgstr ""
+msgstr "Edycja drogi kołowania"
 
 #. item "Airport/Taxiway" text "Reference"
@@ -24596,5 +24615,5 @@
 #: build/trans_presets.java:1545
 msgid "Helipad"
-msgstr ""
+msgstr "lądowisko dla helikopterów"
 
 #. item "Airport/Helipad"
@@ -24602,5 +24621,5 @@
 #: build/trans_presets.java:1547
 msgid "Edit Helipad"
-msgstr ""
+msgstr "Edycja lądowiska dla helikopterów"
 
 #. item "Airport/Helipad" text "Reference"
@@ -24618,5 +24637,5 @@
 #: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Hangar"
-msgstr ""
+msgstr "hangar"
 
 #. item "Airport/Hangar" label "Hangar"
@@ -24643,5 +24662,5 @@
 #: build/trans_presets.java:1574
 msgid "Terminal"
-msgstr ""
+msgstr "terminal"
 
 #. item "Airport/Terminal"
@@ -24649,5 +24668,5 @@
 #: build/trans_presets.java:1576
 msgid "Edit Terminal"
-msgstr ""
+msgstr "Edycja terminalu"
 
 #. item "Airport/Gate"
@@ -25856,7 +25875,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "american_football"
-msgstr "futbol australijski"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -25887,7 +25905,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "canadian_football"
-msgstr "futbol australijski"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -25933,7 +25950,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "gaelic_football"
-msgstr "futbol australijski"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -25979,7 +25995,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "rugby_union"
-msgstr "rugby"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26339,5 +26354,5 @@
 #: build/trans_presets.java:2011
 msgid "Edit Horse Racing"
-msgstr ""
+msgstr "Edycja wyścigów konnych"
 
 #: build/trans_presets.java:2016
@@ -26348,5 +26363,5 @@
 #: build/trans_presets.java:2017
 msgid "Edit Gymnastics"
-msgstr ""
+msgstr "Edycja gimnastyki"
 
 #: build/trans_presets.java:2022
@@ -26357,5 +26372,5 @@
 #: build/trans_presets.java:2023
 msgid "Edit Motor Sports"
-msgstr ""
+msgstr "Edycja sportów motorowych"
 
 #: build/trans_presets.java:2028
@@ -26366,5 +26381,5 @@
 #: build/trans_presets.java:2029
 msgid "Edit Skating"
-msgstr ""
+msgstr "Edycja łyżwiarstwa"
 
 #: build/trans_presets.java:2034
@@ -26375,5 +26390,5 @@
 #: build/trans_presets.java:2035
 msgid "Edit Skateboard"
-msgstr ""
+msgstr "Edycja jazdy na deskorolce"
 
 #: build/trans_presets.java:2040
@@ -26384,5 +26399,5 @@
 #: build/trans_presets.java:2041
 msgid "Edit Swimming"
-msgstr ""
+msgstr "Edytuj pływanie"
 
 #. item "Sport/Skiing"
@@ -26469,35 +26484,29 @@
 
 #: build/trans_presets.java:2076
-#, fuzzy
 msgid "American Football"
-msgstr "australijski football"
+msgstr ""
 
 #. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-#, fuzzy
 msgid "Edit American Football"
-msgstr "australijski football"
+msgstr ""
 
 #: build/trans_presets.java:2082
-#, fuzzy
 msgid "Canadian Football"
-msgstr "australijski football"
+msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
 #: build/trans_presets.java:2083
-#, fuzzy
 msgid "Edit Canadian Football"
-msgstr "australijski football"
+msgstr ""
 
 #: build/trans_presets.java:2088
-#, fuzzy
 msgid "Gaelic Football"
-msgstr "australijski football"
+msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "australijski football"
+msgstr ""
 
 #: build/trans_presets.java:2094
@@ -26507,18 +26516,15 @@
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "Edycja miejsca do gry w rugby"
+msgstr ""
 
 #: build/trans_presets.java:2100
-#, fuzzy
 msgid "Rugby Union"
-msgstr "rugby"
+msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "Edycja miejsca do gry w rugby"
+msgstr ""
 
 #: build/trans_presets.java:2106
@@ -28830,5 +28836,5 @@
 #: build/trans_presets.java:3160
 msgid "Railway land"
-msgstr "teren kolejowy"
+msgstr "Teren kolejowy"
 
 #. item "Land use/Railway land"
@@ -28841,5 +28847,5 @@
 #: build/trans_presets.java:3167
 msgid "Military"
-msgstr "obszar wojskowy"
+msgstr "Obszar wojskowy"
 
 #. item "Land use/Military"
@@ -28852,5 +28858,5 @@
 #: build/trans_presets.java:3174
 msgid "Construction area"
-msgstr "budowa"
+msgstr "Budowa"
 
 #. item "Land use/Construction area"
@@ -28872,5 +28878,5 @@
 #: build/trans_presets.java:3186
 msgid "Greenfield"
-msgstr "teren pod zabudowę"
+msgstr "Teren pod zabudowę"
 
 #. item "Land use/Greenfield"
@@ -28882,5 +28888,5 @@
 #: build/trans_presets.java:3192
 msgid "Landfill"
-msgstr "wysypisko"
+msgstr "Wysypisko"
 
 #. item "Land use/Landfill"
@@ -32594,5 +32600,5 @@
 #: build/trans_style.java:3367
 msgid "cemetery"
-msgstr "cmentarz"
+msgstr "Cmentarz"
 
 #. color light_water
@@ -32605,5 +32611,5 @@
 #: build/trans_style.java:3443
 msgid "peak"
-msgstr "szczyt"
+msgstr "Szczyt"
 
 #. color peak
@@ -32618,5 +32624,5 @@
 #: build/trans_style.java:3452
 msgid "glacier"
-msgstr "lodowiec"
+msgstr "Lodowiec"
 
 #. color glacier
@@ -32630,5 +32636,5 @@
 #: build/trans_style.java:3460
 msgid "volcano"
-msgstr "wulkan"
+msgstr "Wulkan"
 
 #. color volcano
@@ -32698,5 +32704,5 @@
 #: build/trans_style.java:3485
 msgid "scrub"
-msgstr ""
+msgstr "Zarośla"
 
 #. color natural
@@ -32710,5 +32716,5 @@
 #: build/trans_style.java:3501
 msgid "heath"
-msgstr "zdrowie"
+msgstr "Zdrowie"
 
 #. color heath
@@ -32734,5 +32740,5 @@
 #: build/trans_style.java:3541
 msgid "mud"
-msgstr "błoto"
+msgstr "Błoto"
 
 #. color mud
@@ -32746,5 +32752,5 @@
 #: build/trans_style.java:3549
 msgid "beach"
-msgstr "plaża"
+msgstr "Plaża"
 
 #. color deprecated
@@ -33264,12 +33270,778 @@
 msgstr "Sycylia - Włochy"
 
-#~ msgid "Visible State:"
-#~ msgstr "Widoczne:"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "widoczne (na serwerze)"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "nie widoczne (na serwerze)"
+#~ msgid "Move"
+#~ msgstr "Przenieś"
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Żaden dokument nie jest otwarty więc nie ma nic do zapisania."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Nieznane rozszerzenie pliku."
+
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "Load Selection"
+#~ msgstr "Załaduj zaznaczenie"
+
+#~ msgid "Contact {0}..."
+#~ msgstr "Kontakt {0}..."
+
+#~ msgid "Delete the selected layer."
+#~ msgstr "Usuń zaznaczoną warstwę."
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Niezapisane zmiany"
+
+#~ msgid "Unknown version"
+#~ msgstr "Nieznana wersja"
+
+#~ msgid "Incorrect password or username."
+#~ msgstr "Nieprawidłowe hasło lub nazwa użytkownika."
+
+#~ msgid "to"
+#~ msgstr "do"
+
+#~ msgid "true"
+#~ msgstr "prawda"
+
+#~ msgid "false"
+#~ msgstr "fałsz"
+
+#~ msgid "unnamed"
+#~ msgstr "bez nazwy"
+
+#~ msgid "Sync clock"
+#~ msgstr "Synchronizuj zegar"
+
+#~ msgid "Data Layer"
+#~ msgstr "Warstwa danych"
+
+#~ msgid "Do not show again"
+#~ msgstr "Nie pokazuj ponownie"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Błąd podczas przetwarzania"
+
+#~ msgid "image"
+#~ msgid_plural "images"
+#~ msgstr[0] "obraz"
+#~ msgstr[1] "obrazy"
+#~ msgstr[2] "obrazów"
+
+#~ msgid "Image"
+#~ msgstr "Obraz"
+
+#~ msgid "name"
+#~ msgstr "nazwa"
+
+#~ msgid "my version:"
+#~ msgstr "moja wersja:"
+
+#~ msgid "their version:"
+#~ msgstr "ich wersja:"
+
+#~ msgid "Cannot connect to server."
+#~ msgstr "Nie można połączyć się z serwerem."
+
+#~ msgid "Download Area"
+#~ msgstr "Pobierany obszar"
+
+#~ msgid "x from"
+#~ msgstr "x - od"
+
+#~ msgid "y from"
+#~ msgstr "y - od"
+
+#~ msgid "Enable proxy server"
+#~ msgstr "Używaj serwera proxy"
+
+#~ msgid "Anonymous"
+#~ msgstr "Anonimowy"
+
+#~ msgid "Proxy server host"
+#~ msgstr "Proxy - adres serwera"
+
+#~ msgid "Proxy server port"
+#~ msgstr "Proxy - port serwera"
+
+#~ msgid "Proxy server username"
+#~ msgstr "Proxy - nazwa użytkownika"
+
+#~ msgid "Proxy server password"
+#~ msgstr "Proxy - hasło"
+
+#~ msgid "Download missing plugins"
+#~ msgstr "Pobierz brakujące wtyczki"
+
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Używa szablon \"{0}\" z grupy \"{1}\""
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Używa szablon \"{0}\""
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "Plugin not found: {0}."
+#~ msgstr "Nie znaleziono wtyczki: {0}."
+
+#~ msgid "Combine ways with different memberships?"
+#~ msgstr "Czy połączyć drogi, które należą do różnych relacji?"
+
+#~ msgid "zoom"
+#~ msgstr "powiększenie"
+
+#~ msgid "osmarender options"
+#~ msgstr "opcje osmarender"
+
+#~ msgid "Motorboat"
+#~ msgstr "Motorówka"
+
+#~ msgid "Boat"
+#~ msgstr "Łódka"
+
+#~ msgid "Bridleway"
+#~ msgstr "ścieżka do jazdy konnej"
+
+#~ msgid "Cycleway"
+#~ msgstr "ścieżka rowerowa"
+
+#~ msgid "Footway"
+#~ msgstr "droga dla pieszych"
+
+#~ msgid "Track Grade 1"
+#~ msgstr "droga gruntowa klasy 1"
+
+#~ msgid "Track Grade 2"
+#~ msgstr "droga gruntowa klasy 2"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "droga gruntowa klasy 3"
+
+#~ msgid "Track Grade 4"
+#~ msgstr "droga gruntowa klasy 4"
+
+#~ msgid "Track Grade 5"
+#~ msgstr "droga gruntowa klasy 5"
+
+#~ msgid "Edit Hiking"
+#~ msgstr "Edycja szlaku"
+
+#~ msgid "Edit Mountain Hiking"
+#~ msgstr "Edycja szlaku górskiego"
+
+#~ msgid "Edit Demanding Mountain Hiking"
+#~ msgstr "miejsce do zawracania"
+
+#~ msgid "Edit Alpine Hiking"
+#~ msgstr "Edycja szlaku alpejskiego"
+
+#~ msgid "Shop"
+#~ msgstr "warsztat"
+
+#~ msgid "Edit Station"
+#~ msgstr "Edycja stacji"
+
+#~ msgid "Football"
+#~ msgstr "football"
+
+#~ msgid "Charge"
+#~ msgstr "Opłata"
+
+#~ msgid "help"
+#~ msgstr "pomoc"
+
+#~ msgid "Help / About"
+#~ msgstr "Pomoc / Informacje"
+
+#~ msgid "WMS Plugin Help"
+#~ msgstr "Pomoc wtyczki WMS"
+
+#~ msgid "No data imported."
+#~ msgstr "Nie zaimportowano danych."
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Błąd w czasie ładowania strony {0}"
+
+#~ msgid "Open in Browser"
+#~ msgstr "Otwórz w przeglądarce"
+
+#~ msgid "JOSM Online Help"
+#~ msgstr "Pomoc JOSM w sieci"
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Wybierz najpierw zakładkę."
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Sprzeczne relacje"
+
+#~ msgid "rectifier id={0}"
+#~ msgstr "rectifier id={0}"
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO (GNOME Fix)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid ""
+#~ "The plugin could not be removed. Please tell the people you got JOSM from "
+#~ "about the problem."
+#~ msgstr ""
+#~ "Wtyczka nie może zostać usunięta. Proszę przekaż informacje o tym "
+#~ "problemie autorom JOSM."
+
+#~ msgid "Error during parse."
+#~ msgstr "Błąd parsowania danych"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Transfer przerwany z powodu błędu (czekam 5 sekund):"
+
+#~ msgid "Enter Password"
+#~ msgstr "Wprowadź hasło"
+
+#~ msgid "Plugin requires JOSM update: {0}."
+#~ msgstr "Plugin wymaga aktualizacji JOSM: {0}."
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> nie posiada referencji"
+
+#~ msgid "Please report a ticket at {0}"
+#~ msgstr "Proszę zgłosić bład pod adresem {0}"
+
+#~ msgid "Preparing..."
+#~ msgstr "Przygotowywanie..."
+
+#~ msgid "Tags (empty value deletes tag)"
+#~ msgstr "Etykiety (ustawienie wartości na pustą usuwa etykietę)"
+
+#~ msgid ""
+#~ "Try updating to the newest version of JOSM and all plugins before "
+#~ "reporting a bug."
+#~ msgstr ""
+#~ "Postaraj się zaintalować najnowszą wersję tej wtyczki przed zgłaszaniem "
+#~ "błędu."
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "Znaleziono tag <member> w"
+
+#~ msgid "Could not read from URL: \"{0}\""
+#~ msgstr "Nie można odczytać \"{0}\""
+
+#~ msgid "Upload to OSM..."
+#~ msgstr "Wyślij do OSM..."
+
+#~ msgid "Include your steps to get to the error (as detailed as possible)!"
+#~ msgstr ""
+#~ "Dołącz instrukcje (dokładne i krok po kroku) w jaki sposób można "
+#~ "odtworzyć błędną sytuację."
+
+#~ msgid "Be sure to include the following information:"
+#~ msgstr "Upewnij się, żeby załączyć następujące informacje:"
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Serwer zgłosił błąd wewnętrzny. Spróbuj zmniejszyć obszar lub spróbować "
+#~ "po chwili."
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Zły format identyfikatora węzła"
+
+#~ msgid "Uploading..."
+#~ msgstr "Wysyłanie..."
+
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "(Można zmienić ilość dni, po których pojawia się to ostrzeżenie<br>przez "
+#~ "ustawienie opcji konfiguracyjnej 'pluginmanager.warntime'.)"
+
+#~ msgid "Error parsing server response."
+#~ msgstr "Błąd podczas parsowania odpowiedzi serwera."
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "Wystąpiły konfikty podczas importowania."
+
+#~ msgid ""
+#~ "There were problems with the following plugins:\n"
+#~ "\n"
+#~ " {0}"
+#~ msgstr ""
+#~ "Wystąpiły problemy z następującymi wtyczkami:\n"
+#~ " {0}"
+
+#~ msgid ""
+#~ "The plugin {0} seems to be broken or could not be downloaded "
+#~ "automatically."
+#~ msgstr ""
+#~ "Wtyczka {0} wydaje siębyć zepsuta lub nie można było jej pobrać "
+#~ "automatycznie."
+
+#~ msgid "Could not download plugin: {0} from {1}"
+#~ msgstr "Nie można pobrać wtyczki {0} z {1}"
+
+#~ msgid "Error: {0}"
+#~ msgstr "Błąd: {0}"
+
+#~ msgid "Warning: {0}"
+#~ msgstr "Uwaga: {0}"
+
+#~ msgid ""
+#~ "The projection \"{0}\" is designed for\n"
+#~ "latitudes between 46.1° and 57° only.\n"
+#~ "Use another projection system if you are not using\n"
+#~ "a French WMS server.\n"
+#~ "Do not upload any data after this message."
+#~ msgstr ""
+#~ "Odwzorowanie \"{0}\" jest zaprojektowany\n"
+#~ "dla szerokości geograficznych między 46.1° a 57°.\n"
+#~ "Proszę użyć innego odwzorowania jeśli\n"
+#~ "nie korzystasz z francuskiego serwera WMS.\n"
+#~ "Proszę nie wysyłać żadnych danych po tej wiadomości."
+
+#~ msgid "map"
+#~ msgstr "mapa"
+
+#~ msgid "Drawbridge"
+#~ msgstr "Most zwodzony"
+
+#~ msgid "aqueduct"
+#~ msgstr "akwedukt"
+
+#~ msgid "Synchronize Time with GPS Unit"
+#~ msgstr "Synchronizuj czas z urządzeniem GPS"
+
+#~ msgid "Hint: Some changes came from uploading new data to the server."
+#~ msgstr ""
+#~ "Wskazówka: Niektóre zmiany powstały z powodu wysłania danych na serwer."
+
+#~ msgid "Unknown role ''{0}''."
+#~ msgstr "Nieznana rola \"{0}\"."
+
+#~ msgid "Parsing error in URL: \"{0}\""
+#~ msgstr "Błąd przetwarzania adresu URL: \"{0}\""
+
+#~ msgid "Only two nodes allowed"
+#~ msgstr "Dozwolone są tylko dwa węzły"
+
+#~ msgid "Only one node selected"
+#~ msgstr "Wybrano tylko jeden węzeł"
+
+#~ msgid "File not found"
+#~ msgstr "Plik nie został odnaleziony"
+
+#~ msgid "The date in file \"{0}\" could not be parsed."
+#~ msgstr "Data zawarta w pliku \"{0}\" nie mogła zostać przetworzona."
+
+#~ msgid "Layers: {0}"
+#~ msgstr "Warstwy: {0}"
+
+#~ msgid "Authors: {0}"
+#~ msgstr "Autorzy: {0}"
+
+#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
+#~ msgstr ""
+#~ "Pomijanie drogi, ponieważ zawiera ona węzeł, który nie istnieje: {0}\n"
+
+#~ msgid "Plugin already exists"
+#~ msgstr "Wtyczka już istnieje"
+
+#~ msgid ""
+#~ "Plugin archive already available. Do you want to download the current "
+#~ "version by deleting existing archive?\n"
+#~ "\n"
+#~ "{0}"
+#~ msgstr ""
+#~ "Archiwum z wtyczką już istnieje. Czy na pewno pobrać aktualną wersję "
+#~ "kasując istniejące archiwum?\n"
+#~ "\n"
+#~ "{0}"
+
+#~ msgid ""
+#~ "Activating the updated plugins failed. Check if JOSM has the permission "
+#~ "to overwrite the existing ones."
+#~ msgstr ""
+#~ "Aktywacja zaktualizowanych wtyczek nie powiodła się. Sprawdź czy JOSM ma "
+#~ "uprawnienia aby nadpisać istniejące pliki."
+
+#~ msgid "NullPointerException, possibly some missing tags."
+#~ msgstr ""
+#~ "Wyjątek NullPointerException, prawdopodobnie brakuje jakichś znaczników."
+
+#~ msgid "different"
+#~ msgstr "różne"
+
+#~ msgid "Split way segment"
+#~ msgstr "Rozdziel segmenty drogi"
+
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr ""
+#~ "Wybrane węzły są częścią różnych relacji. Czy nadal chcesz je scalić."
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Czy scalić węzły z różnych relacji?"
+
+#~ msgid "Expected closing parenthesis."
+#~ msgstr "Brak nawiasu zamykającego."
+
+#~ msgid "Some of the nodes are (almost) in the line"
+#~ msgstr "Niektóre z węzłów są (prawie) w jednej linii"
+
+#~ msgid "Please select one or more closed ways of at least four nodes."
+#~ msgstr ""
+#~ "Wybierz przynajmniej jedną lub więcej zamkniętych dróg o co najmniej "
+#~ "czterech węzłach."
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Wpisz proszę czego szukać"
+
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr "Możesz użyć myszki lub Ctrl+strzałki/./ aby powiększać i przesuwać."
+
+#~ msgid "Set the language."
+#~ msgstr "Ustaw język"
+
+#~ msgid "GPS start: {0}"
+#~ msgstr "GPS początek: {0}"
+
+#~ msgid "GPS end: {0}"
+#~ msgstr "GPS koniec: {0}"
+
+#~ msgid "current delta: {0}s"
+#~ msgstr "aktualne przesunięcie: {0}s"
+
+#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+#~ msgstr "Wpisz pokazaną datę (mm/dd/yyyy HH:MM:SS)"
+
+#~ msgid "GPS unit timezone (difference to photo)"
+#~ msgstr "Strefa czasowa urządzenia GPS (różnica do zdjęcia)"
+
+#~ msgid "The base URL for the OSM server (REST API)"
+#~ msgstr "Adres URL serwera OSM (REST API)"
+
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr "Hasło konta OSM. Pozostaw puste aby nie zapamiętywać hasła."
+
+#~ msgid "Add all currently selected objects as members"
+#~ msgstr "Dodaj wszystkie obecnie zaznaczone obiekty jako członków"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO (WebKit GTK)"
+
+#~ msgid "citymap"
+#~ msgstr "mapa miasta"
+
+#~ msgid "hikingmap"
+#~ msgstr "mapa tras pieszych"
+
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr "Weryfikuje bieżące zaznaczenie lub całość danych."
+
+#~ msgid "Open User Page"
+#~ msgstr "Otwórz stronę użytkownika"
+
+#~ msgid "Open User Page in browser"
+#~ msgstr "Otwiera stronę użytkownika w przeglądarce"
+
+#~ msgid "Portcullis"
+#~ msgstr "brona"
+
+#~ msgid "Command Stack: {0}"
+#~ msgstr "Historia poleceń: {0}"
+
+#~ msgid "Merging conflicts."
+#~ msgstr "Rozwiązywanie konflików."
+
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "Strony pomocy można edytować tylko z Pomocy Online JOSM"
+
+#~ msgid "Really mark this issue as ''done''?"
+#~ msgstr "Czy na pewno oznaczyć ten problem jako \"załatwiony\"?"
+
+#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
+#~ msgstr ""
+#~ "Otwiera okno OpenStreetBugs i aktywuje automatyczne pobieranie danych"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Nie można odczytać wyników wyszukiwania z serwera."
+
+#~ msgid "Open images with AgPifoJ..."
+#~ msgstr "Otwórz obrazy za pomocą AgPifoJ..."
+
+#~ msgid "AgPifoJ - Geotagged pictures"
+#~ msgstr "AgPifoJ - Geotagowane obrazy"
+
+#~ msgid "Remove Selected"
+#~ msgstr "Usuń zaznaczone"
+
+#~ msgid "No time for point {0} x {1}"
+#~ msgstr "Brak znacznika czasowego dla punktu {0} x {1}"
+
+#~ msgid "Images for {0}"
+#~ msgstr "Obrazy dla {0}"
+
+#~ msgid "sports"
+#~ msgstr "Sklep sportowy"
+
+#~ msgid "viaduct"
+#~ msgstr "Wiadukt"
+
+#~ msgid "Navigation"
+#~ msgstr "Nawigacja"
+
+#~ msgid "Show Author Panel"
+#~ msgstr "Pokaż panel autorów"
+
+#~ msgid "Please select some data"
+#~ msgstr "Proszę zaznaczyć jakieś dane"
+
+#~ msgid "Select User's Data"
+#~ msgstr "Wybierz dane użytkownika"
+
+#~ msgid "GPX Track loaded"
+#~ msgstr "Ślad GPX wczytany"
+
+#~ msgid "All images"
+#~ msgstr "Wszystkie obrazy"
+
+#~ msgid "Occupied By"
+#~ msgstr "Zajęte przez"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Kliknij \"Odśwież\" by zaktualizować listę"
+
+#~ msgid "Relation Editor: {0}"
+#~ msgstr "Edytor relacji: {0}"
+
+#~ msgid "Move Up"
+#~ msgstr "Przesuń w górę"
+
+#~ msgid "Move Down"
+#~ msgstr "Przesuń w dół"
+
+#~ msgid "There is no EXIF time within the file \"{0}\"."
+#~ msgstr "Plik {0} nie zawiera żadnych danych EXIF o czasie."
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Źródło szablonów"
+
+#~ msgid "{0} within the track."
+#~ msgstr "{0} wewnątrz ścieżki GPS."
+
+#~ msgid "Login"
+#~ msgstr "Logowanie"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Cofnij stan aktualnie zaznaczonych obiektów do wersji zaznaczonej w "
+#~ "liście historia poleceń."
+
+#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
+#~ msgstr "Nie można odczytać czasu \"{0}\" w punkcie {1} x {2}"
+
+#~ msgid "No images with readable timestamps found."
+#~ msgstr "Nie można znaleźć obrazów z czytelnym znacznikiem czasowym"
+
+#~ msgid "Read GPX..."
+#~ msgstr "Wczytaj GPX..."
+
+#~ msgid "Edit Properties"
+#~ msgstr "Edycja właściwości"
+
+#~ msgid "Edit Track of grade 1"
+#~ msgstr "Edycja drogi gruntowej klasy 1"
+
+#~ msgid "Edit Track of grade 2"
+#~ msgstr "Edycja drogi gruntowej klasy 2"
+
+#~ msgid "Edit Track of grade 3"
+#~ msgstr "Edycja drogi gruntowej klasy 3"
+
+#~ msgid "Edit Track of grade 4"
+#~ msgstr "Edycja drogi gruntowej klasy 4"
+
+#~ msgid "Edit Track of grade 5"
+#~ msgstr "Edycja drogi gruntowej klasy 5"
+
+#~ msgid "Edit Demanding Alpine Hiking"
+#~ msgstr "Edycja stromego szlaku alpejskiego"
+
+#~ msgid "Edit Difficult Alpine Hiking"
+#~ msgstr "Edycja trudnego szlaku alpejskiego"
+
+#~ msgid "Edit Drawbridge"
+#~ msgstr "Edycja mostu zwodzonego"
+
+#~ msgid "Edit Portcullis"
+#~ msgstr "Edycja brony"
+
+#~ msgid "All the ways were empty"
+#~ msgstr "Wszystkie trasy są puste"
+
+#~ msgid ""
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
+#~ msgstr ""
+#~ "Wybrane drogi należą do różnych relacji. Czy nadal chcesz je połączyć?"
+
+#~ msgid ""
+#~ "Please select at least one node, way or relation. Only already uploaded "
+#~ "elements have a history."
+#~ msgstr ""
+#~ "Wybierz co najmniej jeden węzeł, drogę lub relację. Tylko wcześniej "
+#~ "przesłane elementy posiadają historię."
+
+#~ msgid "Merge Anyway"
+#~ msgstr "Scal mimo tego"
+
+#~ msgid "Update Data"
+#~ msgstr "Zaktualizuj dane"
+
+#~ msgid "Errors during Download"
+#~ msgstr "Błędy podczas pobierania"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "{0} obiekt ma konflikt:"
+#~ msgstr[1] "{0} obiekty mają konflikt:"
+#~ msgstr[2] "{0} obiektów ma konflikt:"
+
+#~ msgid "Delete and Download"
+#~ msgstr "Usuń i pobierz"
+
+#~ msgid "Board Type"
+#~ msgstr "Rodzaj tablicy"
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Należy wybrać przynajmniej jeden element do pobrania"
+
+#~ msgid ""
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
+#~ msgstr ""
+#~ "Nie znaleziono danych do aktualizacji. Czy została pobrana lub otwarta "
+#~ "jakakolwiek warstwa danych?"
+
+#~ msgid ""
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
+#~ msgstr ""
+#~ "Błąd wewnętrzny: proszę zgłosić błąd dla komunikatu: \"cannot check "
+#~ "conditions for no layer\"."
+
+#~ msgid ""
+#~ "This action will require {0} individual download requests. Do you wish to "
+#~ "continue?"
+#~ msgstr "Ta akcja wymaga wykonania {0} pobrań danych. Kontynuować?"
+
+#~ msgid "Invalid projection"
+#~ msgstr "Nieprawidłowe odwzorowanie"
+
+#~ msgid ""
+#~ "Current number of changes exceeds the max. number of changes, current is "
+#~ "{0}, max is {1}"
+#~ msgstr ""
+#~ "Aktualna ilość zmian przekracza maksymalną możliwą ilość. Aktualna ilość "
+#~ "zmian to {0} z możliwych {1}"
+
+#~ msgid "Failed to initialize API. Please try again later."
+#~ msgstr "Błąd inicjalizacji API. Proszę spróbować później."
+
+#~ msgid "Update Selection"
+#~ msgstr "Aktualizuj zaznaczenie"
+
+#~ msgid "Conflict detected"
+#~ msgstr "Wykryto konflikt"
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Załadunek do API OSM się nie udał."
+
+#~ msgid "Can't search because there is no loaded data."
+#~ msgstr "Nie mogę szukać ponieważ nie załadowano danych."
+
+#~ msgid ""
+#~ "You are about to delete nodes outside of the area you have downloaded."
+#~ "<br>This can cause problems because other objects (that you don't see) "
+#~ "might use them.<br>Do you really want to delete?"
+#~ msgstr ""
+#~ "Zamierzasz usunąć węzły spoza obszaru, który pobrano.<br>Może to "
+#~ "spowodowac problem, ponieważ inne (niewidoczne dla ciebie) obiekty mogą "
+#~ "używać tych węzłów.<br>Czy naprawdę zamierzasz je usunąć?"
+
+#~ msgid ""
+#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
+#~ msgid_plural ""
+#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
+#~ msgstr[0] ""
+#~ "Nie zapisano zmian na {0} warstwie. Porzucić zmiany i kontynuować?"
+#~ msgstr[1] ""
+#~ "Nie zapisano zmian na {0} warstwach. Porzucić zmiany i kontynuować?"
+#~ msgstr[2] ""
+#~ "Nie zapisano zmian na {0} warstwach. Porzucić zmiany i kontynuować?"
+
+#~ msgid "Always move and don't show dialog again"
+#~ msgstr "Zawsze przesuwaj i nie pokazuj tego okna dialogowego"
+
+#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr ""
+#~ "Brak strony pomocy. Utwórz ją w języku <A HREF=\"{0}\">angielskim</A>."
+
+#~ msgid ""
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Brak strony pomocy. Utwórz ją w języku <A HREF=\"{0}\">angielskim</A> lub "
+#~ "<A HREF=\"{1}\">swoim języku</A>."
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr ""
+#~ "Brak strony pomocy. Możesz ją utworzyć po <a href=\"{0}\">angielsku</a>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Brak strony pomocy. Możesz ją utworzyć po <a href=\"{0}\">angielsku</a> "
+#~ "lub <A HREF=\"{1}\">po polsku</A>."
+
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "parameter ''{0}'' nie może być pusty (null)"
+
+#~ msgid "Unexpected return value. Got {0}."
+#~ msgstr "niespodziewana wartość powrotna. Dostałem {0}"
+
+#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+#~ msgstr "Oczekiwałem warstwy danych OSM, bądź GPX. Otrzymałem \"{0}\"."
+
+#~ msgid "Updates the currently selected primitives from the server"
+#~ msgstr "Odświerzam wybrane elementy pobierając z serwera."
+
+#~ msgid "Updating primitive"
+#~ msgstr "Odświeżam element"
+
+#~ msgid "Deleted or moved primitives"
+#~ msgstr "usunięte, bądź przesunięte elementy"
+
+#~ msgid ""
+#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
+#~ "resolve them first.</html>"
+#~ msgstr ""
+#~ "<html>Powstały nierozwiązywalne automagicznie konflikty w warstwie "
+#~ "''{0}''.<br>Musisz je najpierw rozwiązać.</html>"
+
+#~ msgid "Apply also for children"
+#~ msgstr "Zastosuj także dla dzieci"
 
 #~ msgid ""
@@ -33289,781 +34061,15 @@
 #~ "Konfliktów aby rozwiązać je ręcznie."
 
+#~ msgid "not visible (on the server)"
+#~ msgstr "nie widoczne (na serwerze)"
+
+#~ msgid "visible (on the server)"
+#~ msgstr "widoczne (na serwerze)"
+
+#~ msgid "Visible State:"
+#~ msgstr "Widoczne:"
+
 #~ msgid "football"
 #~ msgstr "futbol amerykański"
-
-#~ msgid "Football"
-#~ msgstr "football"
-
-#~ msgid "Move"
-#~ msgstr "Przenieś"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Żaden dokument nie jest otwarty więc nie ma nic do zapisania."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Nieznane rozszerzenie pliku."
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "Load Selection"
-#~ msgstr "Załaduj zaznaczenie"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "Kontakt {0}..."
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Usuń zaznaczoną warstwę."
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Niezapisane zmiany"
-
-#~ msgid "Unknown version"
-#~ msgstr "Nieznana wersja"
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Nieprawidłowe hasło lub nazwa użytkownika."
-
-#~ msgid "to"
-#~ msgstr "do"
-
-#~ msgid "true"
-#~ msgstr "prawda"
-
-#~ msgid "false"
-#~ msgstr "fałsz"
-
-#~ msgid "unnamed"
-#~ msgstr "bez nazwy"
-
-#~ msgid "Sync clock"
-#~ msgstr "Synchronizuj zegar"
-
-#~ msgid "Data Layer"
-#~ msgstr "Warstwa danych"
-
-#~ msgid "Do not show again"
-#~ msgstr "Nie pokazuj ponownie"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Błąd podczas przetwarzania"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "obraz"
-#~ msgstr[1] "obrazy"
-#~ msgstr[2] "obrazów"
-
-#~ msgid "Image"
-#~ msgstr "Obraz"
-
-#~ msgid "name"
-#~ msgstr "nazwa"
-
-#~ msgid "my version:"
-#~ msgstr "moja wersja:"
-
-#~ msgid "their version:"
-#~ msgstr "ich wersja:"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Nie można połączyć się z serwerem."
-
-#~ msgid "Download Area"
-#~ msgstr "Pobierany obszar"
-
-#~ msgid "x from"
-#~ msgstr "x - od"
-
-#~ msgid "y from"
-#~ msgstr "y - od"
-
-#~ msgid "Enable proxy server"
-#~ msgstr "Używaj serwera proxy"
-
-#~ msgid "Anonymous"
-#~ msgstr "Anonimowy"
-
-#~ msgid "Proxy server host"
-#~ msgstr "Proxy - adres serwera"
-
-#~ msgid "Proxy server port"
-#~ msgstr "Proxy - port serwera"
-
-#~ msgid "Proxy server username"
-#~ msgstr "Proxy - nazwa użytkownika"
-
-#~ msgid "Proxy server password"
-#~ msgstr "Proxy - hasło"
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Pobierz brakujące wtyczki"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Używa szablon \"{0}\" z grupy \"{1}\""
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Używa szablon \"{0}\""
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Nie znaleziono wtyczki: {0}."
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Czy połączyć drogi, które należą do różnych relacji?"
-
-#~ msgid "zoom"
-#~ msgstr "powiększenie"
-
-#~ msgid "osmarender options"
-#~ msgstr "opcje osmarender"
-
-#~ msgid "Motorboat"
-#~ msgstr "Motorówka"
-
-#~ msgid "Boat"
-#~ msgstr "Łódka"
-
-#~ msgid "Bridleway"
-#~ msgstr "ścieżka do jazdy konnej"
-
-#~ msgid "Cycleway"
-#~ msgstr "ścieżka rowerowa"
-
-#~ msgid "Footway"
-#~ msgstr "droga dla pieszych"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "droga gruntowa klasy 1"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "droga gruntowa klasy 2"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "droga gruntowa klasy 3"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "droga gruntowa klasy 4"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "droga gruntowa klasy 5"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Edycja szlaku"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Edycja szlaku górskiego"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "miejsce do zawracania"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Edycja szlaku alpejskiego"
-
-#~ msgid "Shop"
-#~ msgstr "warsztat"
-
-#~ msgid "Edit Station"
-#~ msgstr "Edycja stacji"
-
-#~ msgid "Charge"
-#~ msgstr "Opłata"
-
-#~ msgid "help"
-#~ msgstr "pomoc"
-
-#~ msgid "Help / About"
-#~ msgstr "Pomoc / Informacje"
-
-#~ msgid "WMS Plugin Help"
-#~ msgstr "Pomoc wtyczki WMS"
-
-#~ msgid "No data imported."
-#~ msgstr "Nie zaimportowano danych."
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Błąd w czasie ładowania strony {0}"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Otwórz w przeglądarce"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "Pomoc JOSM w sieci"
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Wybierz najpierw zakładkę."
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Sprzeczne relacje"
-
-#~ msgid "rectifier id={0}"
-#~ msgstr "rectifier id={0}"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO (GNOME Fix)"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "Wtyczka nie może zostać usunięta. Proszę przekaż informacje o tym "
-#~ "problemie autorom JOSM."
-
-#~ msgid "Error during parse."
-#~ msgstr "Błąd parsowania danych"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Transfer przerwany z powodu błędu (czekam 5 sekund):"
-
-#~ msgid "Enter Password"
-#~ msgstr "Wprowadź hasło"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Plugin wymaga aktualizacji JOSM: {0}."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> nie posiada referencji"
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Proszę zgłosić bład pod adresem {0}"
-
-#~ msgid "Preparing..."
-#~ msgstr "Przygotowywanie..."
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Etykiety (ustawienie wartości na pustą usuwa etykietę)"
-
-#~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
-#~ msgstr ""
-#~ "Postaraj się zaintalować najnowszą wersję tej wtyczki przed zgłaszaniem "
-#~ "błędu."
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Znaleziono tag <member> w"
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "Nie można odczytać \"{0}\""
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "Wyślij do OSM..."
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr ""
-#~ "Dołącz instrukcje (dokładne i krok po kroku) w jaki sposób można "
-#~ "odtworzyć błędną sytuację."
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Upewnij się, żeby załączyć następujące informacje:"
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Serwer zgłosił błąd wewnętrzny. Spróbuj zmniejszyć obszar lub spróbować "
-#~ "po chwili."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Zły format identyfikatora węzła"
-
-#~ msgid "Uploading..."
-#~ msgstr "Wysyłanie..."
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "(Można zmienić ilość dni, po których pojawia się to ostrzeżenie<br>przez "
-#~ "ustawienie opcji konfiguracyjnej 'pluginmanager.warntime'.)"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Błąd podczas parsowania odpowiedzi serwera."
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Wystąpiły konfikty podczas importowania."
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "Wystąpiły problemy z następującymi wtyczkami:\n"
-#~ " {0}"
-
-#~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr ""
-#~ "Wtyczka {0} wydaje siębyć zepsuta lub nie można było jej pobrać "
-#~ "automatycznie."
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Nie można pobrać wtyczki {0} z {1}"
-
-#~ msgid "Error: {0}"
-#~ msgstr "Błąd: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Uwaga: {0}"
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 46.1° and 57° only.\n"
-#~ "Use another projection system if you are not using\n"
-#~ "a French WMS server.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "Odwzorowanie \"{0}\" jest zaprojektowany\n"
-#~ "dla szerokości geograficznych między 46.1° a 57°.\n"
-#~ "Proszę użyć innego odwzorowania jeśli\n"
-#~ "nie korzystasz z francuskiego serwera WMS.\n"
-#~ "Proszę nie wysyłać żadnych danych po tej wiadomości."
-
-#~ msgid "map"
-#~ msgstr "mapa"
-
-#~ msgid "Drawbridge"
-#~ msgstr "Most zwodzony"
-
-#~ msgid "aqueduct"
-#~ msgstr "akwedukt"
-
-#~ msgid "Synchronize Time with GPS Unit"
-#~ msgstr "Synchronizuj czas z urządzeniem GPS"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr ""
-#~ "Wskazówka: Niektóre zmiany powstały z powodu wysłania danych na serwer."
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Nieznana rola \"{0}\"."
-
-#~ msgid "Parsing error in URL: \"{0}\""
-#~ msgstr "Błąd przetwarzania adresu URL: \"{0}\""
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Dozwolone są tylko dwa węzły"
-
-#~ msgid "Only one node selected"
-#~ msgstr "Wybrano tylko jeden węzeł"
-
-#~ msgid "File not found"
-#~ msgstr "Plik nie został odnaleziony"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "Data zawarta w pliku \"{0}\" nie mogła zostać przetworzona."
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Warstwy: {0}"
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Autorzy: {0}"
-
-#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr ""
-#~ "Pomijanie drogi, ponieważ zawiera ona węzeł, który nie istnieje: {0}\n"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Wtyczka już istnieje"
-
-#~ msgid ""
-#~ "Plugin archive already available. Do you want to download the current "
-#~ "version by deleting existing archive?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Archiwum z wtyczką już istnieje. Czy na pewno pobrać aktualną wersję "
-#~ "kasując istniejące archiwum?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "Aktywacja zaktualizowanych wtyczek nie powiodła się. Sprawdź czy JOSM ma "
-#~ "uprawnienia aby nadpisać istniejące pliki."
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr ""
-#~ "Wyjątek NullPointerException, prawdopodobnie brakuje jakichś znaczników."
-
-#~ msgid "different"
-#~ msgstr "różne"
-
-#~ msgid "Split way segment"
-#~ msgstr "Rozdziel segmenty drogi"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "Wybrane węzły są częścią różnych relacji. Czy nadal chcesz je scalić."
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Czy scalić węzły z różnych relacji?"
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "Brak nawiasu zamykającego."
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Niektóre z węzłów są (prawie) w jednej linii"
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr ""
-#~ "Wybierz przynajmniej jedną lub więcej zamkniętych dróg o co najmniej "
-#~ "czterech węzłach."
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Wpisz proszę czego szukać"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr "Możesz użyć myszki lub Ctrl+strzałki/./ aby powiększać i przesuwać."
-
-#~ msgid "Set the language."
-#~ msgstr "Ustaw język"
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "GPS początek: {0}"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "GPS koniec: {0}"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "aktualne przesunięcie: {0}s"
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Wpisz pokazaną datę (mm/dd/yyyy HH:MM:SS)"
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "Strefa czasowa urządzenia GPS (różnica do zdjęcia)"
-
-#~ msgid "The base URL for the OSM server (REST API)"
-#~ msgstr "Adres URL serwera OSM (REST API)"
-
-#~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-#~ msgstr "Hasło konta OSM. Pozostaw puste aby nie zapamiętywać hasła."
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Dodaj wszystkie obecnie zaznaczone obiekty jako członków"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO (WebKit GTK)"
-
-#~ msgid "citymap"
-#~ msgstr "mapa miasta"
-
-#~ msgid "hikingmap"
-#~ msgstr "mapa tras pieszych"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Weryfikuje bieżące zaznaczenie lub całość danych."
-
-#~ msgid "Open User Page"
-#~ msgstr "Otwórz stronę użytkownika"
-
-#~ msgid "Open User Page in browser"
-#~ msgstr "Otwiera stronę użytkownika w przeglądarce"
-
-#~ msgid "Portcullis"
-#~ msgstr "brona"
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Historia poleceń: {0}"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Rozwiązywanie konflików."
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Strony pomocy można edytować tylko z Pomocy Online JOSM"
-
-#~ msgid "Really mark this issue as ''done''?"
-#~ msgstr "Czy na pewno oznaczyć ten problem jako \"załatwiony\"?"
-
-#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
-#~ msgstr ""
-#~ "Otwiera okno OpenStreetBugs i aktywuje automatyczne pobieranie danych"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Nie można odczytać wyników wyszukiwania z serwera."
-
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "Otwórz obrazy za pomocą AgPifoJ..."
-
-#~ msgid "AgPifoJ - Geotagged pictures"
-#~ msgstr "AgPifoJ - Geotagowane obrazy"
-
-#~ msgid "Remove Selected"
-#~ msgstr "Usuń zaznaczone"
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Brak znacznika czasowego dla punktu {0} x {1}"
-
-#~ msgid "Images for {0}"
-#~ msgstr "Obrazy dla {0}"
-
-#~ msgid "sports"
-#~ msgstr "Sklep sportowy"
-
-#~ msgid "viaduct"
-#~ msgstr "Wiadukt"
-
-#~ msgid "Navigation"
-#~ msgstr "Nawigacja"
-
-#~ msgid "Show Author Panel"
-#~ msgstr "Pokaż panel autorów"
-
-#~ msgid "Please select some data"
-#~ msgstr "Proszę zaznaczyć jakieś dane"
-
-#~ msgid "Select User's Data"
-#~ msgstr "Wybierz dane użytkownika"
-
-#~ msgid "GPX Track loaded"
-#~ msgstr "Ślad GPX wczytany"
-
-#~ msgid "All images"
-#~ msgstr "Wszystkie obrazy"
-
-#~ msgid "Occupied By"
-#~ msgstr "Zajęte przez"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Kliknij \"Odśwież\" by zaktualizować listę"
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "Edytor relacji: {0}"
-
-#~ msgid "Move Up"
-#~ msgstr "Przesuń w górę"
-
-#~ msgid "Move Down"
-#~ msgstr "Przesuń w dół"
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "Plik {0} nie zawiera żadnych danych EXIF o czasie."
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Źródło szablonów"
-
-#~ msgid "{0} within the track."
-#~ msgstr "{0} wewnątrz ścieżki GPS."
-
-#~ msgid "Login"
-#~ msgstr "Logowanie"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Cofnij stan aktualnie zaznaczonych obiektów do wersji zaznaczonej w "
-#~ "liście historia poleceń."
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Nie można odczytać czasu \"{0}\" w punkcie {1} x {2}"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Nie można znaleźć obrazów z czytelnym znacznikiem czasowym"
-
-#~ msgid "Read GPX..."
-#~ msgstr "Wczytaj GPX..."
-
-#~ msgid "Edit Properties"
-#~ msgstr "Edycja właściwości"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Edycja drogi gruntowej klasy 1"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Edycja drogi gruntowej klasy 2"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Edycja drogi gruntowej klasy 3"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Edycja drogi gruntowej klasy 4"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Edycja drogi gruntowej klasy 5"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Edycja stromego szlaku alpejskiego"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Edycja trudnego szlaku alpejskiego"
-
-#~ msgid "Edit Drawbridge"
-#~ msgstr "Edycja mostu zwodzonego"
-
-#~ msgid "Edit Portcullis"
-#~ msgstr "Edycja brony"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Wszystkie trasy są puste"
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "Wybrane drogi należą do różnych relacji. Czy nadal chcesz je połączyć?"
-
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "Wybierz co najmniej jeden węzeł, drogę lub relację. Tylko wcześniej "
-#~ "przesłane elementy posiadają historię."
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Scal mimo tego"
-
-#~ msgid "Update Data"
-#~ msgstr "Zaktualizuj dane"
-
-#~ msgid "Errors during Download"
-#~ msgstr "Błędy podczas pobierania"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} obiekt ma konflikt:"
-#~ msgstr[1] "{0} obiekty mają konflikt:"
-#~ msgstr[2] "{0} obiektów ma konflikt:"
-
-#~ msgid "Delete and Download"
-#~ msgstr "Usuń i pobierz"
-
-#~ msgid "Board Type"
-#~ msgstr "Rodzaj tablicy"
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Należy wybrać przynajmniej jeden element do pobrania"
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Nie znaleziono danych do aktualizacji. Czy została pobrana lub otwarta "
-#~ "jakakolwiek warstwa danych?"
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Błąd wewnętrzny: proszę zgłosić błąd dla komunikatu: \"cannot check "
-#~ "conditions for no layer\"."
-
-#~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr "Ta akcja wymaga wykonania {0} pobrań danych. Kontynuować?"
-
-#~ msgid "Invalid projection"
-#~ msgstr "Nieprawidłowe odwzorowanie"
-
-#~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
-#~ msgstr ""
-#~ "Aktualna ilość zmian przekracza maksymalną możliwą ilość. Aktualna ilość "
-#~ "zmian to {0} z możliwych {1}"
-
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "Błąd inicjalizacji API. Proszę spróbować później."
-
-#~ msgid "Update Selection"
-#~ msgstr "Aktualizuj zaznaczenie"
-
-#~ msgid "Conflict detected"
-#~ msgstr "Wykryto konflikt"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Załadunek do API OSM się nie udał."
-
-#~ msgid "Can't search because there is no loaded data."
-#~ msgstr "Nie mogę szukać ponieważ nie załadowano danych."
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Zamierzasz usunąć węzły spoza obszaru, który pobrano.<br>Może to "
-#~ "spowodowac problem, ponieważ inne (niewidoczne dla ciebie) obiekty mogą "
-#~ "używać tych węzłów.<br>Czy naprawdę zamierzasz je usunąć?"
-
-#~ msgid ""
-#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
-#~ msgid_plural ""
-#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
-#~ msgstr[0] ""
-#~ "Nie zapisano zmian na {0} warstwie. Porzucić zmiany i kontynuować?"
-#~ msgstr[1] ""
-#~ "Nie zapisano zmian na {0} warstwach. Porzucić zmiany i kontynuować?"
-#~ msgstr[2] ""
-#~ "Nie zapisano zmian na {0} warstwach. Porzucić zmiany i kontynuować?"
-
-#~ msgid "Always move and don't show dialog again"
-#~ msgstr "Zawsze przesuwaj i nie pokazuj tego okna dialogowego"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr ""
-#~ "Brak strony pomocy. Utwórz ją w języku <A HREF=\"{0}\">angielskim</A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Brak strony pomocy. Utwórz ją w języku <A HREF=\"{0}\">angielskim</A> lub "
-#~ "<A HREF=\"{1}\">swoim języku</A>."
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr ""
-#~ "Brak strony pomocy. Możesz ją utworzyć po <a href=\"{0}\">angielsku</a>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Brak strony pomocy. Możesz ją utworzyć po <a href=\"{0}\">angielsku</a> "
-#~ "lub <A HREF=\"{1}\">po polsku</A>."
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parameter ''{0}'' nie może być pusty (null)"
-
-#~ msgid "Unexpected return value. Got {0}."
-#~ msgstr "niespodziewana wartość powrotna. Dostałem {0}"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "Oczekiwałem warstwy danych OSM, bądź GPX. Otrzymałem \"{0}\"."
-
-#~ msgid "Updates the currently selected primitives from the server"
-#~ msgstr "Odświerzam wybrane elementy pobierając z serwera."
-
-#~ msgid "Updating primitive"
-#~ msgstr "Odświeżam element"
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "usunięte, bądź przesunięte elementy"
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.</html>"
-#~ msgstr ""
-#~ "<html>Powstały nierozwiązywalne automagicznie konflikty w warstwie "
-#~ "''{0}''.<br>Musisz je najpierw rozwiązać.</html>"
-
-#~ msgid "Apply also for children"
-#~ msgstr "Zastosuj także dla dzieci"
 
 #~ msgctxt "filter"
Index: applications/editors/josm/i18n/po/pt_BR.po
===================================================================
--- applications/editors/josm/i18n/po/pt_BR.po	(revision 22209)
+++ applications/editors/josm/i18n/po/pt_BR.po	(revision 22278)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
-"PO-Revision-Date: 2010-07-05 20:16+0000\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
+"PO-Revision-Date: 2010-07-08 17:59+0000\n"
 "Last-Translator: Rodrigo de Avila <rodrigo@avila.net.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:09+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -271,5 +271,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -664,9 +664,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1511,5 +1511,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2816,6 +2816,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2846,7 +2846,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "Digite uma expressão de busca"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -4451,5 +4450,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -5014,5 +5013,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -5024,5 +5023,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr "Abaixo"
@@ -5644,5 +5643,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5751,9 +5750,9 @@
 msgstr "Resolver conflitos para \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr "Filtrar objetos e esconder/desativá-los"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5766,53 +5765,52 @@
 msgstr "Adicionar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr "Adicionar filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr "Editar filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr "Apagar filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr "Mover filtro para cima."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr "Mover filtro para baixo."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr "Habilitar filtro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr "Esconder elementos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr "Inverter filtro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr "Modo Filtro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr "Filtro Escondido: {0} Desabilitado: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr "Erro ao carregar arquivo"
+msgstr ""
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5820,5 +5818,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5826,5 +5824,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5832,5 +5830,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5838,5 +5836,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5845,5 +5843,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5851,5 +5849,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5857,5 +5855,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5863,24 +5861,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filtro ativo</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> objetos escondidos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> objetos desabilitados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>Feche a janela de filtros para ver todos objetos.<p></html>"
@@ -7937,5 +7935,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:64
 msgid "Download relation members"
-msgstr "Baixar membros do relaçoe"
+msgstr "Daixar membros da relação"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331
@@ -10645,10 +10643,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Remover arquivo de imagem do disco"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10657,5 +10655,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr "O arquivo de imagem não pode ser removido."
@@ -13303,5 +13301,5 @@
 msgstr "Escolha uma licença pré-definida"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -13312,5 +13310,5 @@
 msgstr "Marcadores de {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -13320,5 +13318,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -13328,5 +13326,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -13776,5 +13774,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:238
 msgid "Parsing OSM history data ..."
-msgstr ""
+msgstr "Analisando dados de histórico do OSM..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37
@@ -13981,11 +13979,11 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
 msgid "Parsing OSM data..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+msgstr "Analisando dados do OSM..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+msgstr "Preparando grupo de dados..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14799,11 +14797,11 @@
 "{1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr "Aviso: falha ao manipular arquivo zip ''{0}''. A exceção foi: {1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -14812,5 +14810,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -15505,7 +15503,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
-#, fuzzy
 msgid "on polygon"
-msgstr "Multipolígono"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
@@ -15524,15 +15521,14 @@
 msgstr "Construções"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
-msgstr "Próximo"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr "Rua"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr ""
@@ -15699,5 +15695,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
@@ -17597,7 +17593,6 @@
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85
-#, fuzzy
 msgid "GTFS-Stops"
-msgstr "Paradas"
+msgstr ""
 
 #. item "Bicycle/Rental" text "Name"
@@ -26377,7 +26372,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "american_football"
-msgstr "futebol australiano"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26408,7 +26402,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "canadian_football"
-msgstr "futebol australiano"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26454,7 +26447,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "gaelic_football"
-msgstr "futebol australiano"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26989,35 +26981,29 @@
 
 #: build/trans_presets.java:2076
-#, fuzzy
 msgid "American Football"
-msgstr "Futebol Australiano"
+msgstr ""
 
 #. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-#, fuzzy
 msgid "Edit American Football"
-msgstr "Editar Futebol Australiano"
+msgstr ""
 
 #: build/trans_presets.java:2082
-#, fuzzy
 msgid "Canadian Football"
-msgstr "Editar Futebol Americano"
+msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
 #: build/trans_presets.java:2083
-#, fuzzy
 msgid "Edit Canadian Football"
-msgstr "Editar Futebol Australiano"
+msgstr ""
 
 #: build/trans_presets.java:2088
-#, fuzzy
 msgid "Gaelic Football"
-msgstr "Editar Futebol Americano"
+msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "Editar Futebol Americano"
+msgstr ""
 
 #: build/trans_presets.java:2094
@@ -27027,18 +27013,15 @@
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "Editar Rugby"
+msgstr ""
 
 #: build/trans_presets.java:2100
-#, fuzzy
 msgid "Rugby Union"
-msgstr "Rugby"
+msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "Editar Rugby"
+msgstr ""
 
 #: build/trans_presets.java:2106
@@ -33784,4 +33767,635 @@
 msgstr "Sicilia - Italia"
 
+#~ msgid "Preparing..."
+#~ msgstr "Preparando..."
+
+#~ msgid "Uploading..."
+#~ msgstr "Enviando..."
+
+#~ msgid "Unknown version"
+#~ msgstr "Versão desconhecida"
+
+#~ msgid "Enter Password"
+#~ msgstr "Digite a Senha"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Alterações Não Salvas"
+
+#~ msgid "Do not show again"
+#~ msgstr "Não mostrar novamente"
+
+#~ msgid "Rotate"
+#~ msgstr "Rotacionar"
+
+#~ msgid "Move"
+#~ msgstr "Mover"
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "Encontrado elemento <nd> em non-way."
+
+#~ msgid "Error during parse."
+#~ msgstr "Erro durante interpretação."
+
+#~ msgid "NullPointerException, possibly some missing tags."
+#~ msgstr "Exceção NullPointerException, possivelmente faltam algumas tags."
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "Encontrado elemento <member> em non-relation."
+
+#~ msgid ""
+#~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
+#~ "required."
+#~ msgstr ""
+#~ "Atenção - o carregamento do plugin {0} foi solicitado. Este plugin não é "
+#~ "mais necessário."
+
+#~ msgid "Incorrect password or username."
+#~ msgstr "Senha ou usuário incorreto."
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Identificação de nó mal-formada"
+
+#~ msgid "Plugin not found: {0}."
+#~ msgstr "Plugin não encontrado: {0}."
+
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "(Você pode alterar o número de dias depois que este irá "
+#~ "aparecer<br>definindo a opção de configuração 'pluginmanager.warntime'.)"
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> tem ref zero"
+
+#~ msgid "Please report a ticket at {0}"
+#~ msgstr "Por favor, reporte um erro em {0}"
+
+#~ msgid ""
+#~ "The plugin could not be removed. Please tell the people you got JOSM from "
+#~ "about the problem."
+#~ msgstr ""
+#~ "O plugin não pode ser removido. Por favor, reporte o problema aos "
+#~ "desenvolvedores do JOSM."
+
+#~ msgid "Include your steps to get to the error (as detailed as possible)!"
+#~ msgstr "Inclua os passos para repetir o erro (o mais detalhado possível)!"
+
+#~ msgid ""
+#~ "Try updating to the newest version of JOSM and all plugins before "
+#~ "reporting a bug."
+#~ msgstr ""
+#~ "Tente atualizar para a última versão do JOSM e plugins antes de reportar "
+#~ "um bug."
+
+#~ msgid "Be sure to include the following information:"
+#~ msgstr "Tenha certeza de incluir a seguinte informação:"
+
+#~ msgid "Empty member in relation."
+#~ msgstr "Membro vazio na relação."
+
+#~ msgid "multipolygon way ''{0}'' is not closed."
+#~ msgstr "via multipolígonos \"{0}\" não está fechada."
+
+#~ msgid "No useful role ''{0}'' for Way ''{1}''."
+#~ msgstr "Regra não aplicável ''{0}'' para Way ''{1}''."
+
+#~ msgid "Way ''{0}'' with less than two points."
+#~ msgstr "Way ''{0}'' com menos de dois pontos."
+
+#~ msgid ""
+#~ "There were problems with the following plugins:\n"
+#~ "\n"
+#~ " {0}"
+#~ msgstr ""
+#~ "Houveram problemas com os seguintes plugins:\n"
+#~ "\n"
+#~ "{0}"
+
+#~ msgid ""
+#~ "Activating the updated plugins failed. Check if JOSM has the permission "
+#~ "to overwrite the existing ones."
+#~ msgstr ""
+#~ "A ativação dos plugins atualizados falhou. Verifique se o JOSM tem "
+#~ "permissão de sobreescrever os existentes."
+
+#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
+#~ msgstr "Pulando uma via porque ela inclui um nó que não existe: {0}\n"
+
+#~ msgid "Hint: Some changes came from uploading new data to the server."
+#~ msgstr ""
+#~ "Dica: Algumas alterações vieram ao enviar novos dados para o servidor."
+
+#~ msgid "Unknown role ''{0}''."
+#~ msgstr "Regra desconhecida \"{0}\"."
+
+#~ msgid "Unknown member type for ''{0}''."
+#~ msgstr "Tipo de membro desconhecido para \"{0}\"."
+
+#~ msgid "Intersection between ways ''{0}'' and ''{1}''."
+#~ msgstr "Interseção entre as vias \"{0}\" e \"{1}\"."
+
+#~ msgid "Style for restriction {0} not found."
+#~ msgstr "Estilo para restrição {0} não encontrado."
+
+#~ msgid "No outer way for multipolygon ''{0}''."
+#~ msgstr "Não há via externa no multipolígono \"{0}\"."
+
+#~ msgid "Inner way ''{0}'' is outside."
+#~ msgstr "Via interna \"{0}\" está fora."
+
+#~ msgid "Error: {0}"
+#~ msgstr "Erro: {0}"
+
+#~ msgid "Warning: {0}"
+#~ msgstr "Aviso: {0}"
+
+#~ msgid "Cannot open preferences directory: {0}"
+#~ msgstr "Não foi possível abrir o diretório de preferências: {0}"
+
+#~ msgid ""
+#~ "The projection \"{0}\" is designed for\n"
+#~ "latitudes between 46.1° and 57° only.\n"
+#~ "Use another projection system if you are not using\n"
+#~ "a French WMS server.\n"
+#~ "Do not upload any data after this message."
+#~ msgstr ""
+#~ "A projeção \"{0}\" foi projetada somente para \n"
+#~ "latitudes entre 46.1° and 57°.\n"
+#~ "Use outro sistema de projeção se você não estiver\n"
+#~ "utilizando um servidor WMS francês.\n"
+#~ "Não transfira nenhum dado após esta mensagem."
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid ""
+#~ "IMPORTANT : data positioned far away from\n"
+#~ "the current Lambert zone limits.\n"
+#~ "Do not upload any data after this message.\n"
+#~ "Undo your last action, save your work\n"
+#~ "and start a new layer on the new zone."
+#~ msgstr ""
+#~ "IMPORTANTE: dados posicionados após\n"
+#~ "os limites de zona Lambert.\n"
+#~ "Não transfira nenhum dado após esta mensagem.\n"
+#~ "Desfaça sua última ação, salve seu trabalho\n"
+#~ "e comece uma nova camada na nova zona."
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Relação conflitando"
+
+#~ msgid "Login"
+#~ msgstr "Login"
+
+#~ msgid "zoom"
+#~ msgstr "zoom"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Por favor, entre com texto de busca"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Não foi possível ler resultados de busca de place do servidor"
+
+#~ msgid "name"
+#~ msgstr "nome"
+
+#~ msgid "x from"
+#~ msgstr "x de"
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Selecione um favorito primeiro"
+
+#~ msgid "to"
+#~ msgstr "para"
+
+#~ msgid "y from"
+#~ msgstr "y de"
+
+#~ msgid "Download Area"
+#~ msgstr "Baixar Área"
+
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Usar preferência ''{0}'' do grupo ''{1}''"
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Usar preferencia ''{0}''"
+
+#~ msgid "Edit Properties"
+#~ msgstr "Editar Propriedades"
+
+#~ msgid "Tags (empty value deletes tag)"
+#~ msgstr "Etiquetas (um valor nulo excluir etiqueda)"
+
+#~ msgid "Occupied By"
+#~ msgstr "Ocupado por"
+
+#~ msgid "Edit new relation"
+#~ msgstr "Editar nova relação"
+
+#~ msgid "Move Up"
+#~ msgstr "Mover para cima"
+
+#~ msgid "Remove all currently selected objects from relation"
+#~ msgstr "Eliminar todos objetos selecionados da relação"
+
+#~ msgid "Remove Selected"
+#~ msgstr "Excluir selecionados"
+
+#~ msgid "Add all currently selected objects as members"
+#~ msgstr "Adicionar todos os objetos selecionados como membros"
+
+#~ msgid "Move Down"
+#~ msgstr "Mover para baixo"
+
+#~ msgid "Cannot connect to server."
+#~ msgstr "Não foi possível conectar ao servidor."
+
+#~ msgid "Error parsing server response."
+#~ msgstr "Erro analizado resposta do servidor"
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "Existiram conflitos durante a importação"
+
+#~ msgid "Relation Editor: {0}"
+#~ msgstr "Editor de relações: {0}"
+
+#~ msgid "Authors: {0}"
+#~ msgstr "Autores: {0}"
+
+#~ msgid "There are unsaved changes. Delete the layer anwyay?"
+#~ msgstr "Existem mudanças não-salvas. Excluir camada mesmo assim?"
+
+#~ msgid "Delete the selected layer."
+#~ msgstr "Excluir camada selecionada."
+
+#~ msgid "Merge the layer directly below into the selected layer."
+#~ msgstr "Unir camada diretamente inferior com camada selecionada."
+
+#~ msgid "Merging conflicts."
+#~ msgstr "Combinar conflitos"
+
+#~ msgid "Command Stack: {0}"
+#~ msgstr "Pilha de comandos: {0}"
+
+#~ msgid "Some of the nodes are (almost) in the line"
+#~ msgstr "Alguns dos nós estão (praticamente) na linha"
+
+#~ msgid "Combine ways with different memberships?"
+#~ msgstr "Combinar caminhos com membros diferentes?"
+
+#~ msgid "All the ways were empty"
+#~ msgstr "Todos caminhos estavam vazios"
+
+#~ msgid "Those nodes are not in a circle."
+#~ msgstr "Estes nós não estão em um círculo"
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Por favor selecione no mínimo uma tarefa para baixar"
+
+#~ msgid "JOSM Online Help"
+#~ msgstr "Ajuda Online do JOSM"
+
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "Pode-se editar somente páginas de ajuda online do JOSM"
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Erro ao carregar página {0}"
+
+#~ msgid "History of Element"
+#~ msgstr "Histórico do Elemento"
+
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr ""
+#~ "Os nós selecionados tem relações de usuários diferentes. Você ainda "
+#~ "pretende uni-los?"
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Unir nós com usuários diferentes?"
+
+#~ msgid "Merge Anyway"
+#~ msgstr "Unir mesmo assim"
+
+#~ msgid "Please select one or more closed ways of at least four nodes."
+#~ msgstr ""
+#~ "Por favor selecione um ou mais caminhos fechados de no mínimo quatro nós."
+
+#~ msgid "Only two nodes allowed"
+#~ msgstr "Somente dois nós permitidos"
+
+#~ msgid "Only one node selected"
+#~ msgstr "Somente um nó selecionado"
+
+#~ msgid "An error occurred while restoring backup file."
+#~ msgstr "Ocorreu um erro enquanto o arquivo backup estava sendo restaurado."
+
+#~ msgid "An error occurred while saving."
+#~ msgstr "Ocorreu um erro durante o salvamento."
+
+#~ msgid "aqueduct"
+#~ msgstr "aqueduto"
+
+#~ msgid "Open in Browser"
+#~ msgstr "Abrir no Navegador Web"
+
+#~ msgid "Update Data"
+#~ msgstr "Atualizar Dados"
+
+#~ msgid ""
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
+#~ msgstr ""
+#~ "Não foram encontrados dados a atualizar. Você já abriu ou baixou uma "
+#~ "camada de dados?"
+
+#~ msgid "No data imported."
+#~ msgstr "Não há dados importados."
+
+#~ msgid "Data Layer"
+#~ msgstr "Camada de Dados"
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO! (GNOME)"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO! (WebKit GTK)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO! (WebKit)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO! (GNOME Fix)"
+
+#~ msgid "Version number missing from OSM data"
+#~ msgstr "Faltando número de versão nos dados dos mapas"
+
+#~ msgid "Could not read from URL: \"{0}\""
+#~ msgstr "Não foi possível ler da URL: \"{0}\""
+
+#~ msgid "Set the language."
+#~ msgstr "Escolha o idioma."
+
+#~ msgid "File not found"
+#~ msgstr "Arquivo não encontrado"
+
+#~ msgid "Images for {0}"
+#~ msgstr "Imagens para {0}"
+
+#~ msgid "image"
+#~ msgid_plural "images"
+#~ msgstr[0] "imagem"
+#~ msgstr[1] "imagens"
+
+#~ msgid "Synchronize Time with GPS Unit"
+#~ msgstr "Sincronizar Tempo com Unidade GPS"
+
+#~ msgid "Image"
+#~ msgstr "Imagem"
+
+#~ msgid ""
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
+#~ msgstr ""
+#~ "Erro interno: Não é possível verificar condições sem nenhuma camada. Por "
+#~ "favor, relate isso como uma falha do programa."
+
+#~ msgid "Yes, undelete them too"
+#~ msgstr "Sim, repô-los também"
+
+#~ msgid "No, cancel operation"
+#~ msgstr "Não, cancelar operação"
+
+#~ msgid "Update Selection"
+#~ msgstr "Atualizar Seleção"
+
+#~ msgid "Updating primitive"
+#~ msgstr "Atualizando primitiva"
+
+#~ msgid "Conflict detected"
+#~ msgstr "Detectado conflito"
+
+#~ msgid "Primitive already deleted"
+#~ msgstr "Primitiva já deletada"
+
+#~ msgid "Errors during Download"
+#~ msgstr "Erros ao Transferir"
+
+#~ msgid "Deleted or moved primitives"
+#~ msgstr "Primitivas deletadas ou movidas"
+
+#~ msgid "The following errors occurred during mass download:"
+#~ msgstr "Os seguintes erros aconteceram durante a transferência em massa:"
+
+#~ msgid "Error while communicating with server."
+#~ msgstr "Erro de comunicação com o servidor."
+
+#~ msgid "Undelete dependent primitives?"
+#~ msgstr "Recuperar primitivas dependentes?"
+
+#~ msgid "Undelete additional nodes?"
+#~ msgstr "Desfazer a remoção dos nós adicionais?"
+
+#~ msgid "Upload to OSM..."
+#~ msgstr "Enviar para o OSM..."
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Envio para API OSM falhou"
+
+#~ msgid ""
+#~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
+#~ "to<br>delete on the server is already deleted.<br><br>The error message "
+#~ "is:<br>{0}</html>"
+#~ msgstr ""
+#~ "<html>Envio <strong>falhou</strong> porque uma primitiva que você "
+#~ "tentou<br>apagar no servidor já está apagada.<br><br>A mensagem de erro é:"
+#~ "<br>{0}</html>"
+
+#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
+#~ msgstr "Cabeçalho de erro \"{0}\" não se encaixa no padrão \"{1}\""
+
+#~ msgid ""
+#~ "WARNING: launching browser windows for the first {0} of {1} selected "
+#~ "primitives only"
+#~ msgstr ""
+#~ "AVISO: lançando janela do browser para somente as primeiras {0} das {1} "
+#~ "primitivas selecionadas"
+
+#~ msgid ""
+#~ "Current number of changes exceeds the max. number of changes, current is "
+#~ "{0}, max is {1}"
+#~ msgstr ""
+#~ "O número de alterações atuais ultrapassa o número máximo de alterações. O "
+#~ "número atual é {0}, o máximo é {1}"
+
+#~ msgid ""
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
+#~ msgstr ""
+#~ "Os caminhos selecionados têm filiações diferentes. Você pretende uni-los "
+#~ "mesmo assim?"
+
+#~ msgid "unnamed"
+#~ msgstr "sem nome"
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Nenhum documento aberto, portanto não há nada a salvar."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Extensão de arquivo desconhecida."
+
+#~ msgid ""
+#~ "<html>There are {0} primitives in your local dataset which<br>might be "
+#~ "deleted on the server. If you later try to delete or<br>update them the "
+#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
+#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
+#~ "<strong>{2}</strong> to ignore.<br></html>"
+#~ msgstr ""
+#~ "<html>Existem {0} primitivas no seu conjunto de dados local que<br>podem "
+#~ "ter sido apagadas do servidor. Se você posteriormente tentar exclui-las "
+#~ "ou<br>atualizá-las no servidor provavelmente o servidor apontará "
+#~ "um<br>conflito.<br><br>Clique <strong>{1}</strong> para verificar o "
+#~ "estado dessas primitivas<br>no servidor.<br>Clique <strong>{2}</strong> "
+#~ "para ignorar.<br></html>"
+
+#~ msgid "Failed to initialize API. Please try again later."
+#~ msgstr "Houve uma falha ao inicializar a API. Tente novamente mais tarde."
+
+#~ msgid ""
+#~ "A relation membership was copied to all new ways.\n"
+#~ "You should verify this and correct it when necessary."
+#~ msgstr ""
+#~ "Uma filiação de relação foi copiada para todos os novos caminhos.\n"
+#~ "Por favor, verifique e corrija quando necessário."
+
+#~ msgid ""
+#~ "A role based relation membership was copied to all new ways.\n"
+#~ "You should verify this and correct it when necessary."
+#~ msgstr ""
+#~ "Uma filiação de relação com base na atribuição foi copiada para todos os "
+#~ "novos caminhos.\n"
+#~ "Verifique e corrija quando necessário."
+
+#~ msgid ""
+#~ "<html>You are using the EPSG:4326 projection which might lead<br>to "
+#~ "undesirable results when doing rectangular alignments.<br>Change your "
+#~ "projection to get rid of this warning.<br>Do you want to continue?"
+#~ msgstr ""
+#~ "<html>Você está usando a projeção EPSG:4326 que pode levar "
+#~ "a<br>resultados indesejados quando fizer alinhamentos retangulares."
+#~ "<br>Mude sua projeção para evitar esta notificação.<br>Pretende continuar?"
+
+#~ msgid "No \"to\" way found."
+#~ msgstr "Nenhuma caminho \"para\" encontrado."
+
+#~ msgid "More than one \"from\" way found."
+#~ msgstr "Mais de um caminho \"de\" encontrado."
+
+#~ msgid "More than one \"to\" way found."
+#~ msgstr "Mais de um caminho \"para\" encontrado."
+
+#~ msgid "Style for inner way ''{0}'' equals multipolygon."
+#~ msgstr "Estilo para caminho interno \"{0}\" é multipolígono."
+
+#~ msgid "Area style way is not closed."
+#~ msgstr "Caminho para Estilo de Área não está fechado."
+
+#~ msgid "Non-Way ''{0}'' in multipolygon."
+#~ msgstr "\"{0}\" não é um caminho no multipolígono."
+
+#~ msgid "No \"from\" way found."
+#~ msgstr "Nenhum caminho \"de\" encontrado."
+
+#~ msgid "Load Selection"
+#~ msgstr "Carregar Seleção"
+
+#~ msgid "Contact {0}..."
+#~ msgstr "Contato {0}..."
+
+#~ msgid "Wrong number of parameters for nodes operator."
+#~ msgstr "Número de parametros incorreto para operador de nós."
+
+#~ msgid "Incorrect value of id operator: {0}. Number is expected."
+#~ msgstr "Valor incorreto do operador de id: {0}. Se esperava um número."
+
+#~ msgid ""
+#~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
+#~ "nodes or range, for example nodes:10-20"
+#~ msgstr ""
+#~ "Valor incorreto de operador de nós: {0}. O operador de nós espera un "
+#~ "número de nós ou um intervalo, por exemplos, os nós:10-20"
+
+#~ msgid "Expected closing parenthesis."
+#~ msgstr "Fechamento de parenteses esperado."
+
+#~ msgid "Parsing error in URL: \"{0}\""
+#~ msgstr "Erro processando URL: \"{0}\""
+
+#~ msgid "Purging 1 primitive"
+#~ msgstr "Purgando 1 primitiva"
+
+#~ msgid "removing reference from way {0}"
+#~ msgstr "removendo referência de caminho {0}"
+
+#~ msgid "Split way segment"
+#~ msgstr "Dividir segmento de via"
+
+#~ msgid "nodes"
+#~ msgstr "nós"
+
+#~ msgid "ways"
+#~ msgstr "caminhos"
+
+#~ msgid "relations"
+#~ msgstr "relações"
+
+#~ msgid "No \"via\" node or way found."
+#~ msgstr "Não encontrei nenum nó ou caminho com o parâmetro \"via\"."
+
+#~ msgid "More than one \"via\" found."
+#~ msgstr "Encontrado mais de um parâmetro \"via\"."
+
+#~ msgid ""
+#~ "The projection \"{0}\" is designed for\n"
+#~ "latitudes between 45.7° and 47.9°\n"
+#~ "and longitutes between 5.7° and 10.6° only.\n"
+#~ "Use another projection system if you are not working\n"
+#~ "on a data set of Switzerland or Liechtenstein.\n"
+#~ "Do not upload any data after this message."
+#~ msgstr ""
+#~ "A projeção \"{0}\" foi desenhada apenas para\n"
+#~ "latitudes entre 45.7° e 47.9°\n"
+#~ "e longitutes entre 5.7° e 10.6°.\n"
+#~ "Use outro sistema de projeção se você não está trabalhando\n"
+#~ "em um dataset da Suíça ou de Liechtenstein.\n"
+#~ "Não faça o upload de nenhuma informação depois desta mensagem."
+
+#~ msgid "Open file (as raw gps, if .gpx)"
+#~ msgstr "Abrir arquivo (como raw gps, se .gpx)"
+
+#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
+#~ msgstr ""
+#~ "Não foi possível encontrar primitiva com id {0} e versão {1} no conjunto "
+#~ "de dados"
+
+#~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
+#~ msgstr "Em vez de --download=<bbox>, você pode especificar osm://<bbox>\n"
+
+#~ msgid ""
+#~ "Parameters are read in the order they are specified, so make sure you "
+#~ "load\n"
+#~ "some data before --selection"
+#~ msgstr ""
+#~ "Parâmetros são lidos na ordem em que são informados, por isso tenha "
+#~ "certeza que você está carregando\n"
+#~ "alguma coisa antes de --selection"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Erro enquanto analisando"
+
+#~ msgid "parameter '{0}' must not be null"
+#~ msgstr "parâmetro '{0}' não pode ser nulo"
+
 #~ msgid ""
 #~ "<html>An error occurred while communicating with the server<br>Details: "
@@ -33791,28 +34405,411 @@
 #~ "{0}</html>"
 
+#~ msgid "visible (on the server)"
+#~ msgstr "visível (no servidor)"
+
 #~ msgid "Communication with server failed"
 #~ msgstr "A comunicação com o servidor falhou"
 
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Sim, repô-los também"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "Não, cancelar operação"
+#~ msgid "not visible (on the server)"
+#~ msgstr "não visível (no servidor)"
+
+#~ msgid "Keep a clone of the local version"
+#~ msgstr "Mantenha uma cópia da versão local"
+
+#~ msgid "Oberpfalz Geofabrik.de"
+#~ msgstr "Oberpfalz Geofabrik.de"
+
+#~ msgid "football"
+#~ msgstr "futebol americano"
+
+#~ msgid "Boat"
+#~ msgstr "Barco"
+
+#~ msgid "Motorboat"
+#~ msgstr "Barco motorizado"
+
+#~ msgid "Footway"
+#~ msgstr "Calçada"
+
+#~ msgid "Cycleway"
+#~ msgstr "Ciclovia"
+
+#~ msgid "Visible State:"
+#~ msgstr "Estado Visível:"
+
+#~ msgid ">"
+#~ msgstr ">"
+
+#~ msgid "Read GPX..."
+#~ msgstr "Ler GPX..."
+
+#~ msgid "Anonymous"
+#~ msgstr "Anônimo"
+
+#~ msgid "Copy defaults"
+#~ msgstr "Copiar padrões"
+
+#~ msgid "All images"
+#~ msgstr "Todas as imagens"
+
+#~ msgid "Default Values"
+#~ msgstr "Valores Predefinidos"
+
+#~ msgid "Continue anyway"
+#~ msgstr "Continuar assim mesmo"
+
+#~ msgid "Physically delete from local dataset"
+#~ msgstr "Eliminar fisicamente os dados locais"
+
+#~ msgid "<multiple>"
+#~ msgstr "<múltiplo>"
+
+#~ msgid "Sync clock"
+#~ msgstr "Sincronizar relógio"
+
+#~ msgid "More details"
+#~ msgstr "Mais detalhes"
+
+#~ msgid "Conflicts in data"
+#~ msgstr "Conflitos nos dados"
+
+#~ msgid "Yes, purge it"
+#~ msgstr "Sim, limpe-o"
+
+#~ msgid "Reset id to 0"
+#~ msgstr "Resetar id para 0"
 
 #~ msgid ""
-#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
-#~ "server.<br><br>Do you want to undelete this node too?"
+#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
+#~ "the dataset.<br>Do you agree?</html>"
+#~ msgstr ""
+#~ "<html> JOSM terá de remover sua primitiva local com id {0} <br> dos "
+#~ "dados. <br> Concorda? </ html>"
+
+#~ msgid "Remove from dataset"
+#~ msgstr "Remover do conjuto de dados"
+
+#~ msgid "{0} within the track."
+#~ msgstr "{0} dentro da faixa"
+
+#~ msgid "The date in file \"{0}\" could not be parsed."
+#~ msgstr "A data no arquivo \"{0}\" não pode ser analisada."
+
+#~ msgid "Shop"
+#~ msgstr "Loja"
+
+#~ msgid "Edit Station"
+#~ msgstr "Editar Estação"
+
+#~ msgid "Edit Information Office"
+#~ msgstr "Editar Centro de Informações Turísticas"
+
+#~ msgid "Map Type"
+#~ msgstr "Tipo de Mapa"
+
+#~ msgid "map"
+#~ msgstr "mapa"
+
+#~ msgid "citymap"
+#~ msgstr "mapa da cidade"
+
+#~ msgid "bicyclemap"
+#~ msgstr "mapa de ciclovias"
+
+#~ msgid "Board Type"
+#~ msgstr "Tipo de Quadro"
+
+#~ msgid "Keep their visible state"
+#~ msgstr "Manter seu estado visível"
+
+#~ msgid "Keep my visible state"
+#~ msgstr "Manter meu estado visível"
+
+#~ msgid "Yes, reset the id"
+#~ msgstr "Sim, resetar id"
+
+#~ msgid ""
+#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: "
+#~ "{0}"
+#~ msgstr ""
+#~ "Levantada exceção de segurança setAlwaysOnTop(). Ignorando. Exceção foi: "
+#~ "{0}"
+
+#~ msgid "Linked"
+#~ msgstr "Vinculado"
+
+#~ msgid "No time for point {0} x {1}"
+#~ msgstr "Sem tempo para ponto {0} x {1}"
+
+#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
+#~ msgstr "Não foi possível ler tempo \"{0}\" para ponto {1} x {2}"
+
+#~ msgid "No images with readable timestamps found."
+#~ msgstr "Não foram encontradas imagens com dados de tempo legíveis"
+
+#~ msgid "GPS start: {0}"
+#~ msgstr "Iniciar GPS: {0}"
+
+#~ msgid "current delta: {0}s"
+#~ msgstr "delta atual: {0}s"
+
+#~ msgid "GPS end: {0}"
+#~ msgstr "Finalizar GPS: {0}"
+
+#~ msgid "timezone difference: "
+#~ msgstr "diferença de zona horária: "
+
+#~ msgid "Time entered could not be parsed."
+#~ msgstr "O tempo informado não pode ser analisado."
+
+#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+#~ msgstr "Digite data de exibição (mm/dd/aaaa HH:MM:SS)"
+
+#~ msgid "GPS unit timezone (difference to photo)"
+#~ msgstr "Zona horária do GPS (diferença com foto)"
+
+#~ msgid ""
+#~ "Enable to upload all changes in one request, disable to use one request "
+#~ "per changed primitive"
+#~ msgstr ""
+#~ "Habilitar para envio de todas modificações em uma chamada, desabilitar "
+#~ "para usar uma chamada por primitiva"
+
+#~ msgid "Confirmation"
+#~ msgstr "Confirmação"
+
+#~ msgid "Delete all"
+#~ msgstr "Apagar tudo"
+
+#~ msgid "Download referrers from OSM..."
+#~ msgstr "Baixando referencias desde OSM..."
+
+#~ msgid "Gauss-Laborde Réunion 1947"
+#~ msgstr "Gauss-Laborde Réunion 1947"
+
+#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr ""
+#~ "Faltando página de Ajuda. Crie uma em <A HREF=\"{0}\">português</A>."
+
+#~ msgid ""
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Página de ajuda. Crie-a em <A HREF=\"{0}\">English</A> ou <A HREF=\"{1}"
+#~ "\">português</A>."
+
+#~ msgid "Didn't find an primitive with id {0} in this dataset"
+#~ msgstr "Não consegui encontrar um primitivo com o id {0} neste dataset."
+
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "parâmetro ''{0}'' não pode ser nulo"
+
+#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+#~ msgstr "se esperava instância de OsmDataLayer ou GpxLayer. Obtido \"{0}\""
+
+#~ msgid "Unexpected return value. Got {0}."
+#~ msgstr "valor não esperado de retorno. Veio {0}"
+
+#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "parametro {0} > 0 necessário. Obtido {1}."
+
+#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
+#~ msgstr "parametro ''{0}'' não é uma classe aceitável, obtido ''{1}''"
+
+#~ msgid "There's no primitive with version {0} in this history."
+#~ msgstr "Não há primitiva com versão {0} neste histórico"
+
+#~ msgid "There's no version valid at date ''{0}'' in this history."
+#~ msgstr "Não há versão válida na data ''{0}'' neste histórico"
+
+#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
+#~ msgstr "parâmetro ''{0}'' no intervalo  de 0..{1} esperado, obtido {2}"
+
+#~ msgid "No earliest version found. History is empty."
+#~ msgstr "não foi encontrada versão anterior. Histórico está vazio."
+
+#~ msgid "No latest version found. History is empty."
+#~ msgstr "não foi encontrada a última versão. Histórico está vazio."
+
+#~ msgid "Parameter current out of range. Got {0}."
+#~ msgstr "parâmetro atual fora do intervalo: obtido {0}"
+
+#~ msgid "Unexpected column index. Got {0}."
+#~ msgstr "indice inesperado na coluna. Obtido {0}"
+
+#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
+#~ msgstr "O parâmetro 'col' deve ser 0 ou 1. Obtido {0}"
+
+#~ msgid "Index out of bounds. Got {0}."
+#~ msgstr "índice fora dos limites. Obtido {0}"
+
+#~ msgid "Display the history of the selected primitive."
+#~ msgstr "Mostrar histórico da primitiva selecionada"
+
+#~ msgid "Could not read ''{0}''."
+#~ msgstr "Não foi possível ler \"{0}\""
+
+#~ msgid "Always move and don't show dialog again"
+#~ msgstr "Mover sempre e não mostrar dica outraves"
+
+#~ msgid "Can't search because there is no loaded data."
+#~ msgstr "Não pode procurar porque não exite informação carregada."
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
+#~ "relation?</html>"
+#~ msgstr ""
+#~ "<html>Selecção \"{0}\" é usada pela relação \"{1}\".<br>Apagar da relação?"
+#~ "</html>"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
+#~ msgstr ""
+#~ "<html>A selecção \"{0}\" é usada pela relação \"{1}\" com o papel {2}."
+#~ "<br>Apagar da relação?</html>"
+
+#~ msgid "Replace"
+#~ msgstr "Substituir"
+
+#~ msgid ""
+#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
+#~ "resolve them first.</html>"
+#~ msgstr ""
+#~ "<html>Existem conflitos não-resolvidos na camada ''{0}''.<br>Você precisa "
+#~ "resolvê-los primeiro.</html>"
+
+#~ msgid "Current changeset is null. Can't upload data."
+#~ msgstr "Changeset atual é nulo. Não há como enviar os dados."
+
+#~ msgid "Uploading {0} objects ..."
+#~ msgstr "Enviando {0} objetos..."
+
+#~ msgid "Id > 0 required, got {0}"
+#~ msgstr "Exige-se Id > 0, obtido {0}"
+
+#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
+#~ msgstr "Erro de sintaxe do padrão: padrão {0} em {1} é ilegal!"
+
+#~ msgid "Wrong number of parameters for tags operator."
+#~ msgstr "Número errado de parâmetros para o operador de tags"
+
+#~ msgid "Parameter ''{0}'' must not be empty"
+#~ msgstr "O parâmetro \"{0}\" não pode estar vazio"
+
+#~ msgid ""
+#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
+#~ "This can lead to nodes being deleted accidentally.\n"
+#~ "Are you really sure to continue?"
+#~ msgstr ""
+#~ "A(s) via(s) selecionadas têm nós selecionados fora da área a baixar.\n"
+#~ "Isto pode acabar apagando nós acidentalmente.\n"
+#~ "Deseja continuar?"
+
+#~ msgid ""
+#~ "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
-#~ "the server.<br><br>Do you want to undelete these nodes too?"
+#~ "The selection contains {0} ways. Are you sure you want to simplify them "
+#~ "all?"
+#~ msgstr[0] "A seleção contém {0} via. Tem certeza que quer simplificá-la?"
+#~ msgstr[1] ""
+#~ "A seleção contém {0} vias. Tem certeza que quer simplificar todas?"
+
+#~ msgid ""
+#~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
+#~ "tags or range, for example tags:1 or tags:2-5"
+#~ msgstr ""
+#~ "Valor incorreto para operador de etiquetas: {0}. Operador de tags espera "
+#~ "número de etiquetas ou intervalo, por exemplo, tags:1 ou tags:2-5"
+
+#~ msgid "Incorrect value of changeset operator: {0}. Number is expected."
+#~ msgstr ""
+#~ "Valor incorreto para operador de conjunto de modificações: {0}. Um número "
+#~ "é esperado."
+
+#~ msgid "Incorrect value of version operator: {0}. Number is expected."
+#~ msgstr "Valor incorreto de operador de versão: {0}. Número é esperado."
+
+#~ msgid "Apply also for children"
+#~ msgstr "Aplicar também para filhos"
+
+#~ msgid "Enter a changset id"
+#~ msgstr "Digite o ID do changeset"
+
+#~ msgid "The \"from\" way does not start or end at a \"via\" node."
+#~ msgstr "O caminho \"de\" não começa ou termina em um nó \"via\"."
+
+#~ msgid "The \"to\" way does not start or end at a \"via\" node."
+#~ msgstr "O trecho \"to\" não começa ou termina no nó \"via\""
+
+#~ msgid "The \"from\" way does not start or end at the \"via\" way."
+#~ msgstr "O trecho \"from\" não começa ou termina no caminho \"via\""
+
+#~ msgid "The \"to\" way does not start or end at the \"via\" way."
+#~ msgstr "O trecho \"to\" não começa ou termina em um nó \"via\"."
+
+#~ msgid "<html>Cannot open directory.<br>Please select a file!</html>"
+#~ msgstr ""
+#~ "<html>Não foi possível abrir diretório.<br>Por favor, selecione um "
+#~ "arquivo!</html>"
+
+#~ msgid ""
+#~ "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+#~ "Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+#~ "Hold left mousebutton and draw a frame."
+#~ msgstr ""
+#~ "<b>Zoom:</b> Roda do mouse, clique duplo ou Ctrl + Up/Down <b>Mover mapa:"
+#~ "</b> Segure o botão direito do mouse e mova-o ou use as setas do teclado. "
+#~ "<b>Selecionar:</b> Segure o botão esquerdo do mouse e desenhe a área."
+
+#~ msgid ""
+#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
+#~ "Dialog and manually resolve it."
+#~ msgid_plural ""
+#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
+#~ "Dialog and manually resolve them."
 #~ msgstr[0] ""
-#~ "Existe {0} nó adicional usado pelo caminho {1}<br>que está apagado no "
-#~ "servidor.<br><br>Você quer recuperar este nó também?"
+#~ "{0} conflito ainda não foi resolvido.<br><br>Por favor, abra a janela de "
+#~ "Lista de Conflitos e resolva-o manualmente."
 #~ msgstr[1] ""
-#~ "Existem {0} nós adicionais usados pelo caminho {1}<br>que estão apagados "
-#~ "no servidor.<br><br>Você quer recuperar estes nós também?"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Desfazer a remoção dos nós adicionais?"
+#~ "{0} conflitos ainda não foram resolvidos.<br><br>Por favor, abra a janela "
+#~ "de Lista de Conflitos e resolva-os manualmente."
+
+#~ msgid "Undecide conflict between visible state"
+#~ msgstr "Não decidir conflito entre diferentes estados de visibilidade"
+
+#~ msgid ""
+#~ "Target object with id {0} and version {1} is visible although source "
+#~ "object with lower version {2} is not visible. Cannot deal with this "
+#~ "inconsistency. Keeping target object. "
+#~ msgstr ""
+#~ "Objeto alvo com id {0} e versão {1} é visível, porém o source do objeto "
+#~ "com versão menor {2} não é visível. Não é possível lidar com essa "
+#~ "inconsistência. Mantendo objeto alvo. "
+
+#~ msgid "Use all their elements"
+#~ msgstr "Usar todos elementos deles"
+
+#~ msgid "<number>"
+#~ msgstr "<número>"
+
+#~ msgid "Use all my elements"
+#~ msgstr "Use todos os meus elementos"
+
+#~ msgid ""
+#~ "You are about to delete nodes outside of the area you have downloaded."
+#~ "<br>This can cause problems because other objects (that you don't see) "
+#~ "might use them.<br>Do you really want to delete?"
+#~ msgstr ""
+#~ "Você está a ponto de apagar nós fora da área que fez download de dados."
+#~ "<br> Isto pode causar problemas, já que outros objetos que você não pode "
+#~ "ver podem estar usando estes pontos.<br> Deseja realmente apagar?"
+
+#~ msgctxt "filter"
+#~ msgid "C"
+#~ msgstr "C"
+
+#~ msgid "GPS point"
+#~ msgstr "Pontos GPS"
 
 #~ msgid ""
@@ -33831,27 +34828,19 @@
 #~ "primitivos também?"
 
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Recuperar primitivas dependentes?"
-
-#~ msgid "Visible State:"
-#~ msgstr "Estado Visível:"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "visível (no servidor)"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "não visível (no servidor)"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Mantenha uma cópia da versão local"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Eliminar fisicamente os dados locais"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "Manter meu estado visível"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Sim, resetar id"
+#~ msgid "Style for outer way ''{0}'' mismatches."
+#~ msgstr "Estilo para caminho externo \"{0}\" contém erros."
+
+#~ msgid ""
+#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
+#~ "server.<br><br>Do you want to undelete this node too?"
+#~ msgid_plural ""
+#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
+#~ "the server.<br><br>Do you want to undelete these nodes too?"
+#~ msgstr[0] ""
+#~ "Existe {0} nó adicional usado pelo caminho {1}<br>que está apagado no "
+#~ "servidor.<br><br>Você quer recuperar este nó também?"
+#~ msgstr[1] ""
+#~ "Existem {0} nós adicionais usados pelo caminho {1}<br>que estão apagados "
+#~ "no servidor.<br><br>Você quer recuperar estes nós também?"
 
 #~ msgid ""
@@ -33863,1008 +34852,2 @@
 #~ "primitiva {0} para zero.<br>Na próximo envio, o servidor vai "
 #~ "atribuir<br>um novo ID.<br>Você concorda?</html>"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "Resetar id para 0"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "Manter seu estado visível"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Sim, limpe-o"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html> JOSM terá de remover sua primitiva local com id {0} <br> dos "
-#~ "dados. <br> Concorda? </ html>"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Remover do conjuto de dados"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "Não decidir conflito entre diferentes estados de visibilidade"
-
-#~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "{0} conflito ainda não foi resolvido.<br><br>Por favor, abra a janela de "
-#~ "Lista de Conflitos e resolva-o manualmente."
-#~ msgstr[1] ""
-#~ "{0} conflitos ainda não foram resolvidos.<br><br>Por favor, abra a janela "
-#~ "de Lista de Conflitos e resolva-os manualmente."
-
-#~ msgid "football"
-#~ msgstr "futebol americano"
-
-#~ msgid "Preparing..."
-#~ msgstr "Preparando..."
-
-#~ msgid "Uploading..."
-#~ msgstr "Enviando..."
-
-#~ msgid "Unknown version"
-#~ msgstr "Versão desconhecida"
-
-#~ msgid "Enter Password"
-#~ msgstr "Digite a Senha"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Alterações Não Salvas"
-
-#~ msgid "Do not show again"
-#~ msgstr "Não mostrar novamente"
-
-#~ msgid "Rotate"
-#~ msgstr "Rotacionar"
-
-#~ msgid "Move"
-#~ msgstr "Mover"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Encontrado elemento <nd> em non-way."
-
-#~ msgid "Error during parse."
-#~ msgstr "Erro durante interpretação."
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "Exceção NullPointerException, possivelmente faltam algumas tags."
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Encontrado elemento <member> em non-relation."
-
-#~ msgid ""
-#~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
-#~ "required."
-#~ msgstr ""
-#~ "Atenção - o carregamento do plugin {0} foi solicitado. Este plugin não é "
-#~ "mais necessário."
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Senha ou usuário incorreto."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Identificação de nó mal-formada"
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Plugin não encontrado: {0}."
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "(Você pode alterar o número de dias depois que este irá "
-#~ "aparecer<br>definindo a opção de configuração 'pluginmanager.warntime'.)"
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> tem ref zero"
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Por favor, reporte um erro em {0}"
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "O plugin não pode ser removido. Por favor, reporte o problema aos "
-#~ "desenvolvedores do JOSM."
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr "Inclua os passos para repetir o erro (o mais detalhado possível)!"
-
-#~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
-#~ msgstr ""
-#~ "Tente atualizar para a última versão do JOSM e plugins antes de reportar "
-#~ "um bug."
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Tenha certeza de incluir a seguinte informação:"
-
-#~ msgid "Empty member in relation."
-#~ msgstr "Membro vazio na relação."
-
-#~ msgid "multipolygon way ''{0}'' is not closed."
-#~ msgstr "via multipolígonos \"{0}\" não está fechada."
-
-#~ msgid "No useful role ''{0}'' for Way ''{1}''."
-#~ msgstr "Regra não aplicável ''{0}'' para Way ''{1}''."
-
-#~ msgid "Way ''{0}'' with less than two points."
-#~ msgstr "Way ''{0}'' com menos de dois pontos."
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "Houveram problemas com os seguintes plugins:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "A ativação dos plugins atualizados falhou. Verifique se o JOSM tem "
-#~ "permissão de sobreescrever os existentes."
-
-#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr "Pulando uma via porque ela inclui um nó que não existe: {0}\n"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr ""
-#~ "Dica: Algumas alterações vieram ao enviar novos dados para o servidor."
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Regra desconhecida \"{0}\"."
-
-#~ msgid "Unknown member type for ''{0}''."
-#~ msgstr "Tipo de membro desconhecido para \"{0}\"."
-
-#~ msgid "Intersection between ways ''{0}'' and ''{1}''."
-#~ msgstr "Interseção entre as vias \"{0}\" e \"{1}\"."
-
-#~ msgid "Style for restriction {0} not found."
-#~ msgstr "Estilo para restrição {0} não encontrado."
-
-#~ msgid "No outer way for multipolygon ''{0}''."
-#~ msgstr "Não há via externa no multipolígono \"{0}\"."
-
-#~ msgid "Inner way ''{0}'' is outside."
-#~ msgstr "Via interna \"{0}\" está fora."
-
-#~ msgid "Error: {0}"
-#~ msgstr "Erro: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Aviso: {0}"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Não foi possível abrir o diretório de preferências: {0}"
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 46.1° and 57° only.\n"
-#~ "Use another projection system if you are not using\n"
-#~ "a French WMS server.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "A projeção \"{0}\" foi projetada somente para \n"
-#~ "latitudes entre 46.1° and 57°.\n"
-#~ "Use outro sistema de projeção se você não estiver\n"
-#~ "utilizando um servidor WMS francês.\n"
-#~ "Não transfira nenhum dado após esta mensagem."
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid ""
-#~ "IMPORTANT : data positioned far away from\n"
-#~ "the current Lambert zone limits.\n"
-#~ "Do not upload any data after this message.\n"
-#~ "Undo your last action, save your work\n"
-#~ "and start a new layer on the new zone."
-#~ msgstr ""
-#~ "IMPORTANTE: dados posicionados após\n"
-#~ "os limites de zona Lambert.\n"
-#~ "Não transfira nenhum dado após esta mensagem.\n"
-#~ "Desfaça sua última ação, salve seu trabalho\n"
-#~ "e comece uma nova camada na nova zona."
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Relação conflitando"
-
-#~ msgid "Login"
-#~ msgstr "Login"
-
-#~ msgid "zoom"
-#~ msgstr "zoom"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Por favor, entre com texto de busca"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Não foi possível ler resultados de busca de place do servidor"
-
-#~ msgid "name"
-#~ msgstr "nome"
-
-#~ msgid "x from"
-#~ msgstr "x de"
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Selecione um favorito primeiro"
-
-#~ msgid "to"
-#~ msgstr "para"
-
-#~ msgid "y from"
-#~ msgstr "y de"
-
-#~ msgid "Download Area"
-#~ msgstr "Baixar Área"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Usar preferência ''{0}'' do grupo ''{1}''"
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Usar preferencia ''{0}''"
-
-#~ msgid "Edit Properties"
-#~ msgstr "Editar Propriedades"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Etiquetas (um valor nulo excluir etiqueda)"
-
-#~ msgid "Occupied By"
-#~ msgstr "Ocupado por"
-
-#~ msgid "Edit new relation"
-#~ msgstr "Editar nova relação"
-
-#~ msgid "Move Up"
-#~ msgstr "Mover para cima"
-
-#~ msgid "Remove all currently selected objects from relation"
-#~ msgstr "Eliminar todos objetos selecionados da relação"
-
-#~ msgid "Remove Selected"
-#~ msgstr "Excluir selecionados"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Adicionar todos os objetos selecionados como membros"
-
-#~ msgid "Move Down"
-#~ msgstr "Mover para baixo"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Não foi possível conectar ao servidor."
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Erro analizado resposta do servidor"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Existiram conflitos durante a importação"
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "Editor de relações: {0}"
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Autores: {0}"
-
-#~ msgid "There are unsaved changes. Delete the layer anwyay?"
-#~ msgstr "Existem mudanças não-salvas. Excluir camada mesmo assim?"
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Excluir camada selecionada."
-
-#~ msgid "Merge the layer directly below into the selected layer."
-#~ msgstr "Unir camada diretamente inferior com camada selecionada."
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Combinar conflitos"
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Pilha de comandos: {0}"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Alguns dos nós estão (praticamente) na linha"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Combinar caminhos com membros diferentes?"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Todos caminhos estavam vazios"
-
-#~ msgid "Those nodes are not in a circle."
-#~ msgstr "Estes nós não estão em um círculo"
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Por favor selecione no mínimo uma tarefa para baixar"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "Ajuda Online do JOSM"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Pode-se editar somente páginas de ajuda online do JOSM"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Erro ao carregar página {0}"
-
-#~ msgid "History of Element"
-#~ msgstr "Histórico do Elemento"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "Os nós selecionados tem relações de usuários diferentes. Você ainda "
-#~ "pretende uni-los?"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Unir nós com usuários diferentes?"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Unir mesmo assim"
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr ""
-#~ "Por favor selecione um ou mais caminhos fechados de no mínimo quatro nós."
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Somente dois nós permitidos"
-
-#~ msgid "Only one node selected"
-#~ msgstr "Somente um nó selecionado"
-
-#~ msgid "An error occurred while restoring backup file."
-#~ msgstr "Ocorreu um erro enquanto o arquivo backup estava sendo restaurado."
-
-#~ msgid "An error occurred while saving."
-#~ msgstr "Ocorreu um erro durante o salvamento."
-
-#~ msgid "aqueduct"
-#~ msgstr "aqueduto"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Abrir no Navegador Web"
-
-#~ msgid "Update Data"
-#~ msgstr "Atualizar Dados"
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Não foram encontrados dados a atualizar. Você já abriu ou baixou uma "
-#~ "camada de dados?"
-
-#~ msgid "No data imported."
-#~ msgstr "Não há dados importados."
-
-#~ msgid "Data Layer"
-#~ msgstr "Camada de Dados"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO! (GNOME)"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO! (WebKit GTK)"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO! (WebKit)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO! (GNOME Fix)"
-
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "Faltando número de versão nos dados dos mapas"
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "Não foi possível ler da URL: \"{0}\""
-
-#~ msgid "Set the language."
-#~ msgstr "Escolha o idioma."
-
-#~ msgid "File not found"
-#~ msgstr "Arquivo não encontrado"
-
-#~ msgid "Images for {0}"
-#~ msgstr "Imagens para {0}"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "imagem"
-#~ msgstr[1] "imagens"
-
-#~ msgid "Synchronize Time with GPS Unit"
-#~ msgstr "Sincronizar Tempo com Unidade GPS"
-
-#~ msgid "Image"
-#~ msgstr "Imagem"
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Erro interno: Não é possível verificar condições sem nenhuma camada. Por "
-#~ "favor, relate isso como uma falha do programa."
-
-#~ msgid "Update Selection"
-#~ msgstr "Atualizar Seleção"
-
-#~ msgid "Updating primitive"
-#~ msgstr "Atualizando primitiva"
-
-#~ msgid "Conflict detected"
-#~ msgstr "Detectado conflito"
-
-#~ msgid "Primitive already deleted"
-#~ msgstr "Primitiva já deletada"
-
-#~ msgid "Errors during Download"
-#~ msgstr "Erros ao Transferir"
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "Primitivas deletadas ou movidas"
-
-#~ msgid "The following errors occurred during mass download:"
-#~ msgstr "Os seguintes erros aconteceram durante a transferência em massa:"
-
-#~ msgid "Error while communicating with server."
-#~ msgstr "Erro de comunicação com o servidor."
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "Enviar para o OSM..."
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Envio para API OSM falhou"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
-#~ "to<br>delete on the server is already deleted.<br><br>The error message "
-#~ "is:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Envio <strong>falhou</strong> porque uma primitiva que você "
-#~ "tentou<br>apagar no servidor já está apagada.<br><br>A mensagem de erro é:"
-#~ "<br>{0}</html>"
-
-#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
-#~ msgstr "Cabeçalho de erro \"{0}\" não se encaixa no padrão \"{1}\""
-
-#~ msgid ""
-#~ "WARNING: launching browser windows for the first {0} of {1} selected "
-#~ "primitives only"
-#~ msgstr ""
-#~ "AVISO: lançando janela do browser para somente as primeiras {0} das {1} "
-#~ "primitivas selecionadas"
-
-#~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
-#~ msgstr ""
-#~ "O número de alterações atuais ultrapassa o número máximo de alterações. O "
-#~ "número atual é {0}, o máximo é {1}"
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "Os caminhos selecionados têm filiações diferentes. Você pretende uni-los "
-#~ "mesmo assim?"
-
-#~ msgid "unnamed"
-#~ msgstr "sem nome"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Nenhum documento aberto, portanto não há nada a salvar."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Extensão de arquivo desconhecida."
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>Existem {0} primitivas no seu conjunto de dados local que<br>podem "
-#~ "ter sido apagadas do servidor. Se você posteriormente tentar exclui-las "
-#~ "ou<br>atualizá-las no servidor provavelmente o servidor apontará "
-#~ "um<br>conflito.<br><br>Clique <strong>{1}</strong> para verificar o "
-#~ "estado dessas primitivas<br>no servidor.<br>Clique <strong>{2}</strong> "
-#~ "para ignorar.<br></html>"
-
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "Houve uma falha ao inicializar a API. Tente novamente mais tarde."
-
-#~ msgid ""
-#~ "A relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "Uma filiação de relação foi copiada para todos os novos caminhos.\n"
-#~ "Por favor, verifique e corrija quando necessário."
-
-#~ msgid ""
-#~ "A role based relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "Uma filiação de relação com base na atribuição foi copiada para todos os "
-#~ "novos caminhos.\n"
-#~ "Verifique e corrija quando necessário."
-
-#~ msgid ""
-#~ "<html>You are using the EPSG:4326 projection which might lead<br>to "
-#~ "undesirable results when doing rectangular alignments.<br>Change your "
-#~ "projection to get rid of this warning.<br>Do you want to continue?"
-#~ msgstr ""
-#~ "<html>Você está usando a projeção EPSG:4326 que pode levar "
-#~ "a<br>resultados indesejados quando fizer alinhamentos retangulares."
-#~ "<br>Mude sua projeção para evitar esta notificação.<br>Pretende continuar?"
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "Nenhuma caminho \"para\" encontrado."
-
-#~ msgid "More than one \"from\" way found."
-#~ msgstr "Mais de um caminho \"de\" encontrado."
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "Mais de um caminho \"para\" encontrado."
-
-#~ msgid "Style for inner way ''{0}'' equals multipolygon."
-#~ msgstr "Estilo para caminho interno \"{0}\" é multipolígono."
-
-#~ msgid "Area style way is not closed."
-#~ msgstr "Caminho para Estilo de Área não está fechado."
-
-#~ msgid "Non-Way ''{0}'' in multipolygon."
-#~ msgstr "\"{0}\" não é um caminho no multipolígono."
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "Nenhum caminho \"de\" encontrado."
-
-#~ msgid "Load Selection"
-#~ msgstr "Carregar Seleção"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "Contato {0}..."
-
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Número de parametros incorreto para operador de nós."
-
-#~ msgid "Incorrect value of id operator: {0}. Number is expected."
-#~ msgstr "Valor incorreto do operador de id: {0}. Se esperava um número."
-
-#~ msgid ""
-#~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
-#~ "nodes or range, for example nodes:10-20"
-#~ msgstr ""
-#~ "Valor incorreto de operador de nós: {0}. O operador de nós espera un "
-#~ "número de nós ou um intervalo, por exemplos, os nós:10-20"
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "Fechamento de parenteses esperado."
-
-#~ msgid "Parsing error in URL: \"{0}\""
-#~ msgstr "Erro processando URL: \"{0}\""
-
-#~ msgid "Purging 1 primitive"
-#~ msgstr "Purgando 1 primitiva"
-
-#~ msgid "removing reference from way {0}"
-#~ msgstr "removendo referência de caminho {0}"
-
-#~ msgid "Split way segment"
-#~ msgstr "Dividir segmento de via"
-
-#~ msgid "nodes"
-#~ msgstr "nós"
-
-#~ msgid "ways"
-#~ msgstr "caminhos"
-
-#~ msgid "relations"
-#~ msgstr "relações"
-
-#~ msgid "No \"via\" node or way found."
-#~ msgstr "Não encontrei nenum nó ou caminho com o parâmetro \"via\"."
-
-#~ msgid "More than one \"via\" found."
-#~ msgstr "Encontrado mais de um parâmetro \"via\"."
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 45.7° and 47.9°\n"
-#~ "and longitutes between 5.7° and 10.6° only.\n"
-#~ "Use another projection system if you are not working\n"
-#~ "on a data set of Switzerland or Liechtenstein.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "A projeção \"{0}\" foi desenhada apenas para\n"
-#~ "latitudes entre 45.7° e 47.9°\n"
-#~ "e longitutes entre 5.7° e 10.6°.\n"
-#~ "Use outro sistema de projeção se você não está trabalhando\n"
-#~ "em um dataset da Suíça ou de Liechtenstein.\n"
-#~ "Não faça o upload de nenhuma informação depois desta mensagem."
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "Abrir arquivo (como raw gps, se .gpx)"
-
-#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
-#~ msgstr ""
-#~ "Não foi possível encontrar primitiva com id {0} e versão {1} no conjunto "
-#~ "de dados"
-
-#~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-#~ msgstr "Em vez de --download=<bbox>, você pode especificar osm://<bbox>\n"
-
-#~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
-#~ "some data before --selection"
-#~ msgstr ""
-#~ "Parâmetros são lidos na ordem em que são informados, por isso tenha "
-#~ "certeza que você está carregando\n"
-#~ "alguma coisa antes de --selection"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Erro enquanto analisando"
-
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "parâmetro '{0}' não pode ser nulo"
-
-#~ msgid "Oberpfalz Geofabrik.de"
-#~ msgstr "Oberpfalz Geofabrik.de"
-
-#~ msgid "Boat"
-#~ msgstr "Barco"
-
-#~ msgid "Motorboat"
-#~ msgstr "Barco motorizado"
-
-#~ msgid "Footway"
-#~ msgstr "Calçada"
-
-#~ msgid "Cycleway"
-#~ msgstr "Ciclovia"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "Read GPX..."
-#~ msgstr "Ler GPX..."
-
-#~ msgid "Anonymous"
-#~ msgstr "Anônimo"
-
-#~ msgid "Copy defaults"
-#~ msgstr "Copiar padrões"
-
-#~ msgid "All images"
-#~ msgstr "Todas as imagens"
-
-#~ msgid "Default Values"
-#~ msgstr "Valores Predefinidos"
-
-#~ msgid "Continue anyway"
-#~ msgstr "Continuar assim mesmo"
-
-#~ msgid "<multiple>"
-#~ msgstr "<múltiplo>"
-
-#~ msgid "Sync clock"
-#~ msgstr "Sincronizar relógio"
-
-#~ msgid "More details"
-#~ msgstr "Mais detalhes"
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Conflitos nos dados"
-
-#~ msgid "{0} within the track."
-#~ msgstr "{0} dentro da faixa"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "A data no arquivo \"{0}\" não pode ser analisada."
-
-#~ msgid "Shop"
-#~ msgstr "Loja"
-
-#~ msgid "Edit Station"
-#~ msgstr "Editar Estação"
-
-#~ msgid "Edit Information Office"
-#~ msgstr "Editar Centro de Informações Turísticas"
-
-#~ msgid "Map Type"
-#~ msgstr "Tipo de Mapa"
-
-#~ msgid "map"
-#~ msgstr "mapa"
-
-#~ msgid "citymap"
-#~ msgstr "mapa da cidade"
-
-#~ msgid "bicyclemap"
-#~ msgstr "mapa de ciclovias"
-
-#~ msgid "Board Type"
-#~ msgstr "Tipo de Quadro"
-
-#~ msgid ""
-#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: "
-#~ "{0}"
-#~ msgstr ""
-#~ "Levantada exceção de segurança setAlwaysOnTop(). Ignorando. Exceção foi: "
-#~ "{0}"
-
-#~ msgid "Linked"
-#~ msgstr "Vinculado"
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Sem tempo para ponto {0} x {1}"
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Não foi possível ler tempo \"{0}\" para ponto {1} x {2}"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Não foram encontradas imagens com dados de tempo legíveis"
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "Iniciar GPS: {0}"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "delta atual: {0}s"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "Finalizar GPS: {0}"
-
-#~ msgid "timezone difference: "
-#~ msgstr "diferença de zona horária: "
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "O tempo informado não pode ser analisado."
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Digite data de exibição (mm/dd/aaaa HH:MM:SS)"
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "Zona horária do GPS (diferença com foto)"
-
-#~ msgid ""
-#~ "Enable to upload all changes in one request, disable to use one request "
-#~ "per changed primitive"
-#~ msgstr ""
-#~ "Habilitar para envio de todas modificações em uma chamada, desabilitar "
-#~ "para usar uma chamada por primitiva"
-
-#~ msgid "Confirmation"
-#~ msgstr "Confirmação"
-
-#~ msgid "Delete all"
-#~ msgstr "Apagar tudo"
-
-#~ msgid "Download referrers from OSM..."
-#~ msgstr "Baixando referencias desde OSM..."
-
-#~ msgid "Gauss-Laborde Réunion 1947"
-#~ msgstr "Gauss-Laborde Réunion 1947"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr ""
-#~ "Faltando página de Ajuda. Crie uma em <A HREF=\"{0}\">português</A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Página de ajuda. Crie-a em <A HREF=\"{0}\">English</A> ou <A HREF=\"{1}"
-#~ "\">português</A>."
-
-#~ msgid "Didn't find an primitive with id {0} in this dataset"
-#~ msgstr "Não consegui encontrar um primitivo com o id {0} neste dataset."
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parâmetro ''{0}'' não pode ser nulo"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "se esperava instância de OsmDataLayer ou GpxLayer. Obtido \"{0}\""
-
-#~ msgid "Unexpected return value. Got {0}."
-#~ msgstr "valor não esperado de retorno. Veio {0}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "parametro {0} > 0 necessário. Obtido {1}."
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr "parametro ''{0}'' não é uma classe aceitável, obtido ''{1}''"
-
-#~ msgid "There's no primitive with version {0} in this history."
-#~ msgstr "Não há primitiva com versão {0} neste histórico"
-
-#~ msgid "There's no version valid at date ''{0}'' in this history."
-#~ msgstr "Não há versão válida na data ''{0}'' neste histórico"
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr "parâmetro ''{0}'' no intervalo  de 0..{1} esperado, obtido {2}"
-
-#~ msgid "No earliest version found. History is empty."
-#~ msgstr "não foi encontrada versão anterior. Histórico está vazio."
-
-#~ msgid "No latest version found. History is empty."
-#~ msgstr "não foi encontrada a última versão. Histórico está vazio."
-
-#~ msgid "Parameter current out of range. Got {0}."
-#~ msgstr "parâmetro atual fora do intervalo: obtido {0}"
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "indice inesperado na coluna. Obtido {0}"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "O parâmetro 'col' deve ser 0 ou 1. Obtido {0}"
-
-#~ msgid "Index out of bounds. Got {0}."
-#~ msgstr "índice fora dos limites. Obtido {0}"
-
-#~ msgid "Display the history of the selected primitive."
-#~ msgstr "Mostrar histórico da primitiva selecionada"
-
-#~ msgid "Could not read ''{0}''."
-#~ msgstr "Não foi possível ler \"{0}\""
-
-#~ msgid "Always move and don't show dialog again"
-#~ msgstr "Mover sempre e não mostrar dica outraves"
-
-#~ msgid "Can't search because there is no loaded data."
-#~ msgstr "Não pode procurar porque não exite informação carregada."
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
-#~ "relation?</html>"
-#~ msgstr ""
-#~ "<html>Selecção \"{0}\" é usada pela relação \"{1}\".<br>Apagar da relação?"
-#~ "</html>"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
-#~ "<br>Delete from relation?</html>"
-#~ msgstr ""
-#~ "<html>A selecção \"{0}\" é usada pela relação \"{1}\" com o papel {2}."
-#~ "<br>Apagar da relação?</html>"
-
-#~ msgid "Replace"
-#~ msgstr "Substituir"
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.</html>"
-#~ msgstr ""
-#~ "<html>Existem conflitos não-resolvidos na camada ''{0}''.<br>Você precisa "
-#~ "resolvê-los primeiro.</html>"
-
-#~ msgid "Current changeset is null. Can't upload data."
-#~ msgstr "Changeset atual é nulo. Não há como enviar os dados."
-
-#~ msgid "Uploading {0} objects ..."
-#~ msgstr "Enviando {0} objetos..."
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "Exige-se Id > 0, obtido {0}"
-
-#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-#~ msgstr "Erro de sintaxe do padrão: padrão {0} em {1} é ilegal!"
-
-#~ msgid "Wrong number of parameters for tags operator."
-#~ msgstr "Número errado de parâmetros para o operador de tags"
-
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "O parâmetro \"{0}\" não pode estar vazio"
-
-#~ msgid ""
-#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
-#~ "This can lead to nodes being deleted accidentally.\n"
-#~ "Are you really sure to continue?"
-#~ msgstr ""
-#~ "A(s) via(s) selecionadas têm nós selecionados fora da área a baixar.\n"
-#~ "Isto pode acabar apagando nós acidentalmente.\n"
-#~ "Deseja continuar?"
-
-#~ msgid ""
-#~ "The selection contains {0} way. Are you sure you want to simplify it?"
-#~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them "
-#~ "all?"
-#~ msgstr[0] "A seleção contém {0} via. Tem certeza que quer simplificá-la?"
-#~ msgstr[1] ""
-#~ "A seleção contém {0} vias. Tem certeza que quer simplificar todas?"
-
-#~ msgid ""
-#~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
-#~ "tags or range, for example tags:1 or tags:2-5"
-#~ msgstr ""
-#~ "Valor incorreto para operador de etiquetas: {0}. Operador de tags espera "
-#~ "número de etiquetas ou intervalo, por exemplo, tags:1 ou tags:2-5"
-
-#~ msgid "Incorrect value of changeset operator: {0}. Number is expected."
-#~ msgstr ""
-#~ "Valor incorreto para operador de conjunto de modificações: {0}. Um número "
-#~ "é esperado."
-
-#~ msgid "Incorrect value of version operator: {0}. Number is expected."
-#~ msgstr "Valor incorreto de operador de versão: {0}. Número é esperado."
-
-#~ msgid "Apply also for children"
-#~ msgstr "Aplicar também para filhos"
-
-#~ msgid "Enter a changset id"
-#~ msgstr "Digite o ID do changeset"
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" node."
-#~ msgstr "O caminho \"de\" não começa ou termina em um nó \"via\"."
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" node."
-#~ msgstr "O trecho \"to\" não começa ou termina no nó \"via\""
-
-#~ msgid "The \"from\" way does not start or end at the \"via\" way."
-#~ msgstr "O trecho \"from\" não começa ou termina no caminho \"via\""
-
-#~ msgid "The \"to\" way does not start or end at the \"via\" way."
-#~ msgstr "O trecho \"to\" não começa ou termina em um nó \"via\"."
-
-#~ msgid "<html>Cannot open directory.<br>Please select a file!</html>"
-#~ msgstr ""
-#~ "<html>Não foi possível abrir diretório.<br>Por favor, selecione um "
-#~ "arquivo!</html>"
-
-#~ msgid ""
-#~ "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-#~ "Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-#~ "Hold left mousebutton and draw a frame."
-#~ msgstr ""
-#~ "<b>Zoom:</b> Roda do mouse, clique duplo ou Ctrl + Up/Down <b>Mover mapa:"
-#~ "</b> Segure o botão direito do mouse e mova-o ou use as setas do teclado. "
-#~ "<b>Selecionar:</b> Segure o botão esquerdo do mouse e desenhe a área."
-
-#~ msgid ""
-#~ "Target object with id {0} and version {1} is visible although source "
-#~ "object with lower version {2} is not visible. Cannot deal with this "
-#~ "inconsistency. Keeping target object. "
-#~ msgstr ""
-#~ "Objeto alvo com id {0} e versão {1} é visível, porém o source do objeto "
-#~ "com versão menor {2} não é visível. Não é possível lidar com essa "
-#~ "inconsistência. Mantendo objeto alvo. "
-
-#~ msgid "Use all their elements"
-#~ msgstr "Usar todos elementos deles"
-
-#~ msgid "<number>"
-#~ msgstr "<número>"
-
-#~ msgid "Use all my elements"
-#~ msgstr "Use todos os meus elementos"
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Você está a ponto de apagar nós fora da área que fez download de dados."
-#~ "<br> Isto pode causar problemas, já que outros objetos que você não pode "
-#~ "ver podem estar usando estes pontos.<br> Deseja realmente apagar?"
-
-#~ msgctxt "filter"
-#~ msgid "C"
-#~ msgstr "C"
-
-#~ msgid "GPS point"
-#~ msgstr "Pontos GPS"
-
-#~ msgid "Style for outer way ''{0}'' mismatches."
-#~ msgstr "Estilo para caminho externo \"{0}\" contém erros."
Index: applications/editors/josm/i18n/po/ro.po
===================================================================
--- applications/editors/josm/i18n/po/ro.po	(revision 22209)
+++ applications/editors/josm/i18n/po/ro.po	(revision 22278)
@@ -8,6 +8,6 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
-"PO-Revision-Date: 2010-06-28 16:47+0000\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
+"PO-Revision-Date: 2010-07-09 09:37+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
 "== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:12+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: ROMANIA\n"
@@ -265,5 +265,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -332,5 +332,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:81
 msgid "No target layers"
-msgstr ""
+msgstr "Niciun strat țintă"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25
@@ -620,5 +620,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:230
 msgid "Copy"
-msgstr ""
+msgstr "Copiază"
 
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
@@ -656,9 +656,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -698,5 +698,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:134
 msgid "Distribute Nodes"
-msgstr ""
+msgstr "Distribuie noduri"
 
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
@@ -729,5 +729,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77
 msgid "Separate Layer"
-msgstr ""
+msgstr "Separă Strat"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:45
@@ -1128,5 +1128,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:77
 msgid "Mirror"
-msgstr ""
+msgstr "În oglindă"
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1471,5 +1471,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1601,5 +1601,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
 msgid "Save As..."
-msgstr ""
+msgstr "Salvează ca..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
@@ -1652,5 +1652,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
 msgid "Simplify Way"
-msgstr ""
+msgstr "Simplifică Calea"
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
@@ -2010,5 +2010,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
-msgstr ""
+msgstr "Încarcă selecție"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
@@ -2348,5 +2348,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Start new way from last node."
-msgstr ""
+msgstr "Începe cale nouă de la ultimul nod"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
@@ -2699,6 +2699,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2718,5 +2718,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
 msgid "Start Search"
-msgstr ""
+msgstr "Începe Căutarea"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231
@@ -3283,5 +3283,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
-msgstr ""
+msgstr "Valoare nouă"
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:50
@@ -4243,5 +4243,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -4767,5 +4767,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -4777,5 +4777,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr ""
@@ -5356,5 +5356,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5457,9 +5457,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5472,53 +5472,52 @@
 msgstr "Adaugă"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr "Exportă fișier GPX"
+msgstr ""
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5526,5 +5525,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5532,5 +5531,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5538,5 +5537,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5544,5 +5543,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5551,5 +5550,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5557,5 +5556,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5563,5 +5562,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5569,24 +5568,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -10127,10 +10126,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10139,5 +10138,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr ""
@@ -12452,5 +12451,5 @@
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
 msgid "Contacting OSM Server..."
-msgstr ""
+msgstr "Se contactează Serverul OSM..."
 
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47
@@ -12674,5 +12673,5 @@
 msgstr "Alegeţi o licenţă predefinită"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -12683,5 +12682,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -12691,5 +12690,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -12699,5 +12698,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -13352,9 +13351,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -13363,5 +13362,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:134
 msgid "Downloading from OSM Server..."
-msgstr ""
+msgstr "Descărcare de la Serverul OSM..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:142
@@ -14145,11 +14144,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -14158,5 +14157,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -14851,14 +14850,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr ""
@@ -15023,5 +15022,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
@@ -19690,5 +19689,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
 msgid "Save WMS layer to file"
-msgstr ""
+msgstr "Salvează strat WMS în fișier"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
@@ -20567,4 +20566,5 @@
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
 msgstr ""
+"Afișează imagini georeferențiate ca fundal în JOSM (servere WMS, Yahoo, ...)."
 
 #. <!--
@@ -32881,25 +32881,25 @@
 #: build/trans_validator.java:66 build/trans_validator.java:67
 msgid "maxspeed used for footway"
-msgstr ""
+msgstr "Viteza maxima pedestra"
 
 #. way  : I : highway == steps && maxspeed == *
 #: build/trans_validator.java:69
 msgid "layer tag with + sign"
-msgstr ""
+msgstr "Nivel eticheta cu semn +"
 
 #. *    : W : layer == /\+.*/
 #: build/trans_validator.java:71
 msgid "street name contains ss"
-msgstr ""
+msgstr "Numele strazii contine ss"
 
 #. *    : I : name == /.*Strasse.*/i
 #: build/trans_validator.java:73
 msgid "relation without type"
-msgstr ""
+msgstr "Legatura fara tip"
 
 #. relation : E : type != *
 #: build/trans_validator.java:75
 msgid "restaurant without name"
-msgstr ""
+msgstr "Restaurant fara nume"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
@@ -32909,5 +32909,5 @@
 #: build/trans_validator.java:78 build/trans_validator.java:79
 msgid "unusual tag combination"
-msgstr ""
+msgstr "Combinatie neobisnuita a etichetei"
 
 #. FORMAT
@@ -32917,10 +32917,10 @@
 #: build/trans_wms.java:5
 msgid "Landsat"
-msgstr ""
+msgstr "Landsat"
 
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
-msgstr ""
+msgstr "Open Aerial Map"
 
 #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
@@ -32930,5 +32930,5 @@
 #: build/trans_wms.java:10
 msgid "Yahoo Sat"
-msgstr ""
+msgstr "Yahoo Sat"
 
 #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
Index: applications/editors/josm/i18n/po/ru.po
===================================================================
--- applications/editors/josm/i18n/po/ru.po	(revision 22209)
+++ applications/editors/josm/i18n/po/ru.po	(revision 22278)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
-"PO-Revision-Date: 2010-07-04 11:29+0000\n"
-"Last-Translator: J-Wills <Unknown>\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
+"PO-Revision-Date: 2010-07-06 17:21+0000\n"
+"Last-Translator: bastik <Unknown>\n"
 "Language-Team: Koptev Oleg <koptev.oleg@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:08+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
@@ -271,5 +271,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -666,9 +666,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1517,5 +1517,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2848,6 +2848,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2878,7 +2878,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "Введите выражение для поиска"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -4491,5 +4490,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -5052,5 +5051,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -5062,5 +5061,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr "Вниз"
@@ -5683,5 +5682,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5787,9 +5786,9 @@
 msgstr "Уладить конфликты для ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr "Отфильтровать объекты и скрыть/отключить их."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5802,53 +5801,52 @@
 msgstr "Добавить"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr "Добавить фильтр."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr "Редактировать фильтр."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr "Удалить фильтр."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr "Переместить фильтр вверх."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr "Переместить фильтр вниз."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr "Включить фильтр"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr "Скрыть элементы"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr "Инвертировать фильтр"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr "Режим фильтра"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr "Фильтром спрятано:{0}, отключено:{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr "Ошибка при загрузке файла"
+msgstr ""
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5856,5 +5854,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5862,5 +5860,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5868,5 +5866,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5874,5 +5872,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5881,5 +5879,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5887,5 +5885,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5893,5 +5891,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5899,24 +5897,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Фильтр активен</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> объектов скрыто"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "Отключено редактирование <b>{0}</b> объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -10816,10 +10814,10 @@
 msgstr[2] "{0} найдено, помеченным GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Удалить изображение с диска"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10830,5 +10828,5 @@
 "утерян!</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr "Невозможно удалить файл изображения."
@@ -13645,5 +13643,5 @@
 msgstr "Выберите лицензию из набора"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -13654,5 +13652,5 @@
 msgstr "Маркеры из {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -13663,5 +13661,5 @@
 "Произошла ошибка при разборе файла gpx {0}. Доступна только часть файла"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -13671,5 +13669,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -14379,9 +14377,9 @@
 msgstr "Разбор данных OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr "Подготовка набора данных..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -15303,5 +15301,5 @@
 msgstr "Не могу найти перевод {0}. Возвращено к {1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -15309,6 +15307,6 @@
 "Предупреждение: не удалось обработать файл .zip {0}''. Текст ошибки: {1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -15319,5 +15317,5 @@
 "ошибки: {1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -16120,7 +16118,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
-#, fuzzy
 msgid "on polygon"
-msgstr "Мультиполигон"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
@@ -16139,15 +16136,14 @@
 msgstr "Здания"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
-msgstr "Следующее"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr "Улица"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr "Ввести адреса"
@@ -16328,5 +16324,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
@@ -18287,12 +18283,10 @@
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110
-#, fuzzy
 msgid "Create Stops from GTFS ..."
-msgstr "Создать контрольные точки из GPX  ..."
+msgstr ""
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76
-#, fuzzy
 msgid "Create Stops from a GTFS file"
-msgstr "Создать контрольные точки из файла GPX"
+msgstr ""
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204
@@ -18303,7 +18297,6 @@
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85
-#, fuzzy
 msgid "GTFS-Stops"
-msgstr "Остановки"
+msgstr ""
 
 #. item "Bicycle/Rental" text "Name"
@@ -27274,7 +27267,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "american_football"
-msgstr "австралийский футбол"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -27305,7 +27297,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "canadian_football"
-msgstr "австралийский футбол"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -27351,7 +27342,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "gaelic_football"
-msgstr "австралийский футбол"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -27397,7 +27387,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "rugby_union"
-msgstr "рэгби"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -27887,35 +27876,29 @@
 
 #: build/trans_presets.java:2076
-#, fuzzy
 msgid "American Football"
-msgstr "Австралийский футбол"
+msgstr ""
 
 #. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-#, fuzzy
 msgid "Edit American Football"
-msgstr "Свойства австралийского футбола"
+msgstr ""
 
 #: build/trans_presets.java:2082
-#, fuzzy
 msgid "Canadian Football"
-msgstr "Свойства американского футбола"
+msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
 #: build/trans_presets.java:2083
-#, fuzzy
 msgid "Edit Canadian Football"
-msgstr "Свойства австралийского футбола"
+msgstr ""
 
 #: build/trans_presets.java:2088
-#, fuzzy
 msgid "Gaelic Football"
-msgstr "Свойства американского футбола"
+msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "Свойства американского футбола"
+msgstr ""
 
 #: build/trans_presets.java:2094
@@ -27925,18 +27908,15 @@
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "Свойства регби"
+msgstr ""
 
 #: build/trans_presets.java:2100
-#, fuzzy
 msgid "Rugby Union"
-msgstr "Регби"
+msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "Свойства регби"
+msgstr ""
 
 #: build/trans_presets.java:2106
@@ -34683,157 +34663,4 @@
 msgstr "Sicily - Италия"
 
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr ""
-#~ "<html>Произошла ошибка во время соединения с сервером<br>Подробности: {0}"
-#~ "</html>"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "Связь с сервером прервана"
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Да, восстановить их тоже"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "Нет, отменить действие"
-
-#~ msgid ""
-#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
-#~ "server.<br><br>Do you want to undelete this node too?"
-#~ msgid_plural ""
-#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
-#~ "the server.<br><br>Do you want to undelete these nodes too?"
-#~ msgstr[0] ""
-#~ "Имеется {0} дополнительная точка, используемая в линии {1}<br>, которая "
-#~ "удалена на сервере.<br><br>Вы хотите восстановить и эту точку тоже?"
-#~ msgstr[1] ""
-#~ "Имеется {0} дополнительные точки, используемых в линии {1}<br>, которые "
-#~ "удалены на сервере.<br><br>Вы хотите восстановить и эти точки тоже?"
-#~ msgstr[2] ""
-#~ "Имеется {0} дополнительных точек, используемых в линии {1}<br>, которые "
-#~ "удалены на сервере.<br><br>Вы хотите восстановить и эти точки тоже?"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Восстановить дополнительные точки?"
-
-#~ msgid ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgid_plural ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
-#~ msgstr[0] ""
-#~ "Имеется {0} дополнительный элемент, входящий в отношение {1}<br>, который "
-#~ "удалён на сервере.<br><br>Вы хотите восстановить и этот элемент тоже?"
-#~ msgstr[1] ""
-#~ "Имеется {0} дополнительных элемента, входящие в отношение {1}<br>, "
-#~ "которые удалены на сервере.<br><br>Вы хотите восстановить и эти элементы "
-#~ "тоже?"
-#~ msgstr[2] ""
-#~ "Имеется {0} дополнительных элементов, входящих в отношение {1}<br>, "
-#~ "которые удалены на сервере.<br><br>Вы хотите восстановить и эти элементы "
-#~ "тоже?"
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Восстановить связанные элементы?"
-
-#~ msgid "Visible State:"
-#~ msgstr "Видим:"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "видим (на сервере)"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "невидим (на сервере)"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Оставить клон локальной версии"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Физически удалить из локального набора данных"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "Оставить моё состояние \"Видим\""
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Да, сбросить id"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>Чтобы сохранить вашу локальную версию, JOSM<br>сбросит id элемента "
-#~ "{0} в 0.<br>При следующей загрузке, сервер назначит<br>ему новый id."
-#~ "<br>Вы согласны?</html>"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "Сбросить в 0"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "Оставить их состояние \"Видим\""
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Да, очистить"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSM удалит ваш локальный элемент с id {0}<br>из набора данных."
-#~ "<br>Вы согласны?</html>"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Удалить из набора данных"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "Не улаживать конфликт между видимыми состояниями"
-
-#~ msgid ""
-#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
-#~ "{0} object<br>from the local dataset because it is deleted on the server."
-#~ msgid_plural ""
-#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
-#~ "purging {0} objects<br> from the local dataset because they are deleted "
-#~ "on the server."
-#~ msgstr[0] ""
-#~ "{0} конфликт был <strong>улажен автоматически</strong> путём очистки {0} "
-#~ "объекта<br>из локального набора данных, так как объект уже был удалён на "
-#~ "сервере."
-#~ msgstr[1] ""
-#~ "{0} конфликта было <strong>улажено автоматически</strong> путём очистки "
-#~ "{0} объектов<br>из локального набора данных, так как объекты уже были "
-#~ "удалёны на сервере."
-#~ msgstr[2] ""
-#~ "{0} конфликтов было <strong>улажено автоматически</strong> путём очистки "
-#~ "{0} объектов<br>из локального набора данных, так как объекты уже были "
-#~ "удалёны на сервере."
-
-#~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "Осталось уладить {0} конфликт.<br><br>Пожалуйста, откройте диалог списка "
-#~ "конфликтов и уладьте конфликт вручную."
-#~ msgstr[1] ""
-#~ "Осталось уладить {0} конфликта.<br><br>Пожалуйста, откройте диалог списка "
-#~ "конфликтов и уладьте конфликты вручную."
-#~ msgstr[2] ""
-#~ "Осталось уладить {0} конфликтов.<br><br>Пожалуйста, откройте диалог "
-#~ "списка конфликтов и уладьте конфликты вручную."
-
-#~ msgid "Create house number and street name relation"
-#~ msgstr "Создать отношение для связи номера домов с улицей"
-
-#~ msgid "football"
-#~ msgstr "американский футбол"
-
-#~ msgid "Football"
-#~ msgstr "Американский футбол"
-
 #~ msgid "No data imported."
 #~ msgstr "Данные не импортированы"
@@ -35099,4 +34926,7 @@
 #~ msgid "Refresh the selection list."
 #~ msgstr "Обновить список выбранного."
+
+#~ msgid "Football"
+#~ msgstr "Американский футбол"
 
 #~ msgid "Occupied By"
@@ -35792,4 +35622,10 @@
 #~ msgstr "% долготы:"
 
+#~ msgid "Yes, undelete them too"
+#~ msgstr "Да, восстановить их тоже"
+
+#~ msgid "No, cancel operation"
+#~ msgstr "Нет, отменить действие"
+
 #~ msgid "Checking whether node {0} is gone ..."
 #~ msgstr "Проверка существования узла {0} в прошлом..."
@@ -35871,4 +35707,44 @@
 #~ msgstr "линии"
 
+#~ msgid ""
+#~ "<html>An error occurred while communicating with the server<br>Details: "
+#~ "{0}</html>"
+#~ msgstr ""
+#~ "<html>Произошла ошибка во время соединения с сервером<br>Подробности: {0}"
+#~ "</html>"
+
+#~ msgid "visible (on the server)"
+#~ msgstr "видим (на сервере)"
+
+#~ msgid "Visible State:"
+#~ msgstr "Видим:"
+
+#~ msgid "Communication with server failed"
+#~ msgstr "Связь с сервером прервана"
+
+#~ msgid "Keep my visible state"
+#~ msgstr "Оставить моё состояние \"Видим\""
+
+#~ msgid "not visible (on the server)"
+#~ msgstr "невидим (на сервере)"
+
+#~ msgid "Physically delete from local dataset"
+#~ msgstr "Физически удалить из локального набора данных"
+
+#~ msgid "Reset id to 0"
+#~ msgstr "Сбросить в 0"
+
+#~ msgid "Keep their visible state"
+#~ msgstr "Оставить их состояние \"Видим\""
+
+#~ msgid "Yes, purge it"
+#~ msgstr "Да, очистить"
+
+#~ msgid "Yes, reset the id"
+#~ msgstr "Да, сбросить id"
+
+#~ msgid "Remove from dataset"
+#~ msgstr "Удалить из набора данных"
+
 #~ msgid "Merge Anyway"
 #~ msgstr "Объединить в любом случае"
@@ -35887,4 +35763,7 @@
 #~ msgid "parameter '{0}' must not be null"
 #~ msgstr "параметр '{0}' не должен быть null"
+
+#~ msgid "Keep a clone of the local version"
+#~ msgstr "Оставить клон локальной версии"
 
 #~ msgid "Login name (e-mail) to the OSM account."
@@ -36072,4 +35951,7 @@
 #~ msgstr "Элемент с id {0} и версией {1} не был найден в этом наборе данных"
 
+#~ msgid "Undelete dependent primitives?"
+#~ msgstr "Восстановить связанные элементы?"
+
 #~ msgid "Didn't find an primitive with id {0} in this dataset"
 #~ msgstr "Элемент с id {0} не был найден в этом наборе данных"
@@ -36137,4 +36019,7 @@
 #~ msgid "Select a starting node on the end of a way"
 #~ msgstr "Выделите начальную точку на конце линии"
+
+#~ msgid "Undelete additional nodes?"
+#~ msgstr "Восстановить дополнительные точки?"
 
 #~ msgid "Download all incomplete ways and nodes in relation"
@@ -36290,4 +36175,11 @@
 #~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 #~ msgstr "ожидался параметр ''{0}'' >= 0, текущее значение ''{1}''"
+
+#~ msgid ""
+#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
+#~ "the dataset.<br>Do you agree?</html>"
+#~ msgstr ""
+#~ "<html>JOSM удалит ваш локальный элемент с id {0}<br>из набора данных."
+#~ "<br>Вы согласны?</html>"
 
 #~ msgid "Display the history of the selected primitive."
@@ -36890,4 +36782,38 @@
 #~ "Точка {0} не может быть добавлена к линии, потому что она была удалена"
 
+#~ msgid ""
+#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
+#~ "server.<br><br>Do you want to undelete this node too?"
+#~ msgid_plural ""
+#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
+#~ "the server.<br><br>Do you want to undelete these nodes too?"
+#~ msgstr[0] ""
+#~ "Имеется {0} дополнительная точка, используемая в линии {1}<br>, которая "
+#~ "удалена на сервере.<br><br>Вы хотите восстановить и эту точку тоже?"
+#~ msgstr[1] ""
+#~ "Имеется {0} дополнительные точки, используемых в линии {1}<br>, которые "
+#~ "удалены на сервере.<br><br>Вы хотите восстановить и эти точки тоже?"
+#~ msgstr[2] ""
+#~ "Имеется {0} дополнительных точек, используемых в линии {1}<br>, которые "
+#~ "удалены на сервере.<br><br>Вы хотите восстановить и эти точки тоже?"
+
+#~ msgid ""
+#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
+#~ "deleted on the server.<br><br>Do you want to undelete this too?"
+#~ msgid_plural ""
+#~ "There are {0} additional primitives referred to by relation {1}<br>which "
+#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
+#~ msgstr[0] ""
+#~ "Имеется {0} дополнительный элемент, входящий в отношение {1}<br>, который "
+#~ "удалён на сервере.<br><br>Вы хотите восстановить и этот элемент тоже?"
+#~ msgstr[1] ""
+#~ "Имеется {0} дополнительных элемента, входящие в отношение {1}<br>, "
+#~ "которые удалены на сервере.<br><br>Вы хотите восстановить и эти элементы "
+#~ "тоже?"
+#~ msgstr[2] ""
+#~ "Имеется {0} дополнительных элементов, входящих в отношение {1}<br>, "
+#~ "которые удалены на сервере.<br><br>Вы хотите восстановить и эти элементы "
+#~ "тоже?"
+
 #~ msgid "GPS point"
 #~ msgstr "точка GPS"
@@ -36939,10 +36865,61 @@
 #~ msgstr "диапазон"
 
+#~ msgid "football"
+#~ msgstr "американский футбол"
+
 #~ msgid "Style for inner way ''{0}'' equals multipolygon."
 #~ msgstr "Стиль для внутренней линии ''{0}'' такой же, как у мультиполигона."
 
+#~ msgid "Undecide conflict between visible state"
+#~ msgstr "Не улаживать конфликт между видимыми состояниями"
+
+#~ msgid ""
+#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
+#~ "{0} object<br>from the local dataset because it is deleted on the server."
+#~ msgid_plural ""
+#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
+#~ "purging {0} objects<br> from the local dataset because they are deleted "
+#~ "on the server."
+#~ msgstr[0] ""
+#~ "{0} конфликт был <strong>улажен автоматически</strong> путём очистки {0} "
+#~ "объекта<br>из локального набора данных, так как объект уже был удалён на "
+#~ "сервере."
+#~ msgstr[1] ""
+#~ "{0} конфликта было <strong>улажено автоматически</strong> путём очистки "
+#~ "{0} объектов<br>из локального набора данных, так как объекты уже были "
+#~ "удалёны на сервере."
+#~ msgstr[2] ""
+#~ "{0} конфликтов было <strong>улажено автоматически</strong> путём очистки "
+#~ "{0} объектов<br>из локального набора данных, так как объекты уже были "
+#~ "удалёны на сервере."
+
+#~ msgid ""
+#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
+#~ "Dialog and manually resolve it."
+#~ msgid_plural ""
+#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
+#~ "Dialog and manually resolve them."
+#~ msgstr[0] ""
+#~ "Осталось уладить {0} конфликт.<br><br>Пожалуйста, откройте диалог списка "
+#~ "конфликтов и уладьте конфликт вручную."
+#~ msgstr[1] ""
+#~ "Осталось уладить {0} конфликта.<br><br>Пожалуйста, откройте диалог списка "
+#~ "конфликтов и уладьте конфликты вручную."
+#~ msgstr[2] ""
+#~ "Осталось уладить {0} конфликтов.<br><br>Пожалуйста, откройте диалог "
+#~ "списка конфликтов и уладьте конфликты вручную."
+
 #~ msgid "Point on angle of building to start drawing"
 #~ msgstr "Укажите угол здания чтобы начать отрисовку"
 
+#~ msgid ""
+#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
+#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
+#~ "new id.<br>Do you agree?</html>"
+#~ msgstr ""
+#~ "<html>Чтобы сохранить вашу локальную версию, JOSM<br>сбросит id элемента "
+#~ "{0} в 0.<br>При следующей загрузке, сервер назначит<br>ему новый id."
+#~ "<br>Вы согласны?</html>"
+
 #~ msgid "reverter: {0}"
 #~ msgstr "откатчик: {0}"
@@ -36956,2 +36933,5 @@
 #~ msgid " Video"
 #~ msgstr " Видео"
+
+#~ msgid "Create house number and street name relation"
+#~ msgstr "Создать отношение для связи номера домов с улицей"
Index: applications/editors/josm/i18n/po/sk.po
===================================================================
--- applications/editors/josm/i18n/po/sk.po	(revision 22209)
+++ applications/editors/josm/i18n/po/sk.po	(revision 22278)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
 "PO-Revision-Date: 2010-06-23 22:48+0000\n"
 "Last-Translator: Vlado <babicvm@szm.sk>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:12+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -268,5 +268,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -659,9 +659,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1500,5 +1500,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2818,6 +2818,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2848,7 +2848,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "Vložiť hľadaný výraz"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -4453,5 +4452,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -5014,5 +5013,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -5024,5 +5023,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr "Dole"
@@ -5639,5 +5638,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5747,9 +5746,9 @@
 msgstr "Rozhodnúť konflikt pre ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr "Filtrovať objekty a schovať/vypnúť ich."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5762,53 +5761,52 @@
 msgstr "Pridať"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr "Pridať filter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr "Upraviť filter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr "Zmazať filter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr "Posunúť filter hore."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr "Posunúť filter dole."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr "Zapnúť filter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr "Schovať prvky"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr "Obrátený filter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr "Režim filter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr "Filter Skrytých:{0} Nepovolených:{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr "Chyba pri nahrávaní súboru"
+msgstr ""
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5816,5 +5814,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5822,5 +5820,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5828,5 +5826,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5834,5 +5832,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5841,5 +5839,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5847,5 +5845,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5853,5 +5851,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5859,24 +5857,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Aktívny filter</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> skryté objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> vypnuté objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -10722,10 +10720,10 @@
 msgstr[2] "{0} boli založené GPS značky."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Vymazať súbor s obrázkom z disku"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10736,5 +10734,5 @@
 "stratený!</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr "Súbor s obrázkom nemôže byť zmazaný."
@@ -13510,5 +13508,5 @@
 msgstr "Zvoľte preddefinovanú licenciu"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -13519,5 +13517,5 @@
 msgstr "Značky z {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -13529,5 +13527,5 @@
 "dispozícii"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -13537,5 +13535,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -14237,9 +14235,9 @@
 msgstr "Rozložiť OSM dáta..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr "Pripravujem dátový súbor ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -15165,5 +15163,5 @@
 msgstr "Nemôžem nájsť preklad pre jazyk {0}. Vyberám {1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -15171,6 +15169,6 @@
 "Varovanie: Nepodarilo sa spracovať zip súbor ''{0}''. Výnimka bola: {1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -15181,5 +15179,5 @@
 "dôvodov. Výnimka bola: {1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -15886,7 +15884,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
-#, fuzzy
 msgid "on polygon"
-msgstr "multipolygón"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
@@ -15905,15 +15902,14 @@
 msgstr "Budovy, stavby"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
-msgstr "Nasledujúci"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr "Ulica"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr ""
@@ -16095,5 +16091,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
@@ -18046,12 +18042,10 @@
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110
-#, fuzzy
 msgid "Create Stops from GTFS ..."
-msgstr "Vytváranie zastávok z GPX ..."
+msgstr ""
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76
-#, fuzzy
 msgid "Create Stops from a GTFS file"
-msgstr "Vytvorenie zastávok z GPX súboru"
+msgstr ""
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204
@@ -18062,7 +18056,6 @@
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85
-#, fuzzy
 msgid "GTFS-Stops"
-msgstr "Zastávky"
+msgstr ""
 
 #. item "Bicycle/Rental" text "Name"
@@ -26992,7 +26985,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "american_football"
-msgstr "australian_football"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -27024,7 +27016,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "canadian_football"
-msgstr "australian_football"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -27073,7 +27064,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "gaelic_football"
-msgstr "australian_football"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -27119,7 +27109,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "rugby_union"
-msgstr "ragby"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -27609,35 +27598,29 @@
 
 #: build/trans_presets.java:2076
-#, fuzzy
 msgid "American Football"
-msgstr "Australian Football"
+msgstr ""
 
 #. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-#, fuzzy
 msgid "Edit American Football"
-msgstr "Upraviť Australian Football"
+msgstr ""
 
 #: build/trans_presets.java:2082
-#, fuzzy
 msgid "Canadian Football"
-msgstr "Upraviť americký futbal"
+msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
 #: build/trans_presets.java:2083
-#, fuzzy
 msgid "Edit Canadian Football"
-msgstr "Upraviť Australian Football"
+msgstr ""
 
 #: build/trans_presets.java:2088
-#, fuzzy
 msgid "Gaelic Football"
-msgstr "Upraviť americký futbal"
+msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "Upraviť americký futbal"
+msgstr ""
 
 #: build/trans_presets.java:2094
@@ -27647,18 +27630,15 @@
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "Upraviť ragby"
+msgstr ""
 
 #: build/trans_presets.java:2100
-#, fuzzy
 msgid "Rugby Union"
-msgstr "Ragby"
+msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "Upraviť ragby"
+msgstr ""
 
 #: build/trans_presets.java:2106
@@ -34405,139 +34385,4 @@
 msgstr "Sicily - Italy"
 
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr ""
-#~ "<html>Nastala chyba počas komunikácie so serverom<br>Detaily: {0}</html>"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "Spojenie so serverom zlyhalo"
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Áno, obnoviť ich tiež"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "Nie, zrušiť operáciu"
-
-#~ msgid ""
-#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
-#~ "server.<br><br>Do you want to undelete this node too?"
-#~ msgid_plural ""
-#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
-#~ "the server.<br><br>Do you want to undelete these nodes too?"
-#~ msgstr[0] ""
-#~ "Nachádza sa tam {0} ďalší bod použitý v ceste {1}<br>ktorý je vymazaný na "
-#~ "servery.<br><br>Chcete obnoviť tento bod tiež?"
-#~ msgstr[1] ""
-#~ "Nachádza sa tam {0} ďalších bodov použitých v ceste {1}<br>ktoré sú "
-#~ "vymazané na servery.<br><br>Chcete obnoviť tieto body tiež?"
-#~ msgstr[2] ""
-#~ "Nachádzajú sa tam {0} ďalšie body použité v ceste {1}<br>ktoré sú "
-#~ "vymazané na servery.<br><br>Chcete obnoviť tieto body tiež?"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Obnoviť pridané body?"
-
-#~ msgid ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgid_plural ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
-#~ msgstr[0] ""
-#~ "Nachádza sa tam {0} ďalší pôvodný odkazujúci na reláciu {1}<br>ktorý je "
-#~ "vymazaný na servery.<br><br>Chcete obnoviť tento bod tiež?"
-#~ msgstr[1] ""
-#~ "Nachádza sa tam {0} ďalších pôvodných odkazujúcich na reláciu {1}"
-#~ "<br>ktoré sú vymazané na servery.<br><br>Chcete obnoviť tieto body tiež?"
-#~ msgstr[2] ""
-#~ "Nachádzajú sa tam {0} ďalšie pôvodné odkazujúce na reláciu {1}<br>ktoré "
-#~ "sú vymazané na servery.<br><br>Chcete obnoviť tieto body tiež?"
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Obnoviť pôvodné závislé odkazy?"
-
-#~ msgid "Visible State:"
-#~ msgstr "Viditeľný Stav:"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "viditeľné (na servery)"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "neviditeľné (na servery)"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Zostáva klon lokálnej verzie"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Fyzicky vymazať z lokálnej verzie"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "Zostáva môj viditeľný stav"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Áno, vynulovať id"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "Nastaviť id na 0"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "Ponechať svoj viditeľný stav"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Áno, očistiť to"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSM odstráni vaše lokálne pôvodné s id {0}<br>z dátovej sady."
-#~ "<br>Súhlasíte?</html>"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Odstrániť z dátovej sady"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "Nerozhodnutý konflikt medzi viditeľnými stavom"
-
-#~ msgid ""
-#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
-#~ "{0} object<br>from the local dataset because it is deleted on the server."
-#~ msgid_plural ""
-#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
-#~ "purging {0} objects<br> from the local dataset because they are deleted "
-#~ "on the server."
-#~ msgstr[0] ""
-#~ "{0} konflikt bol <strong>vyriešený automaticky</strong> vyčistením {0} "
-#~ "objektu<br>z miestnej dátovej sady, pretože bol zmazaný na servery."
-#~ msgstr[1] ""
-#~ "{0} konflikt bol <strong>vyriešený automaticky</strong> vyčistením {0} "
-#~ "objektov<br>z miestnej dátovej sady, pretože bol zmazaný na servery."
-#~ msgstr[2] ""
-#~ "{0} konflikt bol <strong>vyriešený automaticky</strong> vyčistením {0} "
-#~ "objektov<br>z miestnej dátovej sady, pretože bol zmazaný na servery."
-
-#~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "{0} zvyšok konfliktu musí byť vyriešený.<br><br>Prosím otvorte Conflict "
-#~ "List Dialog a manuálne ho vyriešte."
-#~ msgstr[1] ""
-#~ "{0} zvyšky konfliktov musia byť vyriešené.<br><br>Prosím otvorte Conflict "
-#~ "List Dialog a manuálne ich vyriešte."
-#~ msgstr[2] ""
-#~ "{0} zvyšov konfliktov musí byť vyriešených.<br><br>Prosím otvorte "
-#~ "Conflict List Dialog a manuálne ich vyriešte."
-
-#~ msgid "football"
-#~ msgstr "americký futbal"
-
-#~ msgid "Football"
-#~ msgstr "Americký futbal"
-
 #~ msgid "Move"
 #~ msgstr "Presunúť"
@@ -35043,4 +34888,10 @@
 #~ msgid "Rotate"
 #~ msgstr "Otočiť"
+
+#~ msgid "football"
+#~ msgstr "americký futbal"
+
+#~ msgid "Football"
+#~ msgstr "Americký futbal"
 
 #~ msgid "Charge"
@@ -35709,4 +35560,13 @@
 #~ msgstr "Obnovujem reláciu..."
 
+#~ msgid "Yes, undelete them too"
+#~ msgstr "Áno, obnoviť ich tiež"
+
+#~ msgid "No, cancel operation"
+#~ msgstr "Nie, zrušiť operáciu"
+
+#~ msgid "Undelete additional nodes?"
+#~ msgstr "Obnoviť pridané body?"
+
 #~ msgid "Undeleting Way..."
 #~ msgstr "Obnovovanie cesty..."
@@ -35714,4 +35574,7 @@
 #~ msgid "Checking whether primitive {0} is gone ..."
 #~ msgstr "Kontrolujem či sú závislosti {0} is gone ..."
+
+#~ msgid "Undelete dependent primitives?"
+#~ msgstr "Obnoviť pôvodné závislé odkazy?"
 
 #~ msgid ""
@@ -35862,6 +35725,21 @@
 #~ "{0}, maximálne je {1}"
 
+#~ msgid ""
+#~ "<html>An error occurred while communicating with the server<br>Details: "
+#~ "{0}</html>"
+#~ msgstr ""
+#~ "<html>Nastala chyba počas komunikácie so serverom<br>Detaily: {0}</html>"
+
 #~ msgid "removing reference from way {0}"
 #~ msgstr "vybranie odkazu z cesty {0}"
+
+#~ msgid "Keep my visible state"
+#~ msgstr "Zostáva môj viditeľný stav"
+
+#~ msgid "Yes, reset the id"
+#~ msgstr "Áno, vynulovať id"
+
+#~ msgid "Communication with server failed"
+#~ msgstr "Spojenie so serverom zlyhalo"
 
 #~ msgid ""
@@ -35878,4 +35756,41 @@
 #~ "servery.<br>Click <strong>{2}</strong>ignorovať.<br></html>"
 
+#~ msgid "not visible (on the server)"
+#~ msgstr "neviditeľné (na servery)"
+
+#~ msgid "visible (on the server)"
+#~ msgstr "viditeľné (na servery)"
+
+#~ msgid "Visible State:"
+#~ msgstr "Viditeľný Stav:"
+
+#~ msgid "Physically delete from local dataset"
+#~ msgstr "Fyzicky vymazať z lokálnej verzie"
+
+#~ msgid "Keep a clone of the local version"
+#~ msgstr "Zostáva klon lokálnej verzie"
+
+#~ msgid "Reset id to 0"
+#~ msgstr "Nastaviť id na 0"
+
+#~ msgid "Keep their visible state"
+#~ msgstr "Ponechať svoj viditeľný stav"
+
+#~ msgid "Yes, purge it"
+#~ msgstr "Áno, očistiť to"
+
+#~ msgid ""
+#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
+#~ "the dataset.<br>Do you agree?</html>"
+#~ msgstr ""
+#~ "<html>JOSM odstráni vaše lokálne pôvodné s id {0}<br>z dátovej sady."
+#~ "<br>Súhlasíte?</html>"
+
+#~ msgid "Remove from dataset"
+#~ msgstr "Odstrániť z dátovej sady"
+
+#~ msgid "Undecide conflict between visible state"
+#~ msgstr "Nerozhodnutý konflikt medzi viditeľnými stavom"
+
 #~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
 #~ msgstr "<html>Chybný priebeh nahrávania zo servera. Detaily:<br>{0}</html>"
@@ -36500,4 +36415,37 @@
 #~ msgstr "Nemôžem vytvoriť body so vstupnými súradnicami šírka/dĺžka."
 
+#~ msgid ""
+#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
+#~ "{0} object<br>from the local dataset because it is deleted on the server."
+#~ msgid_plural ""
+#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
+#~ "purging {0} objects<br> from the local dataset because they are deleted "
+#~ "on the server."
+#~ msgstr[0] ""
+#~ "{0} konflikt bol <strong>vyriešený automaticky</strong> vyčistením {0} "
+#~ "objektu<br>z miestnej dátovej sady, pretože bol zmazaný na servery."
+#~ msgstr[1] ""
+#~ "{0} konflikt bol <strong>vyriešený automaticky</strong> vyčistením {0} "
+#~ "objektov<br>z miestnej dátovej sady, pretože bol zmazaný na servery."
+#~ msgstr[2] ""
+#~ "{0} konflikt bol <strong>vyriešený automaticky</strong> vyčistením {0} "
+#~ "objektov<br>z miestnej dátovej sady, pretože bol zmazaný na servery."
+
+#~ msgid ""
+#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
+#~ "Dialog and manually resolve it."
+#~ msgid_plural ""
+#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
+#~ "Dialog and manually resolve them."
+#~ msgstr[0] ""
+#~ "{0} zvyšok konfliktu musí byť vyriešený.<br><br>Prosím otvorte Conflict "
+#~ "List Dialog a manuálne ho vyriešte."
+#~ msgstr[1] ""
+#~ "{0} zvyšky konfliktov musia byť vyriešené.<br><br>Prosím otvorte Conflict "
+#~ "List Dialog a manuálne ich vyriešte."
+#~ msgstr[2] ""
+#~ "{0} zvyšov konfliktov musí byť vyriešených.<br><br>Prosím otvorte "
+#~ "Conflict List Dialog a manuálne ich vyriešte."
+
 #~ msgid "Looking up available translations..."
 #~ msgstr "Vyhľadávanie dostupných prekladov..."
@@ -36561,4 +36509,36 @@
 #~ msgstr "C"
 
+#~ msgid ""
+#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
+#~ "deleted on the server.<br><br>Do you want to undelete this too?"
+#~ msgid_plural ""
+#~ "There are {0} additional primitives referred to by relation {1}<br>which "
+#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
+#~ msgstr[0] ""
+#~ "Nachádza sa tam {0} ďalší pôvodný odkazujúci na reláciu {1}<br>ktorý je "
+#~ "vymazaný na servery.<br><br>Chcete obnoviť tento bod tiež?"
+#~ msgstr[1] ""
+#~ "Nachádza sa tam {0} ďalších pôvodných odkazujúcich na reláciu {1}"
+#~ "<br>ktoré sú vymazané na servery.<br><br>Chcete obnoviť tieto body tiež?"
+#~ msgstr[2] ""
+#~ "Nachádzajú sa tam {0} ďalšie pôvodné odkazujúce na reláciu {1}<br>ktoré "
+#~ "sú vymazané na servery.<br><br>Chcete obnoviť tieto body tiež?"
+
+#~ msgid ""
+#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
+#~ "server.<br><br>Do you want to undelete this node too?"
+#~ msgid_plural ""
+#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
+#~ "the server.<br><br>Do you want to undelete these nodes too?"
+#~ msgstr[0] ""
+#~ "Nachádza sa tam {0} ďalší bod použitý v ceste {1}<br>ktorý je vymazaný na "
+#~ "servery.<br><br>Chcete obnoviť tento bod tiež?"
+#~ msgstr[1] ""
+#~ "Nachádza sa tam {0} ďalších bodov použitých v ceste {1}<br>ktoré sú "
+#~ "vymazané na servery.<br><br>Chcete obnoviť tieto body tiež?"
+#~ msgstr[2] ""
+#~ "Nachádzajú sa tam {0} ďalšie body použité v ceste {1}<br>ktoré sú "
+#~ "vymazané na servery.<br><br>Chcete obnoviť tieto body tiež?"
+
 #~ msgid "GPS point"
 #~ msgstr "GPS bod"
Index: applications/editors/josm/i18n/po/sl.po
===================================================================
--- applications/editors/josm/i18n/po/sl.po	(revision 22209)
+++ applications/editors/josm/i18n/po/sl.po	(revision 22278)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
 "PO-Revision-Date: 2010-06-28 15:54+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:08+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -262,5 +262,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -647,9 +647,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1460,5 +1460,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2699,6 +2699,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2729,7 +2729,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "regularni izraz"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -4251,5 +4250,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -4775,5 +4774,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -4785,5 +4784,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr "Dol"
@@ -5364,5 +5363,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5461,9 +5460,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5476,53 +5475,52 @@
 msgstr "Dodaj"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr "Napaka v datoteki {0}"
+msgstr ""
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5530,5 +5528,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5536,5 +5534,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5542,5 +5540,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5548,5 +5546,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5555,5 +5553,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5561,5 +5559,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5567,5 +5565,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5573,24 +5571,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -10138,10 +10136,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10150,5 +10148,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr ""
@@ -12688,5 +12686,5 @@
 msgstr "Izberite preddoločeno licenco"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -12697,5 +12695,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -12705,5 +12703,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -12713,5 +12711,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -13366,9 +13364,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14165,11 +14163,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -14178,5 +14176,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -14871,14 +14869,14 @@
 msgstr "Zgradbe"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr ""
@@ -15043,5 +15041,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
@@ -26279,7 +26277,6 @@
 #. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-#, fuzzy
 msgid "Edit American Football"
-msgstr "Uredi regionalno cesto (3. reda, turistična)"
+msgstr ""
 
 #: build/trans_presets.java:2082
@@ -26289,7 +26286,6 @@
 #. item "Sport (Ball)/Canadian Football"
 #: build/trans_presets.java:2083
-#, fuzzy
 msgid "Edit Canadian Football"
-msgstr "Uredi kanal"
+msgstr ""
 
 #: build/trans_presets.java:2088
@@ -26299,7 +26295,6 @@
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "Uredi košarko"
+msgstr ""
 
 #: build/trans_presets.java:2094
@@ -26309,7 +26304,6 @@
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "Uredi kamnolom"
+msgstr ""
 
 #: build/trans_presets.java:2100
@@ -26319,7 +26313,6 @@
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "Uredi ruševine"
+msgstr ""
 
 #: build/trans_presets.java:2106
Index: applications/editors/josm/i18n/po/sv.po
===================================================================
--- applications/editors/josm/i18n/po/sv.po	(revision 22209)
+++ applications/editors/josm/i18n/po/sv.po	(revision 22278)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
 "PO-Revision-Date: 2010-06-07 08:48+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:10+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -267,5 +267,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -660,9 +660,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1492,5 +1492,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2783,6 +2783,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2813,7 +2813,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "Ange sökuttryck"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -4346,5 +4345,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -4870,5 +4869,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -4880,5 +4879,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr ""
@@ -5459,5 +5458,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5557,9 +5556,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5572,53 +5571,52 @@
 msgstr "Lägg till"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr "Fel vid läsning av fil"
+msgstr ""
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5626,5 +5624,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5632,5 +5630,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5638,5 +5636,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5644,5 +5642,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5651,5 +5649,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5657,5 +5655,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5663,5 +5661,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5669,24 +5667,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -10248,10 +10246,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10260,5 +10258,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr ""
@@ -12835,5 +12833,5 @@
 msgstr "Välj en fördefinierad licens"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -12844,5 +12842,5 @@
 msgstr "Markörer från {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -12852,5 +12850,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -12860,5 +12858,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -13513,9 +13511,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14318,11 +14316,11 @@
 "Kunde inte hitta någon översättning för locale {0}. Faller tillbaka på {1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -14331,5 +14329,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -15014,7 +15012,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
-#, fuzzy
 msgid "on polygon"
-msgstr "Multipolygon"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
@@ -15033,15 +15030,14 @@
 msgstr "Byggnader"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
-msgstr "Nästa"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr ""
@@ -15206,5 +15202,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
@@ -25895,7 +25891,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "american_football"
-msgstr "australisk fotboll"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -25926,7 +25921,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "canadian_football"
-msgstr "australisk fotboll"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -25972,7 +25966,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "gaelic_football"
-msgstr "australisk fotboll"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26018,7 +26011,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "rugby_union"
-msgstr "rugby"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26508,35 +26500,29 @@
 
 #: build/trans_presets.java:2076
-#, fuzzy
 msgid "American Football"
-msgstr "Australisk fotboll"
+msgstr ""
 
 #. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-#, fuzzy
 msgid "Edit American Football"
-msgstr "Redigera australisk fotboll"
+msgstr ""
 
 #: build/trans_presets.java:2082
-#, fuzzy
 msgid "Canadian Football"
-msgstr "Redigera amerikansk fotboll"
+msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
 #: build/trans_presets.java:2083
-#, fuzzy
 msgid "Edit Canadian Football"
-msgstr "Redigera australisk fotboll"
+msgstr ""
 
 #: build/trans_presets.java:2088
-#, fuzzy
 msgid "Gaelic Football"
-msgstr "Redigera amerikansk fotboll"
+msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "Redigera amerikansk fotboll"
+msgstr ""
 
 #: build/trans_presets.java:2094
@@ -26546,18 +26532,15 @@
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "Redigera rugby"
+msgstr ""
 
 #: build/trans_presets.java:2100
-#, fuzzy
 msgid "Rugby Union"
-msgstr "Rugby"
+msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "Redigera rugby"
+msgstr ""
 
 #: build/trans_presets.java:2106
@@ -33303,19 +33286,4 @@
 msgstr ""
 
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Ja, återskapa dem också"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "Nej, avbryt"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Återskapa ytterligare noder?"
-
-#~ msgid "football"
-#~ msgstr "amerikansk fotboll"
-
-#~ msgid "Football"
-#~ msgstr "Amerikansk fotboll"
-
 #~ msgid "Move"
 #~ msgstr "Flytta"
@@ -33599,4 +33567,10 @@
 #~ msgid "Shop"
 #~ msgstr "Affär"
+
+#~ msgid "football"
+#~ msgstr "amerikansk fotboll"
+
+#~ msgid "Football"
+#~ msgstr "Amerikansk fotboll"
 
 #~ msgid "Tagging preset sources"
@@ -34290,4 +34264,13 @@
 #~ msgstr "Uppladningen till OSM API misslyckades"
 
+#~ msgid "Yes, undelete them too"
+#~ msgstr "Ja, återskapa dem också"
+
+#~ msgid "No, cancel operation"
+#~ msgstr "Nej, avbryt"
+
+#~ msgid "Undelete additional nodes?"
+#~ msgstr "Återskapa ytterligare noder?"
+
 #~ msgid "Undeleting Way..."
 #~ msgstr "Ångrar radering av väg..."
Index: applications/editors/josm/i18n/po/tr.po
===================================================================
--- applications/editors/josm/i18n/po/tr.po	(revision 22209)
+++ applications/editors/josm/i18n/po/tr.po	(revision 22278)
@@ -10,6 +10,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
-"PO-Revision-Date: 2010-06-28 16:10+0000\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
+"PO-Revision-Date: 2010-07-06 16:53+0000\n"
 "Last-Translator: Angel Spy <melissadilara@yahoo.com>\n"
 "Language-Team: Türkçe\n"
@@ -18,5 +18,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:06+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -265,5 +265,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -654,9 +654,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1466,5 +1466,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2706,6 +2706,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2736,7 +2736,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "Arama ifadesini girin"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -4257,5 +4256,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -4781,5 +4780,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -4791,5 +4790,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr ""
@@ -5368,5 +5367,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5465,9 +5464,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5480,53 +5479,52 @@
 msgstr "Ekle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr "Dosya Yüklemede Sorun"
+msgstr ""
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5534,5 +5532,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5540,5 +5538,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5546,5 +5544,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5552,5 +5550,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5559,5 +5557,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5565,5 +5563,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5571,5 +5569,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5577,24 +5575,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -10134,10 +10132,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10146,5 +10144,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr ""
@@ -12692,5 +12690,5 @@
 msgstr "Ön tanımlı lisans seçiniz"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -12701,5 +12699,5 @@
 msgstr "İmleçler {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -12709,5 +12707,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -12717,5 +12715,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -13370,9 +13368,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14168,11 +14166,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -14181,5 +14179,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -14881,15 +14879,14 @@
 msgstr "Binalar"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
-msgstr "Sonraki"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr ""
@@ -15054,5 +15051,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
@@ -25707,7 +25704,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "american_football"
-msgstr "avustralya_footbol"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -25738,7 +25734,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "canadian_football"
-msgstr "avustralya_footbol"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -25784,7 +25779,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "gaelic_football"
-msgstr "avustralya_footbol"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -25830,7 +25824,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "rugby_union"
-msgstr "rugby"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26320,35 +26313,29 @@
 
 #: build/trans_presets.java:2076
-#, fuzzy
 msgid "American Football"
-msgstr "Avustralyan Futbol"
+msgstr ""
 
 #. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-#, fuzzy
 msgid "Edit American Football"
-msgstr "Avustralyan Futbol Düzenle"
+msgstr ""
 
 #: build/trans_presets.java:2082
-#, fuzzy
 msgid "Canadian Football"
-msgstr "Amerikan Futbolu Düzenle"
+msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
 #: build/trans_presets.java:2083
-#, fuzzy
 msgid "Edit Canadian Football"
-msgstr "Avustralyan Futbol Düzenle"
+msgstr ""
 
 #: build/trans_presets.java:2088
-#, fuzzy
 msgid "Gaelic Football"
-msgstr "Amerikan Futbolu Düzenle"
+msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "Amerikan Futbolu Düzenle"
+msgstr ""
 
 #: build/trans_presets.java:2094
@@ -26358,18 +26345,15 @@
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "Rugby Düzenle"
+msgstr ""
 
 #: build/trans_presets.java:2100
-#, fuzzy
 msgid "Rugby Union"
-msgstr "Rugby"
+msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "Rugby Düzenle"
+msgstr ""
 
 #: build/trans_presets.java:2106
@@ -33114,10 +33098,4 @@
 msgid "Sicily - Italy"
 msgstr "Sicilya - İtalya"
-
-#~ msgid "football"
-#~ msgstr "futbol"
-
-#~ msgid "Football"
-#~ msgstr "Amerikan Futbolu"
 
 #~ msgid "Do not show again"
@@ -33832,4 +33810,10 @@
 #~ msgstr "bisikletharitası"
 
+#~ msgid "football"
+#~ msgstr "futbol"
+
+#~ msgid "Football"
+#~ msgstr "Amerikan Futbolu"
+
 #~ msgid "Charge"
 #~ msgstr "Para Değişim"
Index: applications/editors/josm/i18n/po/uk.po
===================================================================
--- applications/editors/josm/i18n/po/uk.po	(revision 22209)
+++ applications/editors/josm/i18n/po/uk.po	(revision 22278)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
-"PO-Revision-Date: 2010-06-28 18:05+0000\n"
-"Last-Translator: andygol <Unknown>\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
+"PO-Revision-Date: 2010-07-06 16:21+0000\n"
+"Last-Translator: bastik <Unknown>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:07+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -270,5 +270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -662,9 +662,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1514,5 +1514,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2847,6 +2847,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2877,7 +2877,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "Введіть текст для пошуку"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -4493,5 +4492,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -5053,5 +5052,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -5063,5 +5062,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr "Вниз"
@@ -5678,5 +5677,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5784,9 +5783,9 @@
 msgstr "Розв’язати кнофлікти для ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr "Відфільтрувати об’єкти і приховати/відключити їх."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5799,53 +5798,52 @@
 msgstr "Додати"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr "Додати фільтр."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr "Редагувати фільтр."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr "Вилучити фільтр."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr "Перемістити фільтр вгору."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr "Перемістити фільтр вниз."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr "Увімкнути фільтр"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr "Приховати елементи"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr "Інвертувати фільтр"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr "Режим фільтра"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr "Фільтр Прихований:{0} Відключений:{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr "Помилка завантаження файлу"
+msgstr ""
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5853,5 +5851,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5859,5 +5857,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5865,5 +5863,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5871,5 +5869,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5878,5 +5876,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5884,5 +5882,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5890,5 +5888,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5896,24 +5894,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr "З"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Фільтр активний</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> об’єктів приховано"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> об’єктів пошкоджено"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>Закрити діалог фільтра, щоб побачити всі об’єкти.<p></html>"
@@ -10776,10 +10774,10 @@
 msgstr[2] "{0} знайдено, з GPS позначками."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Вилучити зображення з диску"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10790,5 +10788,5 @@
 "втрачено!</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr "Не можливо вилучити файл зображення"
@@ -13581,5 +13579,5 @@
 msgstr "Виберіть ліцензію з набору"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -13590,5 +13588,5 @@
 msgstr "Мітки з {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -13600,5 +13598,5 @@
 "доступною"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -13608,5 +13606,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -14318,9 +14316,9 @@
 msgstr "Розбір даних OSM…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr "Підготовка даних…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -15238,11 +15236,11 @@
 msgstr "Не вдається знайти переклад мовою «{0}». Повертаємось до {1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr "Попередження: не вдалося обробити zip-файл ''{0}''. Помилка: {1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -15253,5 +15251,5 @@
 "безпеки. Помилка: {1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -16051,7 +16049,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
-#, fuzzy
 msgid "on polygon"
-msgstr "Мультиполігон"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
@@ -16070,15 +16067,14 @@
 msgstr "Будівлі"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
-msgstr "Наступне"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr "Вулиця"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr "Ввести адреси"
@@ -16259,5 +16255,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
@@ -18219,12 +18215,10 @@
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110
-#, fuzzy
 msgid "Create Stops from GTFS ..."
-msgstr "Створити зупинки по GPX…"
+msgstr ""
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76
-#, fuzzy
 msgid "Create Stops from a GTFS file"
-msgstr "Створити зупинки з файла GPX"
+msgstr ""
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204
@@ -18235,7 +18229,6 @@
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85
-#, fuzzy
 msgid "GTFS-Stops"
-msgstr "Зупинки"
+msgstr ""
 
 #. item "Bicycle/Rental" text "Name"
@@ -27190,7 +27183,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "american_football"
-msgstr "австралійський футбол"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -27221,7 +27213,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "canadian_football"
-msgstr "австралійський футбол"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -27267,7 +27258,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "gaelic_football"
-msgstr "австралійський футбол"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -27313,7 +27303,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "rugby_union"
-msgstr "регбі"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -27803,35 +27792,29 @@
 
 #: build/trans_presets.java:2076
-#, fuzzy
 msgid "American Football"
-msgstr "Австралійський футбол"
+msgstr ""
 
 #. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-#, fuzzy
 msgid "Edit American Football"
-msgstr "Властивості Австралійського футболу"
+msgstr ""
 
 #: build/trans_presets.java:2082
-#, fuzzy
 msgid "Canadian Football"
-msgstr "Властивості Американського футболу"
+msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
 #: build/trans_presets.java:2083
-#, fuzzy
 msgid "Edit Canadian Football"
-msgstr "Властивості Австралійського футболу"
+msgstr ""
 
 #: build/trans_presets.java:2088
-#, fuzzy
 msgid "Gaelic Football"
-msgstr "Властивості Американського футболу"
+msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "Властивості Американського футболу"
+msgstr ""
 
 #: build/trans_presets.java:2094
@@ -27841,18 +27824,15 @@
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "Властивості Регбі"
+msgstr ""
 
 #: build/trans_presets.java:2100
-#, fuzzy
 msgid "Rugby Union"
-msgstr "Регбі"
+msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "Властивості Регбі"
+msgstr ""
 
 #: build/trans_presets.java:2106
@@ -34598,13 +34578,71 @@
 msgstr "Італія – Сицилія"
 
+#~ msgid "Error: {0}"
+#~ msgstr "Помилка: {0}"
+
+#~ msgid "Warning: {0}"
+#~ msgstr "Попередження: {0}"
+
+#~ msgid "Style for inner way ''{0}'' equals multipolygon."
+#~ msgstr "Стиль внутрішньої лінії \"{0}\" такий же, як у мультиполігону."
+
+#~ msgid "Style for outer way ''{0}'' mismatches."
+#~ msgstr "Стиль зовнішньої лінії \"{0}\" не узгоджений."
+
 #~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
+#~ "<html>There are {0} primitives in your local dataset which<br>might be "
+#~ "deleted on the server. If you later try to delete or<br>update them the "
+#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
+#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
+#~ "<strong>{2}</strong> to ignore.<br></html>"
 #~ msgstr ""
-#~ "<html>Під час з’єднання з сервером виникла помилка<br>Подробиці: {0}</"
-#~ "html>"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "Збій під час з’єднання з сервером"
+#~ "<html>Кількість елементів у вашому наборі даних — {0}, <br>вони можуть "
+#~ "бути вилученими на сервері. В подальшому, якщо ви спробуєте вилучити "
+#~ "або<br>оновити їх, сервер скоріш за все сповістить про<br>конфлікт."
+#~ "<br><br>Натисніть <strong>{1}</strong> щоб перевірити стан цих "
+#~ "елементів<br>на сервері.<br>Натисніть <strong>{2}</strong> щоб ігнорувати."
+#~ "<br></html>"
+
+#~ msgid "Errors during Download"
+#~ msgstr "Помилки під час отримання даних"
+
+#~ msgid "Deleted or moved primitives"
+#~ msgstr "Вилучені або переміщені елементи"
+
+#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
+#~ msgstr "Помилка синтаксису шаблону: Шаблон {0} в {1} неприпустимий!"
+
+#~ msgid ""
+#~ "Target object with id {0} and version {1} is visible although source "
+#~ "object with lower version {2} is not visible. Cannot deal with this "
+#~ "inconsistency. Keeping target object. "
+#~ msgstr ""
+#~ "Отриманий об’єкт з ідентифікатором {0} та версією {1} видимий, хоча "
+#~ "первинний об’єкт з нижчою версією {2} не видимий. Ця невідповідність "
+#~ "неможлива. Отриманий об’єкт збережено. "
+
+#~ msgid "More than one \"to\" way found."
+#~ msgstr "Виявлено більше ніж одну лінію \"до\"."
+
+#~ msgid "More than one \"from\" way found."
+#~ msgstr "Виявлено більше ніж одну лінію \"від\"."
+
+#~ msgid "Area style way is not closed."
+#~ msgstr "Лінія, що показує межу ділянки, не замкнена."
+
+#~ msgid "Unknown role ''{0}''."
+#~ msgstr "Невідома роль ''{0}''."
+
+#~ msgid "No \"to\" way found."
+#~ msgstr "Лінію «до» не знайдено."
+
+#~ msgid "No \"from\" way found."
+#~ msgstr "Лінію «від» не знайдено."
+
+#~ msgid "Unknown member type for ''{0}''."
+#~ msgstr "Невідомий тип члегна ''{0}''."
+
+#~ msgid "Style for restriction {0} not found."
+#~ msgstr "Стиль для обмеження {0} не знайдено."
 
 #~ msgid "Yes, undelete them too"
@@ -34613,4 +34651,23 @@
 #~ msgid "No, cancel operation"
 #~ msgstr "Ні, відмінити дію"
+
+#~ msgid "Undelete additional nodes?"
+#~ msgstr "Відновити додаткові точки?"
+
+#~ msgid ""
+#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
+#~ "deleted on the server.<br><br>Do you want to undelete this too?"
+#~ msgid_plural ""
+#~ "There are {0} additional primitives referred to by relation {1}<br>which "
+#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
+#~ msgstr[0] ""
+#~ "Є {0} додатковий елемент, що входить до зв’язку {1}<br>, який вилучено на "
+#~ "сервері.<br><br>Ви бажаєте відновити його також?"
+#~ msgstr[1] ""
+#~ "Є {0} додаткових елементи, що входять до зв’язку {1}<br>, який вилучено "
+#~ "на сервері.<br><br>Ви бажаєте відновити їх також?"
+#~ msgstr[2] ""
+#~ "Є {0} додаткових елементів, що входять до зв’язку {1}<br>, який вилучено "
+#~ "на сервері.<br><br>Ви бажаєте відновити їх також?"
 
 #~ msgid ""
@@ -34630,22 +34687,13 @@
 #~ "на сервері.<br><br>Ви бажаєте відновити ці точки також?"
 
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Відновити додаткові точки?"
-
 #~ msgid ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgid_plural ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
-#~ msgstr[0] ""
-#~ "Є {0} додатковий елемент, що входить до зв’язку {1}<br>, який вилучено на "
-#~ "сервері.<br><br>Ви бажаєте відновити його також?"
-#~ msgstr[1] ""
-#~ "Є {0} додаткових елементи, що входять до зв’язку {1}<br>, який вилучено "
-#~ "на сервері.<br><br>Ви бажаєте відновити їх також?"
-#~ msgstr[2] ""
-#~ "Є {0} додаткових елементів, що входять до зв’язку {1}<br>, який вилучено "
-#~ "на сервері.<br><br>Ви бажаєте відновити їх також?"
+#~ "<html>An error occurred while communicating with the server<br>Details: "
+#~ "{0}</html>"
+#~ msgstr ""
+#~ "<html>Під час з’єднання з сервером виникла помилка<br>Подробиці: {0}</"
+#~ "html>"
+
+#~ msgid "Communication with server failed"
+#~ msgstr "Збій під час з’єднання з сервером"
 
 #~ msgid "Undelete dependent primitives?"
@@ -34655,33 +34703,15 @@
 #~ msgstr "Видимий:"
 
+#~ msgid "not visible (on the server)"
+#~ msgstr "не видимий (на сервері)"
+
 #~ msgid "visible (on the server)"
 #~ msgstr "видимий ( на сервері)"
 
-#~ msgid "not visible (on the server)"
-#~ msgstr "не видимий (на сервері)"
+#~ msgid "Physically delete from local dataset"
+#~ msgstr "Фізично вилучити з локального набору даних"
 
 #~ msgid "Keep a clone of the local version"
 #~ msgstr "Лишити клон локальної версії"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Фізично вилучити з локального набору даних"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "Залишити мій стан \"Видимий\""
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Так, перевстановити ідентифікатор"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>Щоб зберегти свою локальну версію даних, JOSM<br>скине "
-#~ "ідентифікатор елемента {0} на 0.<br>Під час наступного надсилання даних, "
-#~ "сервер призначить<br> їм новий ідентифікатор.<br>Ви згодні?</html>"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "Встановити значення ідентифікатора в 0"
 
 #~ msgid "Keep their visible state"
@@ -34698,4 +34728,10 @@
 #~ "набору даних.<br>Ви згодні?</html>"
 
+#~ msgid "Keep my visible state"
+#~ msgstr "Залишити мій стан \"Видимий\""
+
+#~ msgid "Yes, reset the id"
+#~ msgstr "Так, перевстановити ідентифікатор"
+
 #~ msgid "Remove from dataset"
 #~ msgstr "Вилучити з набору даних"
@@ -34703,4 +34739,16 @@
 #~ msgid "Undecide conflict between visible state"
 #~ msgstr "Не розв’язувати конфлікти між станами \"Видимий\""
+
+#~ msgid "Command Stack: {0}"
+#~ msgstr "Стек команд: {0}"
+
+#~ msgid "Apply also for children"
+#~ msgstr "Застосувати також для нащадків"
+
+#~ msgid "GPS point"
+#~ msgstr "точка GPS"
+
+#~ msgid "Uploading {0} objects ..."
+#~ msgstr "Надсилання об’єктів. Кількість —  {0}…"
 
 #~ msgid ""
@@ -34740,136 +34788,68 @@
 #~ "списку конфліктів і розв’яжіть конфлікти вручну."
 
-#~ msgid "Create house number and street name relation"
-#~ msgstr "Створити зв’язок номеру будинку з вулицею"
+#~ msgid "Create non-audio markers when reading GPX."
+#~ msgstr "Створити не звукові мітки при обробці GPX даних"
+
+#~ msgid "Football"
+#~ msgstr "Американський футбол"
+
+#~ msgid "Reset id to 0"
+#~ msgstr "Встановити значення ідентифікатора в 0"
+
+#~ msgid "Point on angle of building to start drawing"
+#~ msgstr "Вкажіть кут будівлі, щоб почати креслення"
+
+#~ msgid ""
+#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
+#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
+#~ "new id.<br>Do you agree?</html>"
+#~ msgstr ""
+#~ "<html>Щоб зберегти свою локальну версію даних, JOSM<br>скине "
+#~ "ідентифікатор елемента {0} на 0.<br>Під час наступного надсилання даних, "
+#~ "сервер призначить<br> їм новий ідентифікатор.<br>Ви згодні?</html>"
+
+#~ msgid "reverter: {0}"
+#~ msgstr "відновлювач: {0}"
+
+#~ msgid "More than one \"via\" found."
+#~ msgstr "Виявлено більше ніж один елемент \"через\"."
+
+#~ msgid "No \"via\" node or way found."
+#~ msgstr "Не знайдено точку чи ліню що є елементами «через»."
+
+#~ msgid "The \"from\" way does not start or end at a \"via\" node."
+#~ msgstr "Лінія «з» не починається/закінчується у точці «через»."
+
+#~ msgid "The \"to\" way does not start or end at a \"via\" node."
+#~ msgstr "Лінія «до» не починається/закінчується у точці «через»."
+
+#~ msgid "The \"from\" way does not start or end at the \"via\" way."
+#~ msgstr "Лінія «з» не починається/закінчується на лінії «через»."
+
+#~ msgid "The \"to\" way does not start or end at the \"via\" way."
+#~ msgstr "Лінія «до» не починається/закінчується на лінії «через»."
+
+#~ msgid "Multipolygon inner way is outside."
+#~ msgstr "Внутрішня лінія мультиполігону ззовні."
+
+#~ msgid "Non-Way in multipolygon."
+#~ msgstr "У мультиполігоні не-лінія"
+
+#~ msgid "Painting problem"
+#~ msgstr "Проблеми малювання"
+
+#~ msgid "Check if map painting found data errors."
+#~ msgstr "Перевірити, чи містить намальована мапа помилки в даних."
+
+#~ msgid "Check for paint notes."
+#~ msgstr "Перевірити примітки до малюнка."
 
 #~ msgid "football"
 #~ msgstr "американський футбол"
-
-#~ msgid "Football"
-#~ msgstr "Американський футбол"
-
-#~ msgid "Error: {0}"
-#~ msgstr "Помилка: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Попередження: {0}"
-
-#~ msgid "Style for inner way ''{0}'' equals multipolygon."
-#~ msgstr "Стиль внутрішньої лінії \"{0}\" такий же, як у мультиполігону."
-
-#~ msgid "Style for outer way ''{0}'' mismatches."
-#~ msgstr "Стиль зовнішньої лінії \"{0}\" не узгоджений."
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>Кількість елементів у вашому наборі даних — {0}, <br>вони можуть "
-#~ "бути вилученими на сервері. В подальшому, якщо ви спробуєте вилучити "
-#~ "або<br>оновити їх, сервер скоріш за все сповістить про<br>конфлікт."
-#~ "<br><br>Натисніть <strong>{1}</strong> щоб перевірити стан цих "
-#~ "елементів<br>на сервері.<br>Натисніть <strong>{2}</strong> щоб ігнорувати."
-#~ "<br></html>"
-
-#~ msgid "Errors during Download"
-#~ msgstr "Помилки під час отримання даних"
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "Вилучені або переміщені елементи"
-
-#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-#~ msgstr "Помилка синтаксису шаблону: Шаблон {0} в {1} неприпустимий!"
-
-#~ msgid ""
-#~ "Target object with id {0} and version {1} is visible although source "
-#~ "object with lower version {2} is not visible. Cannot deal with this "
-#~ "inconsistency. Keeping target object. "
-#~ msgstr ""
-#~ "Отриманий об’єкт з ідентифікатором {0} та версією {1} видимий, хоча "
-#~ "первинний об’єкт з нижчою версією {2} не видимий. Ця невідповідність "
-#~ "неможлива. Отриманий об’єкт збережено. "
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "Виявлено більше ніж одну лінію \"до\"."
-
-#~ msgid "More than one \"from\" way found."
-#~ msgstr "Виявлено більше ніж одну лінію \"від\"."
-
-#~ msgid "Area style way is not closed."
-#~ msgstr "Лінія, що показує межу ділянки, не замкнена."
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Невідома роль ''{0}''."
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "Лінію «до» не знайдено."
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "Лінію «від» не знайдено."
-
-#~ msgid "Unknown member type for ''{0}''."
-#~ msgstr "Невідомий тип члегна ''{0}''."
-
-#~ msgid "Style for restriction {0} not found."
-#~ msgstr "Стиль для обмеження {0} не знайдено."
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Стек команд: {0}"
-
-#~ msgid "Apply also for children"
-#~ msgstr "Застосувати також для нащадків"
-
-#~ msgid "GPS point"
-#~ msgstr "точка GPS"
-
-#~ msgid "Uploading {0} objects ..."
-#~ msgstr "Надсилання об’єктів. Кількість —  {0}…"
-
-#~ msgid "Create non-audio markers when reading GPX."
-#~ msgstr "Створити не звукові мітки при обробці GPX даних"
-
-#~ msgid "Point on angle of building to start drawing"
-#~ msgstr "Вкажіть кут будівлі, щоб почати креслення"
-
-#~ msgid "reverter: {0}"
-#~ msgstr "відновлювач: {0}"
-
-#~ msgid "More than one \"via\" found."
-#~ msgstr "Виявлено більше ніж один елемент \"через\"."
-
-#~ msgid "No \"via\" node or way found."
-#~ msgstr "Не знайдено точку чи ліню що є елементами «через»."
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" node."
-#~ msgstr "Лінія «з» не починається/закінчується у точці «через»."
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" node."
-#~ msgstr "Лінія «до» не починається/закінчується у точці «через»."
-
-#~ msgid "The \"from\" way does not start or end at the \"via\" way."
-#~ msgstr "Лінія «з» не починається/закінчується на лінії «через»."
-
-#~ msgid "The \"to\" way does not start or end at the \"via\" way."
-#~ msgstr "Лінія «до» не починається/закінчується на лінії «через»."
-
-#~ msgid "Multipolygon inner way is outside."
-#~ msgstr "Внутрішня лінія мультиполігону ззовні."
-
-#~ msgid "Non-Way in multipolygon."
-#~ msgstr "У мультиполігоні не-лінія"
-
-#~ msgid "Painting problem"
-#~ msgstr "Проблеми малювання"
-
-#~ msgid "Check if map painting found data errors."
-#~ msgstr "Перевірити, чи містить намальована мапа помилки в даних."
-
-#~ msgid "Check for paint notes."
-#~ msgstr "Перевірити примітки до малюнка."
 
 #~ msgctxt "filter"
 #~ msgid "C"
 #~ msgstr "C"
+
+#~ msgid "Create house number and street name relation"
+#~ msgstr "Створити зв’язок номеру будинку з вулицею"
Index: applications/editors/josm/i18n/po/zh_TW.po
===================================================================
--- applications/editors/josm/i18n/po/zh_TW.po	(revision 22209)
+++ applications/editors/josm/i18n/po/zh_TW.po	(revision 22278)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-06 17:43+0200\n"
-"PO-Revision-Date: 2010-06-28 15:43+0000\n"
+"POT-Creation-Date: 2010-07-11 21:01+0200\n"
+"PO-Revision-Date: 2010-07-06 16:35+0000\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Traditional Chinese\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-07-06 15:06+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 18:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: zh_TW\n"
@@ -268,5 +268,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -653,9 +653,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1472,5 +1472,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -2717,6 +2717,6 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2747,7 +2747,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
-#, fuzzy
 msgid "Invalid search expression"
-msgstr "請輸入搜尋詞句"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -4273,5 +4272,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -4804,5 +4803,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 #: build/specialmessages.java:64
 msgid "Up"
@@ -4814,5 +4813,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Down"
 msgstr "下"
@@ -5398,5 +5397,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5499,9 +5498,9 @@
 msgstr "調解「{0}」的衝突"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Filter objects and hide/disable them."
 msgstr "過濾物件並隱藏/停用它們。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5514,53 +5513,52 @@
 msgstr "加入"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Add filter."
 msgstr "加入過濾條件。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 msgid "Edit filter."
 msgstr "編輯過濾條件。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Delete filter."
 msgstr "刪除過濾條件。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
 msgid "Move filter up."
 msgstr "將過濾條件上移。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Move filter down."
 msgstr "將過濾條件下移。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
 msgid "Enable filter"
 msgstr "啟用過濾條件"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
 msgid "Hide elements"
 msgstr "隱藏元素"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
 msgid "Inverse filter"
 msgstr "反轉過濾條件"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
 msgid "Filter mode"
 msgstr "過濾條件模式"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr "過濾隱藏：{0} 停用：{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr "載入檔案有錯誤"
+msgstr ""
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
 msgctxt "filter"
 msgid "E"
@@ -5568,5 +5566,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
 msgctxt "filter"
 msgid "H"
@@ -5574,5 +5572,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
 msgctxt "filter"
 msgid "Text"
@@ -5580,5 +5578,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
 msgctxt "filter"
 msgid "I"
@@ -5586,5 +5584,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "M"
@@ -5593,5 +5591,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
 msgctxt "filter"
 msgid "R"
@@ -5599,5 +5597,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
 msgctxt "filter"
 msgid "A"
@@ -5605,5 +5603,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "D"
@@ -5611,24 +5609,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>過濾條件已使用</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> 物件已隱藏"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> 物件已停用"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>關閉過濾條件對話盒以查看所有的物件。<p></html>"
@@ -10242,10 +10240,10 @@
 msgstr[0] "發現 {0} 已有 GPS 標籤。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "從磁碟刪除圖片檔"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
 #, java-format
 msgid ""
@@ -10255,5 +10253,5 @@
 "<html><h3>是否從磁碟刪除檔案 {0}？<p>這個照片檔案會永久消失！</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
 msgid "Image file could not be deleted."
 msgstr "無法刪除圖片檔案。"
@@ -12871,5 +12869,5 @@
 msgstr "選擇預先定義的授權"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -12880,5 +12878,5 @@
 msgstr "{0} 的標記"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -12888,5 +12886,5 @@
 msgstr "解析 gpx 檔案 {0} 時發生錯誤。檔案將只有部分可以使用"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
@@ -12896,5 +12894,5 @@
 
 #. input was not properly parsed, abort
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
@@ -13560,9 +13558,9 @@
 msgstr "正在分析 OSM 資料..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
 msgid "Preparing data set..."
 msgstr "正在準備資料組合..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14409,11 +14407,11 @@
 msgstr "找不到地區設定 {0} 的翻譯檔。回復為 {1}。"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr "警告：無法處理 zip 檔案「{0}」。例外為：{1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
 #, java-format
 msgid ""
@@ -14422,5 +14420,5 @@
 msgstr "警告：基於安全性理由無法存取目錄「{0}」。例外為：{1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
 #, java-format
 msgid ""
@@ -15170,7 +15168,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
-#, fuzzy
 msgid "on polygon"
-msgstr "多重多邊形"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
@@ -15189,15 +15186,14 @@
 msgstr "建築物"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418
 msgid "Next no"
-msgstr "下一幅"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr "街"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460
 msgid "Enter addresses"
 msgstr ""
@@ -15376,5 +15372,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
-msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 
@@ -26098,7 +26094,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "american_football"
-msgstr "澳洲足球"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26129,7 +26124,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "canadian_football"
-msgstr "澳洲足球"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26175,7 +26169,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "gaelic_football"
-msgstr "澳洲足球"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26221,7 +26214,6 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#, fuzzy
 msgid "rugby_union"
-msgstr "橄欖球"
+msgstr ""
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26711,35 +26703,29 @@
 
 #: build/trans_presets.java:2076
-#, fuzzy
 msgid "American Football"
-msgstr "澳洲足球"
+msgstr ""
 
 #. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-#, fuzzy
 msgid "Edit American Football"
-msgstr "編輯澳洲足球"
+msgstr ""
 
 #: build/trans_presets.java:2082
-#, fuzzy
 msgid "Canadian Football"
-msgstr "編輯美式足球"
+msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
 #: build/trans_presets.java:2083
-#, fuzzy
 msgid "Edit Canadian Football"
-msgstr "編輯澳洲足球"
+msgstr ""
 
 #: build/trans_presets.java:2088
-#, fuzzy
 msgid "Gaelic Football"
-msgstr "編輯美式足球"
+msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
 #: build/trans_presets.java:2089
-#, fuzzy
 msgid "Edit Gaelic Football"
-msgstr "編輯美式足球"
+msgstr ""
 
 #: build/trans_presets.java:2094
@@ -26749,18 +26735,15 @@
 #. item "Sport (Ball)/Rugby League"
 #: build/trans_presets.java:2095
-#, fuzzy
 msgid "Edit Rugby League"
-msgstr "編輯橄欖球"
+msgstr ""
 
 #: build/trans_presets.java:2100
-#, fuzzy
 msgid "Rugby Union"
-msgstr "橄欖球"
+msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2101
-#, fuzzy
 msgid "Edit Rugby Union"
-msgstr "編輯橄欖球"
+msgstr ""
 
 #: build/trans_presets.java:2106
@@ -33506,121 +33489,4 @@
 msgstr ""
 
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr "<html>與伺服器溝通時發生錯誤<br>詳細資料：{0}</html>"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "與伺服器溝通失敗"
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "是的，也取消它們的刪除"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "不，取消操作"
-
-#~ msgid ""
-#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
-#~ "server.<br><br>Do you want to undelete this node too?"
-#~ msgid_plural ""
-#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
-#~ "the server.<br><br>Do you want to undelete these nodes too?"
-#~ msgstr[0] ""
-#~ "有 {0} 個額外節點用於<br>在伺服器上刪除的路徑 {1} 。<br><br>您是否也想要取"
-#~ "消刪除這個節點？"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "取消刪除額外的節點？"
-
-#~ msgid ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgid_plural ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
-#~ msgstr[0] ""
-#~ "有 {0} 個額外原型用於<br>在伺服器上刪除的關係 {1} 。<br><br>您是否也想要取"
-#~ "消刪除它？"
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "是否取消刪除相依的原型？"
-
-#~ msgid "Visible State:"
-#~ msgstr "可視狀態："
-
-#~ msgid "visible (on the server)"
-#~ msgstr "可視的（在伺服器上）"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "不可視（在伺服器上）"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "保留本地端版本的複本"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "實際從本地端資料組合中刪除"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "保留我的可見性狀態"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "是，重設 id"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>要保留您本地端的版本，JOSM<br>必須將原型 {0} 的 id 重設為 0。<br>在"
-#~ "下次上傳時伺服器會重新<br>指派新的 id 給它。<br>您是否同意？</html>"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "重設 id 為 0"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "保留他們的可見性"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "是，清除它"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSM 即將移除您本地資料組合中 id {0}<br>的原型。<br>您是否同意？</"
-#~ "html>"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "從資料組合移除"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "在可視狀態間有未決定的衝突"
-
-#~ msgid ""
-#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
-#~ "{0} object<br>from the local dataset because it is deleted on the server."
-#~ msgid_plural ""
-#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
-#~ "purging {0} objects<br> from the local dataset because they are deleted "
-#~ "on the server."
-#~ msgstr[0] ""
-#~ "{0} 衝突已經以清除本地資料組合 {0} 物件的方式<strong>自動調解</strong> "
-#~ "<br>了。因為它已經從伺服器上刪除了。"
-
-#~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "還有 {0} 個衝突待調解。<br><br>請開啟衝突清單對話盒並手動調解它。"
-
-#~ msgid "football"
-#~ msgstr "美式足球"
-
-#~ msgid "Football"
-#~ msgstr "美式足球"
-
 #~ msgid "Open in Browser"
 #~ msgstr "在瀏覽器中打開"
@@ -33702,4 +33568,13 @@
 #~ msgid "Update Data"
 #~ msgstr "更新資料"
+
+#~ msgid "Yes, undelete them too"
+#~ msgstr "是的，也取消它們的刪除"
+
+#~ msgid "No, cancel operation"
+#~ msgstr "不，取消操作"
+
+#~ msgid "Undelete additional nodes?"
+#~ msgstr "取消刪除額外的節點？"
 
 #~ msgid "Update Selection"
@@ -34227,4 +34102,21 @@
 #~ msgid "Auto-tag source added:"
 #~ msgstr "自動標籤來源已加入："
+
+#~ msgid ""
+#~ "<html>An error occurred while communicating with the server<br>Details: "
+#~ "{0}</html>"
+#~ msgstr "<html>與伺服器溝通時發生錯誤<br>詳細資料：{0}</html>"
+
+#~ msgid "Keep a clone of the local version"
+#~ msgstr "保留本地端版本的複本"
+
+#~ msgid "Physically delete from local dataset"
+#~ msgstr "實際從本地端資料組合中刪除"
+
+#~ msgid "Keep my visible state"
+#~ msgstr "保留我的可見性狀態"
+
+#~ msgid "Keep their visible state"
+#~ msgstr "保留他們的可見性"
 
 #~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
@@ -34483,4 +34375,28 @@
 #~ msgstr "編輯較難的高山健行"
 
+#~ msgid "Communication with server failed"
+#~ msgstr "與伺服器溝通失敗"
+
+#~ msgid "Visible State:"
+#~ msgstr "可視狀態："
+
+#~ msgid "visible (on the server)"
+#~ msgstr "可視的（在伺服器上）"
+
+#~ msgid "not visible (on the server)"
+#~ msgstr "不可視（在伺服器上）"
+
+#~ msgid "Yes, reset the id"
+#~ msgstr "是，重設 id"
+
+#~ msgid "Reset id to 0"
+#~ msgstr "重設 id 為 0"
+
+#~ msgid "Yes, purge it"
+#~ msgstr "是，清除它"
+
+#~ msgid "Remove from dataset"
+#~ msgstr "從資料組合移除"
+
 #~ msgid "Download missing plugins"
 #~ msgstr "下載缺少的外掛程式"
@@ -34516,6 +34432,12 @@
 #~ msgstr "健行地圖"
 
+#~ msgid "Football"
+#~ msgstr "美式足球"
+
 #~ msgid "bicyclemap"
 #~ msgstr "自行車地圖"
+
+#~ msgid "football"
+#~ msgstr "美式足球"
 
 #~ msgid "error requesting update: not zoom-level 12"
@@ -34648,4 +34570,7 @@
 #~ "列\n"
 #~ "      Java 選項來增加分配記憶體的最大容量"
+
+#~ msgid "Undecide conflict between visible state"
+#~ msgstr "在可視狀態間有未決定的衝突"
 
 #~ msgid "Parameter ''{0}'' must not be empty."
@@ -34679,4 +34604,14 @@
 #~ msgstr "已刪除或移動的原型"
 
+#~ msgid "Undelete dependent primitives?"
+#~ msgstr "是否取消刪除相依的原型？"
+
+#~ msgid ""
+#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
+#~ "the dataset.<br>Do you agree?</html>"
+#~ msgstr ""
+#~ "<html>JOSM 即將移除您本地資料組合中 id {0}<br>的原型。<br>您是否同意？</"
+#~ "html>"
+
 #~ msgid "Apply also for children"
 #~ msgstr "也套用到子項目"
@@ -34793,4 +34728,44 @@
 
 #~ msgid ""
+#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
+#~ "deleted on the server.<br><br>Do you want to undelete this too?"
+#~ msgid_plural ""
+#~ "There are {0} additional primitives referred to by relation {1}<br>which "
+#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
+#~ msgstr[0] ""
+#~ "有 {0} 個額外原型用於<br>在伺服器上刪除的關係 {1} 。<br><br>您是否也想要取"
+#~ "消刪除它？"
+
+#~ msgid ""
+#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
+#~ "server.<br><br>Do you want to undelete this node too?"
+#~ msgid_plural ""
+#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
+#~ "the server.<br><br>Do you want to undelete these nodes too?"
+#~ msgstr[0] ""
+#~ "有 {0} 個額外節點用於<br>在伺服器上刪除的路徑 {1} 。<br><br>您是否也想要取"
+#~ "消刪除這個節點？"
+
+#~ msgid ""
+#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
+#~ "{0} object<br>from the local dataset because it is deleted on the server."
+#~ msgid_plural ""
+#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
+#~ "purging {0} objects<br> from the local dataset because they are deleted "
+#~ "on the server."
+#~ msgstr[0] ""
+#~ "{0} 衝突已經以清除本地資料組合 {0} 物件的方式<strong>自動調解</strong> "
+#~ "<br>了。因為它已經從伺服器上刪除了。"
+
+#~ msgid ""
+#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
+#~ "Dialog and manually resolve it."
+#~ msgid_plural ""
+#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
+#~ "Dialog and manually resolve them."
+#~ msgstr[0] ""
+#~ "還有 {0} 個衝突待調解。<br><br>請開啟衝突清單對話盒並手動調解它。"
+
+#~ msgid ""
 #~ "Target object with id {0} and version {1} is visible although source "
 #~ "object with lower version {2} is not visible. Cannot deal with this "
@@ -34802,2 +34777,10 @@
 #~ msgid "Point on angle of building to start drawing"
 #~ msgstr "點到建築的一角以開始繪製"
+
+#~ msgid ""
+#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
+#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
+#~ "new id.<br>Do you agree?</html>"
+#~ msgstr ""
+#~ "<html>要保留您本地端的版本，JOSM<br>必須將原型 {0} 的 id 重設為 0。<br>在"
+#~ "下次上傳時伺服器會重新<br>指派新的 id 給它。<br>您是否同意？</html>"
