Index: applications/editors/josm/i18n/po/bg.po
===================================================================
--- applications/editors/josm/i18n/po/bg.po	(revision 22063)
+++ applications/editors/josm/i18n/po/bg.po	(revision 22209)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-28 17:00+0200\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"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-06-28 14:56+0000\n"
+"X-Launchpad-Export-Date: 2010-07-06 15:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -27,5 +27,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 #: build/specialmessages.java:42
@@ -69,5 +69,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -77,5 +77,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -243,5 +243,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -249,6 +249,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -336,8 +336,7 @@
 msgstr "Няма слоеве за целта"
 
-#. modal
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35
 msgid "Add Node..."
 msgstr "Добавяне на точка..."
@@ -659,5 +658,5 @@
 #: ../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:103
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
@@ -1042,5 +1041,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1049,5 +1048,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1185,4 +1184,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34
 msgid "Move Node..."
 msgstr ""
@@ -1459,6 +1459,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1681,6 +1681,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
@@ -2313,5 +2311,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2557,10 +2555,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid "Search..."
 msgstr "Търсене..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search for objects."
 msgstr "Търсене на обекти."
@@ -2568,65 +2566,65 @@
 #. -- prepare the combo box with the search expressions
 #.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
 msgid "Please enter a filter string."
 msgstr "Моля въведете филтър."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
 msgid "Please enter a search string."
 msgstr "Моля, въведете низ за търсене."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142
 msgid "Enter the search expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "replace selection"
 msgstr "замени селекцията"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "add to selection"
 msgstr "добави към селекцията"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "remove from selection"
 msgstr "изтрий от селекцията"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
 msgid "find in selection"
 msgstr "търсене в селекцията"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "case sensitive"
 msgstr "чувствителност към регистъра"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161
 msgid "all objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162
 msgid "Also include incomplete and deleted objects in search."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
 msgid "regular expression"
 msgstr "регулярен израз"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 msgstr "<b>Baker Street</b> - ''Baker'' и ''Street'' в кой да е ключ или име."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Bak</b> - ''Bak'' където и да е в името."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=route</b> - ключ ''type'' със стойност именно ''route''."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2636,38 +2634,38 @@
 "<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Bak</b> - няма ''Bak'' в името."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - ключ=foot, независимо от стойността."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<u>Special targets:</u>"
 msgstr "<u>Специални цели:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr "<b>тип:</b> - тип на обекта (<b>възел</b>, <b>път</b>, <b>връзка</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - всички обекти, променени от зададения потребител"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - обект с дадено ID (0 за нови обекти)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2675,5 +2673,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2681,5 +2679,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid ""
 "<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
@@ -2687,5 +2685,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2693,9 +2691,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>role:</b>... - object with given role in a relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2703,21 +2701,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - всички променени обекти"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - всички избрани обекти"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - всички непълни обекти"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - всички немаркирани обекти"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2725,5 +2723,5 @@
 "<b>child <i>израз</i></b> - всички обекти наследници, отговарящи на израза"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2731,13 +2729,13 @@
 "<b>parent <i>израз</i></b> - всички родители на обектите отговарящи на израза"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Използвайте <b>|</b> или <b>OR</b> за да обедините в логическо \"ИЛИ\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2745,12 +2743,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Използвайте <b>(</b> и <b>)</b> за да групирате изрази"
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../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:56
 #: ../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
@@ -2759,38 +2757,51 @@
 msgstr "Филтър"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Търсене"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
 msgid "Submit filter"
 msgstr "Приемане на филтър"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
 msgid "Start Search"
 msgstr "Стартиране търсене"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231
+#, java-format
+msgid ""
+"Search expression is not valid: \n"
+"\n"
+" {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
+#, fuzzy
+msgid "Invalid search expression"
+msgstr "регулярен израз"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Не е намерено съвпадение за ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Нищо не е добавено към селекцията в резултат на търсенето за ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Нищо не е премахнато от селекцията в резултат на търсенето за ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 #, java-format
 msgid "Found {0} matches"
@@ -2798,5 +2809,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457
 msgctxt "search"
 msgid "CS"
@@ -2804,5 +2815,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458
 msgctxt "search"
 msgid "CI"
@@ -2810,5 +2821,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460
 msgctxt "search"
 msgid "RX"
@@ -2816,5 +2827,5 @@
 
 #. all elements
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462
 msgctxt "search"
 msgid "A"
@@ -2943,8 +2954,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
@@ -3085,5 +3096,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84
 #, java-format
@@ -3213,11 +3224,11 @@
 msgstr[1] "Преместване {0} възела"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
 #, java-format
 msgid "Purged object ''{0}''"
 msgstr "Обектът ''{0}'' е изтрит"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
 msgid "Purged {0} object"
@@ -3226,5 +3237,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
 msgid ""
@@ -3235,5 +3246,5 @@
 "стойност - {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173
 #, java-format
 msgid "Removing reference from relation {0}"
@@ -3271,5 +3282,5 @@
 msgstr "Разрешаване {0} конфликтиращи маркери в релация {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65
 #, java-format
 msgid "Undelete {0} primitive"
@@ -3590,6 +3601,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3599,10 +3610,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
 #, java-format
 msgid "Missing merge target for object with id {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3610,5 +3621,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3617,5 +3628,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3623,78 +3634,4 @@
 #, java-format
 msgid "Missing merge target of type {0} with id {1}"
-msgstr ""
-
-#. translators notes must be in front
-#. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358
-msgctxt "filter"
-msgid "E"
-msgstr "П"
-
-#. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359
-msgctxt "filter"
-msgid "H"
-msgstr "С"
-
-#. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360
-msgctxt "filter"
-msgid "Text"
-msgstr "Текст"
-
-#. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361
-msgctxt "filter"
-msgid "I"
-msgstr "И"
-
-#. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362
-msgctxt "filter"
-msgid "M"
-msgstr "Р"
-
-#. translators notes must be in front
-#. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424
-msgctxt "filter"
-msgid "R"
-msgstr "З"
-
-#. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425
-msgctxt "filter"
-msgid "A"
-msgstr "Д"
-
-#. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426
-msgctxt "filter"
-msgid "D"
-msgstr "И"
-
-#. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427
-msgctxt "filter"
-msgid "F"
-msgstr "С"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457
-msgid "<h2>Filter active</h2>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463
-#, java-format
-msgid "<p><b>{0}</b> objects hidden"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471
-#, java-format
-msgid "<b>{0}</b> objects disabled"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474
-msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
@@ -3826,5 +3763,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
 msgid "background"
 msgstr "фон"
@@ -3996,5 +3933,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3260
 msgid "railway"
 msgstr "железопътна линия"
@@ -4015,7 +3952,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
 #, java-format
 msgid "{0} node"
@@ -4082,7 +4019,7 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4325
+#: build/trans_style.java:4349
 msgid "building"
 msgstr "сграда"
@@ -4171,5 +4108,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
@@ -4392,5 +4329,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -4690,12 +4627,12 @@
 msgstr "роля {0} не участва в двойката за сравнение {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178
 msgid "Properties"
 msgstr "Настройки"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
@@ -4706,6 +4643,6 @@
 msgstr "Маркери"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -4713,6 +4650,6 @@
 msgstr "Възли"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
@@ -4720,9 +4657,9 @@
 msgstr "Членове"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173
 msgid "No pending tag conflicts to be resolved"
 msgstr "Няма чакащи tag конфликти за разрешаване"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 #, java-format
 msgid "Tags({0} conflict)"
@@ -4731,5 +4668,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 #, java-format
 msgid "{0} pending tag conflict to be resolved"
@@ -4738,26 +4675,26 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Nodes(resolved)"
 msgstr "Възли(решени)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Nodes(with conflicts)"
 msgstr "Възли(с конфликт)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195
 msgid "Members(resolved)"
 msgstr "Членове (разрешени)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -4765,25 +4702,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199
 msgid "Members(with conflicts)"
 msgstr "Членове (с конфликти)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209
 msgid "No pending property conflicts"
 msgstr "Няма чакащи конфликти на характеристиките"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212
 msgid "Properties(with conflicts)"
 msgstr "Характеристики (с конфликти)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213
 msgid "Pending property conflicts to be resolved"
 msgstr "Чакащи за разрешаване конфликти на характеристики"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284
 msgid "Conflict Resolution"
 msgstr "Разрешение на конфликт"
@@ -4829,5 +4766,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81
 msgid "My version"
 msgstr "Моя версия"
@@ -4838,5 +4775,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140
 msgid "Merged version"
@@ -4852,5 +4789,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93
 msgid "Their version"
 msgstr "Тяхна версия"
@@ -4919,5 +4856,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
 #: build/specialmessages.java:64
 msgid "Up"
@@ -4929,5 +4866,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
 msgid "Down"
 msgstr "Надолу"
@@ -5027,60 +4964,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464
-#, java-format
-msgid ""
-"<html>An error occurred while communicating with the server<br>Details: {0}</"
-"html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
-msgid "Communication with server failed"
-msgstr "Връзката със сървъра пропадна"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544
-msgid "Yes, undelete them too"
-msgstr "Да, възстанови от изтриване също"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545
-msgid "No, cancel operation"
-msgstr "Не, отказване на операцията"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515
-#, java-format
-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] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525
-msgid "Undelete additional nodes?"
-msgstr "Възстановяване на изтрити допълнителни възли?"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549
-#, java-format
-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] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559
-msgid "Undelete dependent primitives?"
-msgstr "Възстановяване след изтриване на свързани примитиви?"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr "Характеристики в моята база дании (локалната база данни)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -5088,125 +4974,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr "Характеристики в тяхната база дании (базата данни на сървъра)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110
 msgid "Coordinates:"
 msgstr "Координати:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184
 msgid "Deleted State:"
 msgstr "Изтрито състояние:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265
-msgid "Visible State:"
-msgstr "Видимо състояние:"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260
 msgid "Referenced by:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
 msgstr "(никой)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77
 msgid "deleted"
 msgstr "изтрито"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311
 msgid "not deleted"
 msgstr "не е изтрито"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400
-msgid "visible (on the server)"
-msgstr "видимо (на сървъра)"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402
-msgid "not visible (on the server)"
-msgstr "не е видимо (на сървъра)"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409
-msgid "Keep a clone of the local version"
-msgstr "Запазване копие на местната версия"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Physically delete from local dataset"
-msgstr "Физическо изтриване от местната база данни"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529
 msgid "Keep my coordiates"
 msgstr "Запазване на моите координати"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415
 msgid "Keep their coordiates"
 msgstr "Запазване на техните координати"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430
 msgid "Undecide conflict between different coordinates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445
 msgid "Keep my deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460
 msgid "Keep their deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475
 msgid "Undecide conflict between deleted state"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619
-msgid "Keep my visible state"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634
-msgid "Yes, reset the id"
-msgstr "Да, нулирай ID"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639
-#, java-format
-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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
-msgid "Reset id to 0"
-msgstr "Нулирай ID"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660
-msgid "Keep their visible state"
-msgstr "Запазване на тяхното видимо състояние"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675
-msgid "Yes, purge it"
-msgstr "Да, изчисти го!"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680
-#, java-format
-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>"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685
-msgid "Remove from dataset"
-msgstr "Премахни от базата данни"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699
-msgid "Undecide conflict between visible state"
 msgstr ""
 
@@ -5354,5 +5173,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2329
 msgid "all"
 msgstr "всички"
@@ -5432,7 +5251,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
 #, java-format
 msgid "{0} way"
@@ -5442,6 +5261,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} relation"
@@ -5627,5 +5446,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:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5681,25 +5500,25 @@
 msgstr "Изберете на картата всички обекти, избрани в списъка по-горе."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191
 msgid "Cancel conflict resolution and close the dialog"
 msgstr "Прекъсни разрешаване на кофликти и затвори диалоговия прозорец"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224
 msgid "Apply resolved conflicts and close the dialog"
 msgstr "Прилагане на разрешените конфликти и затваряне на диалоговия прозорец"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225
 msgid "Apply Resolution"
 msgstr "Прилагане на резолюцията"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237
 msgid "Close anyway"
 msgstr "Затваряне въпреки всичко"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238
 msgid "Continue resolving"
 msgstr "Продължаване разрешаването на кофликти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240
 #, java-format
 msgid ""
@@ -5711,22 +5530,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248
 msgid "Conflict not resolved completely"
 msgstr "Конфликтът не е разрешен напълно"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281
 msgid "Resolve conflicts"
 msgstr "Разрешаване на конфликти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283
 #, java-format
 msgid "Resolve conflicts for ''{0}''"
 msgstr "Разрешаване на конфликти за ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5739,43 +5558,122 @@
 msgstr "Добави"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
 msgid "Edit filter."
 msgstr "Редактиране на филтъра"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
 msgid "Delete filter."
 msgstr "изтриване на филтъра"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
 msgid "Move filter up."
 msgstr "Преместване филтъра нагоре"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
 msgid "Move filter down."
 msgstr "Преместване филтъра надолу"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
 msgid "Enable filter"
 msgstr "Разрешаване на филтъра"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
 msgid "Hide elements"
 msgstr "Скриване на елементи"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
 msgid "Inverse filter"
 msgstr "Обръщане на филтъра"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Filter mode"
 msgstr "Режим на филтъра"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
+#, fuzzy
+msgid "Error in filter"
+msgstr "Грешка при зареждане на файла"
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+msgctxt "filter"
+msgid "E"
+msgstr "П"
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+msgctxt "filter"
+msgid "H"
+msgstr "С"
+
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+msgctxt "filter"
+msgid "Text"
+msgstr "Текст"
+
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+msgctxt "filter"
+msgid "I"
+msgstr "И"
+
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+msgctxt "filter"
+msgid "M"
+msgstr "Р"
+
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+msgctxt "filter"
+msgid "R"
+msgstr "З"
+
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+msgctxt "filter"
+msgid "A"
+msgstr "Д"
+
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+msgctxt "filter"
+msgid "D"
+msgstr "И"
+
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+msgctxt "filter"
+msgid "F"
+msgstr "С"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+msgid "<h2>Filter active</h2>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#, java-format
+msgid "<p><b>{0}</b> objects hidden"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#, java-format
+msgid "<b>{0}</b> objects disabled"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
@@ -5818,37 +5716,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Enter the coordinates for the new node."
 msgstr "Въведете координати за новата точка."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Use decimal degrees."
 msgstr "Използване на десетични градуси."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Отрицателни стойности обозначават западното/южното полукълбо"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
 msgid "Please enter a latitude in the range -90..90"
 msgstr "Въведете геогр. ширина в диапазона [-90 .. 90]"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "Въведете валидна геогр. дължина в диапазона [-180 .. 180]"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
 msgid "Please enter a longitude in the range -180..180"
 msgstr "Въведете геогр. дължина в диапазона [-180 .. 180]"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
 msgid "Close the dialog and create a new node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
 msgid "Close the dialog, do not create a new node"
 msgstr ""
@@ -5908,5 +5806,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3206
 msgid "Relations"
 msgstr "Връзки"
@@ -5954,10 +5852,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846
 msgid "Download incomplete members of selected relations"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848
 msgid "Download incomplete members"
 msgstr ""
@@ -6021,14 +5919,14 @@
 msgstr "Избр.: Рел.:{0} / Пътища:{1} / Възли:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811
 #, java-format
 msgid "Selection: {0}"
 msgstr "Избрано: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883
 msgid "Get detailed information on the internal state of the objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884
 msgid "Inspect"
 msgstr ""
@@ -6731,8 +6629,16 @@
 #. item "Sport (Ball)/Soccer" label "Edit Soccer"
 #. <key key="sport" value="soccer" />
-#. item "Sport (Ball)/Football" label "Edit Football"
-#. <key key="sport" value="football" />
 #. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
 #. <key key="sport" value="australian_football" />
+#. item "Sport (Ball)/American Football" label "Edit American Football"
+#. <key key="sport" value="american_football" />
+#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football"
+#. <key key="sport" value="canadian_football" />
+#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football"
+#. <key key="sport" value="gaelic_football" />
+#. item "Sport (Ball)/Rugby League" label "Edit Rugby League"
+#. <key key="sport" value="rugby_league" />
+#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union"
+#. <key key="sport" value="rugby_union" />
 #. item "Sport (Ball)/Baseball" label "Edit Baseball"
 #. <key key="sport" value="baseball" />
@@ -6757,6 +6663,4 @@
 #. item "Sport (Ball)/Racquet" label "Edit Racquet"
 #. <key key="sport" value="racquet" />
-#. item "Sport (Ball)/Rugby" label "Edit Rugby"
-#. <key key="sport" value="rugby" />
 #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis"
 #. <key key="sport" value="table_tennis" />
@@ -7139,69 +7043,70 @@
 #: build/trans_presets.java:2139 build/trans_presets.java:2145
 #: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2177
-#: build/trans_presets.java:2183 build/trans_presets.java:2189
-#: build/trans_presets.java:2196 build/trans_presets.java:2203
-#: build/trans_presets.java:2211 build/trans_presets.java:2218
-#: build/trans_presets.java:2224 build/trans_presets.java:2231
-#: build/trans_presets.java:2237 build/trans_presets.java:2243
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2264 build/trans_presets.java:2271
-#: build/trans_presets.java:2278 build/trans_presets.java:2286
-#: build/trans_presets.java:2318 build/trans_presets.java:2323
-#: build/trans_presets.java:2333 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2367 build/trans_presets.java:2373
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2402
-#: build/trans_presets.java:2409 build/trans_presets.java:2510
-#: build/trans_presets.java:2517 build/trans_presets.java:2538
-#: build/trans_presets.java:2546 build/trans_presets.java:2551
-#: build/trans_presets.java:2557 build/trans_presets.java:2564
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2597 build/trans_presets.java:2604
-#: build/trans_presets.java:2610 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
+#: build/trans_presets.java:2163 build/trans_presets.java:2169
+#: build/trans_presets.java:2175 build/trans_presets.java:2181
+#: build/trans_presets.java:2195 build/trans_presets.java:2201
+#: build/trans_presets.java:2207 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2242
+#: build/trans_presets.java:2249 build/trans_presets.java:2255
+#: build/trans_presets.java:2261 build/trans_presets.java:2267
+#: build/trans_presets.java:2275 build/trans_presets.java:2282
+#: build/trans_presets.java:2289 build/trans_presets.java:2296
+#: build/trans_presets.java:2304 build/trans_presets.java:2336
+#: build/trans_presets.java:2341 build/trans_presets.java:2351
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2420 build/trans_presets.java:2427
+#: build/trans_presets.java:2528 build/trans_presets.java:2535
+#: build/trans_presets.java:2556 build/trans_presets.java:2564
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
 #: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2654
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2680
+#: build/trans_presets.java:2647 build/trans_presets.java:2653
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2672 build/trans_presets.java:2679
 #: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2705
-#: build/trans_presets.java:2712 build/trans_presets.java:2719
-#: build/trans_presets.java:2725 build/trans_presets.java:2731
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
-#: build/trans_presets.java:2780 build/trans_presets.java:2786
-#: build/trans_presets.java:2794 build/trans_presets.java:2801
-#: build/trans_presets.java:2821 build/trans_presets.java:2832
-#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2698 build/trans_presets.java:2704
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2723 build/trans_presets.java:2730
+#: build/trans_presets.java:2737 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2774
+#: build/trans_presets.java:2783 build/trans_presets.java:2798
+#: build/trans_presets.java:2804 build/trans_presets.java:2812
+#: build/trans_presets.java:2819 build/trans_presets.java:2839
 #: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2863 build/trans_presets.java:2870
-#: build/trans_presets.java:2877 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2897
-#: build/trans_presets.java:2904 build/trans_presets.java:2911
-#: build/trans_presets.java:2918 build/trans_presets.java:2924
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2953
-#: build/trans_presets.java:2959 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2980
-#: build/trans_presets.java:2990 build/trans_presets.java:2999
-#: build/trans_presets.java:3005 build/trans_presets.java:3011
-#: build/trans_presets.java:3016 build/trans_presets.java:3022
-#: build/trans_presets.java:3028 build/trans_presets.java:3037
-#: build/trans_presets.java:3043 build/trans_presets.java:3049
+#: build/trans_presets.java:2862 build/trans_presets.java:2868
+#: build/trans_presets.java:2874 build/trans_presets.java:2881
+#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:2901 build/trans_presets.java:2907
+#: build/trans_presets.java:2915 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2965
+#: build/trans_presets.java:2971 build/trans_presets.java:2977
+#: build/trans_presets.java:2983 build/trans_presets.java:2989
+#: build/trans_presets.java:2998 build/trans_presets.java:3008
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3029 build/trans_presets.java:3034
+#: build/trans_presets.java:3040 build/trans_presets.java:3046
 #: build/trans_presets.java:3055 build/trans_presets.java:3061
 #: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3080 build/trans_presets.java:3086
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
 #: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3105 build/trans_presets.java:3111
-#: build/trans_presets.java:3120 build/trans_presets.java:3128
-#: build/trans_presets.java:3134 build/trans_presets.java:3140
-#: build/trans_presets.java:3147 build/trans_presets.java:3153
-#: build/trans_presets.java:3160 build/trans_presets.java:3166
-#: build/trans_presets.java:3172 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3196
-#: build/trans_presets.java:3210 build/trans_presets.java:3229
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3104 build/trans_presets.java:3109
+#: build/trans_presets.java:3116 build/trans_presets.java:3123
+#: build/trans_presets.java:3129 build/trans_presets.java:3138
+#: build/trans_presets.java:3146 build/trans_presets.java:3152
+#: build/trans_presets.java:3158 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3178
+#: build/trans_presets.java:3184 build/trans_presets.java:3190
+#: build/trans_presets.java:3196 build/trans_presets.java:3202
+#: build/trans_presets.java:3214 build/trans_presets.java:3228
+#: build/trans_presets.java:3247 build/trans_presets.java:3261
 msgid "Name"
 msgstr "Име"
@@ -7781,5 +7686,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
 #, java-format
@@ -8420,8 +8325,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2358 build/trans_presets.java:2392
-#: build/trans_presets.java:2401 build/trans_presets.java:2427
-#: build/trans_presets.java:2981 build/trans_presets.java:2991
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2376 build/trans_presets.java:2410
+#: build/trans_presets.java:2419 build/trans_presets.java:2445
+#: build/trans_presets.java:2999 build/trans_presets.java:3009
+#: build/trans_presets.java:3018
 msgid "Type"
 msgstr "Тип"
@@ -8450,6 +8355,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2501
-#: build/trans_presets.java:2502 build/trans_presets.java:2503
+#: build/trans_presets.java:1375 build/trans_presets.java:2519
+#: build/trans_presets.java:2520 build/trans_presets.java:2521
 msgid "unknown"
 msgstr "неизвестно"
@@ -8778,5 +8683,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
 msgid "Conflicts detected"
 msgstr "Забелязани са конфликти"
@@ -9302,4 +9207,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
 msgid "Settings"
@@ -9810,5 +9716,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3264
 msgid "Description"
 msgstr "Описание"
@@ -9859,5 +9765,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
@@ -9936,23 +9842,23 @@
 "смислено да се предположи тяхното време, бяха пропуснати."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Слой Данни {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "outside downloaded area"
 msgstr "извън областта за сваляне"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
 #, java-format
 msgid "version {0}"
 msgstr "версия {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9961,34 +9867,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
-#, java-format
-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] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
-#, java-format
-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] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
 #, java-format
 msgid "{0} deleted"
@@ -9997,32 +9880,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} се състои от:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
 msgid "unset"
 msgstr "неустановена"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
 #, java-format
 msgid "API version: {0}"
 msgstr "API версия: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
 msgid "Convert to GPX layer"
 msgstr "Преобразувай в слой GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
 msgid "Following problems found:"
 msgstr ""
@@ -12988,4 +12871,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
 #, java-format
@@ -14447,5 +14331,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14718,5 +14602,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2324
 msgid "Address Interpolation"
 msgstr "Интерполация на адреси"
@@ -15150,36 +15034,37 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
 #, fuzzy
+msgid "on polygon"
+msgstr "Мултиполигон"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
 msgid "Add address"
-msgstr "адрес"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63
-#, fuzzy
-msgid "Create house number and street name relation"
-msgstr "Създаване на нова релация"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96
+msgid "Helping tool for tag address"
+msgstr ""
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2187
 msgid "Buildings"
 msgstr "Сгради"
 
-#. item "Waypoints/Motorway Junction" text "Name"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72
-#: build/trans_presets.java:637
-msgid "Number"
-msgstr "Номер"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
+#, fuzzy
+msgid "Next no"
+msgstr "Следващ"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
 msgid "Enter addresses"
-msgstr "Адреси"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
@@ -15333,10 +15218,14 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43
 msgid "Select first WMS layer in list."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
+msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
 msgstr ""
 
@@ -15391,7 +15280,7 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2358 build/trans_style.java:1018
+#: build/trans_presets.java:2376 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3525
@@ -15400,13 +15289,13 @@
 msgstr "вода"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 msgid "symbol"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 msgid "parcel"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid "parcel number"
 msgstr ""
@@ -15454,32 +15343,32 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
-#: build/trans_style.java:4353 build/trans_style.java:4360
-#: build/trans_style.java:4367 build/trans_style.java:4374
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: build/trans_style.java:4377 build/trans_style.java:4384
+#: build/trans_style.java:4391 build/trans_style.java:4398
 msgid "address"
 msgstr "адрес"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "locality"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
 msgid "section"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
 msgid "commune"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "Enable automatic caching."
 msgstr "Включване автоматично кеширане."
 
 #. disabled by default
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85
 msgid "Max. cache size (in MB)"
 msgstr "Макс. размер на кеша (в MB)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -15497,9 +15386,9 @@
 "данни създадени с това разширение."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
 msgid "French cadastre WMS"
 msgstr "Френски кадастров WMS"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
@@ -15507,10 +15396,10 @@
 "източници е включено</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
 msgid "Source"
 msgstr "Източник"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -15519,5 +15408,5 @@
 "Замени оригиналния бял фон с фоновия цвят определен в настройките на JOSM."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -15527,132 +15416,136 @@
 "текстове на тъмни фонове."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129
 msgid "Allows multiple layers stacking"
 msgstr "Позволяване на подреждане в няколко слоя"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 "Задаване прозрачност на WMS слоевете. Надясно - плътно, наляво - прозрачно."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr "Рисувай правоъгълник около зареденните от WMS сървър данни."
 
 #. option to select the single grabbed image resolution
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
 msgid "Image resolution:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159
 msgid "High resolution (1000x800)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161
 msgid "Medium resolution (800x600)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163
 msgid "Low resolution (600x400)"
 msgstr ""
 
 #. option to select image zooming interpolation method
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Image filter interpolation:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181
 msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182
 msgid "Bilinear (fast)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183
 msgid "Bicubic (slow)"
 msgstr ""
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197
 msgid "Vector images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209
 msgid "Grab one image full screen"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr "Взимане по-малки изображения (по-високо качество, но повече памет)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221
 msgid "Fixed size square (default is 100m)"
 msgstr "Фиксирана площ (по подразбиране 100m2)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr "Фиксирана размер (от 25 до 1000 метра)"
 
 #. WMS layers selection
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246
 msgid "Layers:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249
 msgid "See, rivers, swimming pools."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252
 msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255
 msgid "Symbols like cristian cross."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258
 msgid "Parcels."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261
 msgid "Parcels numbers, street names."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264
 msgid "Address, houses numbers."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267
 msgid "Locality, hamlet, place."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270
 msgid "Cadastral sections and subsections."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273
 msgid "Municipality administrative borders."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281
 msgid "Raster images grab multiplier:"
 msgstr ""
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 "Най-старите файлове автоматично се изтриват когато този размер се премине"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334
 msgid ""
 "Automatically selects the first WMS layer if multiple layers exist when "
 "grabbing."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
@@ -15959,5 +15852,5 @@
 msgstr "Комуна bbox: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
 #, java-format
 msgid ""
@@ -15968,14 +15861,14 @@
 "Моля, създайте нов кеш."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
 msgid "Cache Format Error"
 msgstr "Грешка на кеш формата"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
 msgid "Cache Lambert Zone Error"
 msgstr "Грешка в кеширането на Ламбертовата зона"
@@ -17263,4 +17156,23 @@
 msgstr ""
 
+#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75
+#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110
+msgid "Create Stops from GTFS ..."
+msgstr ""
+
+#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76
+msgid "Create Stops from a GTFS file"
+msgstr ""
+
+#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204
+#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230
+#, java-format
+msgid "IOException \"{0}\" occurred"
+msgstr ""
+
+#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85
+msgid "GTFS-Stops"
+msgstr ""
+
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
@@ -17301,9 +17213,4 @@
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:75
 msgid "Create Stops from a GPX file"
-msgstr ""
-
-#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230
-#, java-format
-msgid "IOException \"{0}\" occurred"
 msgstr ""
 
@@ -18819,5 +18726,5 @@
 #. * Other messages
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110
 msgid "Other"
 msgstr "Друго"
@@ -19005,5 +18912,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3207
 msgid "Multipolygon"
 msgstr "Мултиполигон"
@@ -19534,5 +19441,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4332
+#: build/trans_style.java:4356
 msgid "area"
 msgstr "област"
@@ -19576,34 +19483,37 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68
-#, fuzzy
 msgid "No tags"
-msgstr "Липсват данни"
-
-#. translation note: don't translate quoted words
+msgstr ""
+
 #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future.
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109
+msgid "Unconnected nodes without physical tags"
+msgstr ""
+
+#. translation note: don't translate quoted words
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104
-msgid "Unconnected nodes without physical tags"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76
 msgid "Has tag containing ''fixme'' or ''FIXME''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85
+#. 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 ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88
+#. 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 ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91
+#. translation note: don't translate quoted words
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95
 msgid "Has key ''watch''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94
+#. translation note: don't translate quoted words
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99
 msgid "Has key ''source''"
 msgstr ""
@@ -19627,7 +19537,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
-#, fuzzy
 msgid "Untagged ways (commented)"
-msgstr "Немаркирани пътища"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
@@ -20550,7 +20459,6 @@
 #. Strings in JFileChooser
 #: build/specialmessages.java:52
-#, fuzzy
 msgid "Open selected file"
-msgstr "Отваряне на файл."
+msgstr ""
 
 #. Strings in JFileChooser
@@ -20855,7 +20763,14 @@
 msgstr ""
 
-#. File ../plugins/roadsigns/build.xml had no data
+#. Plugin RoadSigns
+#: build/trans_plugins.java:68
+msgid ""
+"Plugin for tagging of objects based on a selection of road signs. The dialog "
+"can be opened by clicking a small icon in the upper right corner of the "
+"properties window. Available country presets: Germany."
+msgstr ""
+
 #. Plugin routes
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:70
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -20864,10 +20779,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:72
 msgid "Provides routing capabilities."
 msgstr "Предоставя маршрутизиращи възможности."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:74
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -20876,5 +20791,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:76
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -20885,15 +20800,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:77
+#: build/trans_plugins.java:78
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Позволява добавянето на маркери/възли на текущата gps позиция."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:80
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Предоставя диалог за редактиране на маркери в табличен вид."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:82
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -20907,10 +20822,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:84
 msgid "Make terraced houses out of single blocks."
 msgstr "Създава терасовидни къщи от един блок."
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:86
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20919,5 +20834,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:88
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20926,5 +20841,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:90
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20933,10 +20848,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:92
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:94
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20948,5 +20863,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:96
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20956,5 +20871,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:98
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20963,15 +20878,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:99
+#: build/trans_plugins.java:100
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:101
+#: build/trans_plugins.java:102
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:103
+#: build/trans_plugins.java:104
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20980,5 +20895,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:105
+#: build/trans_plugins.java:106
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21111,5 +21026,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2411 build/trans_presets.java:3244
+#: build/trans_presets.java:2429 build/trans_presets.java:3262
 msgid "Reference"
 msgstr "Означение"
@@ -21648,5 +21563,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2493
+#: build/trans_presets.java:1254 build/trans_presets.java:2511
 msgid "metal"
 msgstr "метал"
@@ -21659,5 +21574,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2493
+#: build/trans_presets.java:1254 build/trans_presets.java:2511
 msgid "wood"
 msgstr "гора"
@@ -21962,8 +21877,8 @@
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
 #: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2450
-#: build/trans_presets.java:2451 build/trans_presets.java:2492
-#: build/trans_presets.java:2501 build/trans_presets.java:2502
-#: build/trans_presets.java:2503 build/trans_presets.java:2793
+#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:2469 build/trans_presets.java:2510
+#: build/trans_presets.java:2519 build/trans_presets.java:2520
+#: build/trans_presets.java:2521 build/trans_presets.java:2811
 msgid "yes"
 msgstr "да"
@@ -22074,8 +21989,8 @@
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
 #: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2450 build/trans_presets.java:2451
-#: build/trans_presets.java:2492 build/trans_presets.java:2501
-#: build/trans_presets.java:2502 build/trans_presets.java:2503
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2468 build/trans_presets.java:2469
+#: build/trans_presets.java:2510 build/trans_presets.java:2519
+#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:2811
 msgid "no"
 msgstr "не"
@@ -22381,5 +22296,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4404
+#: build/trans_style.java:4428
 msgid "service"
 msgstr "служебна"
@@ -22499,5 +22414,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3242
+#: build/trans_presets.java:487 build/trans_presets.java:3260
 msgid "hiking"
 msgstr "туристически маршрут"
@@ -22646,4 +22561,9 @@
 msgid "Edit Motorway Junction"
 msgstr "Редактирай магистрален възел"
+
+#. item "Waypoints/Motorway Junction" text "Name"
+#: build/trans_presets.java:637
+msgid "Number"
+msgstr "Номер"
 
 #. item "Waypoints/Motorway Junction" text "Number"
@@ -22696,13 +22616,13 @@
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
 #: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2225
-#: build/trans_presets.java:2327 build/trans_presets.java:2357
-#: build/trans_presets.java:2410 build/trans_presets.java:2418
-#: build/trans_presets.java:2435 build/trans_presets.java:2448
-#: build/trans_presets.java:2457 build/trans_presets.java:2464
-#: build/trans_presets.java:2529 build/trans_presets.java:2539
-#: build/trans_presets.java:2740 build/trans_presets.java:2757
-#: build/trans_presets.java:2772 build/trans_presets.java:2811
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:1796 build/trans_presets.java:2243
+#: build/trans_presets.java:2345 build/trans_presets.java:2375
+#: build/trans_presets.java:2428 build/trans_presets.java:2436
+#: build/trans_presets.java:2453 build/trans_presets.java:2466
+#: build/trans_presets.java:2475 build/trans_presets.java:2482
+#: build/trans_presets.java:2547 build/trans_presets.java:2557
+#: build/trans_presets.java:2758 build/trans_presets.java:2775
+#: build/trans_presets.java:2790 build/trans_presets.java:2829
+#: build/trans_presets.java:3267
 msgid "Operator"
 msgstr "Оператор"
@@ -22970,6 +22890,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2939
+#: build/trans_presets.java:1770 build/trans_presets.java:2943
+#: build/trans_presets.java:2950 build/trans_presets.java:2957
 msgid "Elevation"
 msgstr "Надморска височина"
@@ -23821,5 +23741,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2438
+#: build/trans_presets.java:1237 build/trans_presets.java:2456
 msgid "Voltage"
 msgstr "Волтаж"
@@ -24190,24 +24110,24 @@
 #: build/trans_presets.java:1738 build/trans_presets.java:1835
 #: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2265
-#: build/trans_presets.java:2289 build/trans_presets.java:2530
-#: build/trans_presets.java:2552 build/trans_presets.java:2558
-#: build/trans_presets.java:2565 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2618 build/trans_presets.java:2624
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2662
-#: build/trans_presets.java:2669 build/trans_presets.java:2675
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2706 build/trans_presets.java:2713
-#: build/trans_presets.java:2720 build/trans_presets.java:2726
-#: build/trans_presets.java:2732 build/trans_presets.java:2758
-#: build/trans_presets.java:2766 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2795
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:1952 build/trans_presets.java:2283
+#: build/trans_presets.java:2307 build/trans_presets.java:2548
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2583 build/trans_presets.java:2590
+#: build/trans_presets.java:2596 build/trans_presets.java:2602
+#: build/trans_presets.java:2609 build/trans_presets.java:2616
+#: build/trans_presets.java:2623 build/trans_presets.java:2629
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2654
+#: build/trans_presets.java:2660 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2680
+#: build/trans_presets.java:2687 build/trans_presets.java:2693
+#: build/trans_presets.java:2699 build/trans_presets.java:2705
+#: build/trans_presets.java:2711 build/trans_presets.java:2717
+#: build/trans_presets.java:2724 build/trans_presets.java:2731
+#: build/trans_presets.java:2738 build/trans_presets.java:2744
+#: build/trans_presets.java:2750 build/trans_presets.java:2776
+#: build/trans_presets.java:2784 build/trans_presets.java:2799
+#: build/trans_presets.java:2805 build/trans_presets.java:2813
+#: build/trans_presets.java:2840
 msgid "Opening Hours"
 msgstr "Работно време"
@@ -24274,23 +24194,23 @@
 #: build/trans_presets.java:1835 build/trans_presets.java:1843
 #: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2265 build/trans_presets.java:2289
-#: build/trans_presets.java:2552 build/trans_presets.java:2558
-#: build/trans_presets.java:2565 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2618 build/trans_presets.java:2624
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2662
-#: build/trans_presets.java:2669 build/trans_presets.java:2675
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2706 build/trans_presets.java:2713
-#: build/trans_presets.java:2720 build/trans_presets.java:2726
-#: build/trans_presets.java:2732 build/trans_presets.java:2758
-#: build/trans_presets.java:2766 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2795
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:2283 build/trans_presets.java:2307
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2583 build/trans_presets.java:2590
+#: build/trans_presets.java:2596 build/trans_presets.java:2602
+#: build/trans_presets.java:2609 build/trans_presets.java:2616
+#: build/trans_presets.java:2623 build/trans_presets.java:2629
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2654
+#: build/trans_presets.java:2660 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2680
+#: build/trans_presets.java:2687 build/trans_presets.java:2693
+#: build/trans_presets.java:2699 build/trans_presets.java:2705
+#: build/trans_presets.java:2711 build/trans_presets.java:2717
+#: build/trans_presets.java:2724 build/trans_presets.java:2731
+#: build/trans_presets.java:2738 build/trans_presets.java:2744
+#: build/trans_presets.java:2750 build/trans_presets.java:2776
+#: build/trans_presets.java:2784 build/trans_presets.java:2799
+#: build/trans_presets.java:2805 build/trans_presets.java:2813
+#: build/trans_presets.java:2840
 msgid "24/7"
 msgstr "денонощно"
@@ -24304,23 +24224,23 @@
 #: build/trans_presets.java:1835 build/trans_presets.java:1843
 #: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2265 build/trans_presets.java:2289
-#: build/trans_presets.java:2552 build/trans_presets.java:2558
-#: build/trans_presets.java:2565 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2618 build/trans_presets.java:2624
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2662
-#: build/trans_presets.java:2669 build/trans_presets.java:2675
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2706 build/trans_presets.java:2713
-#: build/trans_presets.java:2720 build/trans_presets.java:2726
-#: build/trans_presets.java:2732 build/trans_presets.java:2758
-#: build/trans_presets.java:2766 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2795
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:2283 build/trans_presets.java:2307
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2583 build/trans_presets.java:2590
+#: build/trans_presets.java:2596 build/trans_presets.java:2602
+#: build/trans_presets.java:2609 build/trans_presets.java:2616
+#: build/trans_presets.java:2623 build/trans_presets.java:2629
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2654
+#: build/trans_presets.java:2660 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2680
+#: build/trans_presets.java:2687 build/trans_presets.java:2693
+#: build/trans_presets.java:2699 build/trans_presets.java:2705
+#: build/trans_presets.java:2711 build/trans_presets.java:2717
+#: build/trans_presets.java:2724 build/trans_presets.java:2731
+#: build/trans_presets.java:2738 build/trans_presets.java:2744
+#: build/trans_presets.java:2750 build/trans_presets.java:2776
+#: build/trans_presets.java:2784 build/trans_presets.java:2799
+#: build/trans_presets.java:2805 build/trans_presets.java:2813
+#: build/trans_presets.java:2840
 msgid "Mo-Fr 08:30-20:00"
 msgstr "понеделник-петък 08:30-20:00"
@@ -24334,23 +24254,23 @@
 #: build/trans_presets.java:1835 build/trans_presets.java:1843
 #: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2265 build/trans_presets.java:2289
-#: build/trans_presets.java:2552 build/trans_presets.java:2558
-#: build/trans_presets.java:2565 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2618 build/trans_presets.java:2624
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2662
-#: build/trans_presets.java:2669 build/trans_presets.java:2675
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2706 build/trans_presets.java:2713
-#: build/trans_presets.java:2720 build/trans_presets.java:2726
-#: build/trans_presets.java:2732 build/trans_presets.java:2758
-#: build/trans_presets.java:2766 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2795
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:2283 build/trans_presets.java:2307
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2583 build/trans_presets.java:2590
+#: build/trans_presets.java:2596 build/trans_presets.java:2602
+#: build/trans_presets.java:2609 build/trans_presets.java:2616
+#: build/trans_presets.java:2623 build/trans_presets.java:2629
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2654
+#: build/trans_presets.java:2660 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2680
+#: build/trans_presets.java:2687 build/trans_presets.java:2693
+#: build/trans_presets.java:2699 build/trans_presets.java:2705
+#: build/trans_presets.java:2711 build/trans_presets.java:2717
+#: build/trans_presets.java:2724 build/trans_presets.java:2731
+#: build/trans_presets.java:2738 build/trans_presets.java:2744
+#: build/trans_presets.java:2750 build/trans_presets.java:2776
+#: build/trans_presets.java:2784 build/trans_presets.java:2799
+#: build/trans_presets.java:2805 build/trans_presets.java:2813
+#: build/trans_presets.java:2840
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "вторник-неделя 08:00-15:00; събота 08:00-12:00"
@@ -24464,6 +24384,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2449
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:1797 build/trans_presets.java:2467
+#: build/trans_presets.java:2759
 msgid "Reference number"
 msgstr "Ref номер"
@@ -24479,5 +24399,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2359
+#: build/trans_presets.java:1368 build/trans_presets.java:2377
 msgid "underground"
 msgstr "подземен"
@@ -24491,5 +24411,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2450
+#: build/trans_presets.java:1798 build/trans_presets.java:2468
 msgid "Fee"
 msgstr "Такса"
@@ -24665,5 +24585,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2451
+#: build/trans_presets.java:1471 build/trans_presets.java:2469
 msgid "Wheelchair"
 msgstr "Инвалидна количка"
@@ -24701,5 +24621,5 @@
 #. <separator/>
 #: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2519
 msgid "Shelter"
 msgstr "Навес"
@@ -24707,5 +24627,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2489
+#: build/trans_presets.java:1495 build/trans_presets.java:2507
 msgid "Bench"
 msgstr "Скамейка"
@@ -24824,5 +24744,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2393
 msgid "Beacon"
 msgstr "Маяк / Радиопредавател"
@@ -25561,5 +25481,5 @@
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2722
+#: build/trans_presets.java:1904 build/trans_presets.java:2740
 msgid "Sports"
 msgstr "Спорт"
@@ -25634,5 +25554,53 @@
 #.
 #. <rule>
+#. <condition k="sport" v="soccer"/>
+#. color sport
+#. <icon src="sport/soccer.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="australian_football"/>
+#. color sport
+#. <icon src="sport/soccer.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="american_football"/>
+#. color sport
+#. <icon src="sport/soccer.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="canadian_football"/>
+#. color sport
+#. <icon src="sport/soccer.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="gaelic_football"/>
+#. color sport
+#. <icon src="sport/soccer.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rugby_league"/>
+#. color sport
+#. <icon src="sport/football.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rugby_union"/>
 #. color sport
 #. <icon src="sport/football.png"/>
@@ -25746,12 +25714,4 @@
 #.
 #. <rule>
-#. <condition k="sport" v="football"/>
-#. color sport
-#. <icon src="sport/football.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
 #. <condition k="sport" v="golf"/>
 #. color sport
@@ -25818,12 +25778,4 @@
 #.
 #. <rule>
-#. <condition k="sport" v="rugby"/>
-#. color sport
-#. <icon src="sport/football.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
 #. <condition k="sport" v="skating"/>
 #. color sport
@@ -25837,12 +25789,4 @@
 #. color sport
 #. <icon src="sport/skateboard.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="sport" v="soccer"/>
-#. color sport
-#. <icon src="sport/soccer.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26004,5 +25948,6 @@
 #: build/trans_style.java:4074 build/trans_style.java:4082
 #: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106
+#: build/trans_style.java:4106 build/trans_style.java:4114
+#: build/trans_style.java:4122 build/trans_style.java:4130
 msgid "sport"
 msgstr "спорт"
@@ -26029,4 +25974,10 @@
 #: 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 "австралийски футбол"
+
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "australian_football"
 msgstr "австралийски футбол"
@@ -26054,4 +26005,10 @@
 #: 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 "австралийски футбол"
+
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "canoe"
 msgstr "кану"
@@ -26094,6 +26051,7 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-msgid "football"
-msgstr "футбол"
+#, fuzzy
+msgid "gaelic_football"
+msgstr "австралийски футбол"
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26134,5 +26092,11 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-msgid "rugby"
+msgid "rugby_league"
+msgstr ""
+
+#: 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 "ръгби"
 
@@ -26253,6 +26217,10 @@
 #. item "Sport/Shooting" text "Name"
 #. item "Sport (Ball)/Soccer" text "Name"
-#. item "Sport (Ball)/Football" text "Name"
 #. item "Sport (Ball)/Australian Football" text "Name"
+#. item "Sport (Ball)/American Football" text "Name"
+#. item "Sport (Ball)/Canadian Football" text "Name"
+#. item "Sport (Ball)/Gaelic Football" text "Name"
+#. item "Sport (Ball)/Rugby League" text "Name"
+#. item "Sport (Ball)/Rugby Union" text "Name"
 #. item "Sport (Ball)/Baseball" text "Name"
 #. item "Sport (Ball)/Basketball" text "Name"
@@ -26266,5 +26234,4 @@
 #. item "Sport (Ball)/Pelota" text "Name"
 #. item "Sport (Ball)/Racquet" text "Name"
-#. item "Sport (Ball)/Rugby" text "Name"
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
@@ -26286,4 +26253,6 @@
 #: build/trans_presets.java:2146 build/trans_presets.java:2152
 #: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182
 msgid "type"
 msgstr "тип"
@@ -26307,6 +26276,10 @@
 #. item "Sport/Shooting" combo "type"
 #. item "Sport (Ball)/Soccer" combo "type"
-#. item "Sport (Ball)/Football" combo "type"
 #. item "Sport (Ball)/Australian Football" combo "type"
+#. item "Sport (Ball)/American Football" combo "type"
+#. item "Sport (Ball)/Canadian Football" combo "type"
+#. item "Sport (Ball)/Gaelic Football" combo "type"
+#. item "Sport (Ball)/Rugby League" combo "type"
+#. item "Sport (Ball)/Rugby Union" combo "type"
 #. item "Sport (Ball)/Baseball" combo "type"
 #. item "Sport (Ball)/Basketball" combo "type"
@@ -26319,5 +26292,4 @@
 #. item "Sport (Ball)/Pelota" combo "type"
 #. item "Sport (Ball)/Racquet" combo "type"
-#. item "Sport (Ball)/Rugby" combo "type"
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
@@ -26339,4 +26311,6 @@
 #: build/trans_presets.java:2146 build/trans_presets.java:2152
 #: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182
 msgid "pitch"
 msgstr "игрище"
@@ -26359,4 +26333,6 @@
 #: build/trans_presets.java:2146 build/trans_presets.java:2152
 #: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182
 msgid "sports_centre"
 msgstr "спортен център"
@@ -26379,4 +26355,6 @@
 #: build/trans_presets.java:2146 build/trans_presets.java:2152
 #: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182
 msgid "stadium"
 msgstr "стадион"
@@ -26399,4 +26377,6 @@
 #: build/trans_presets.java:2146 build/trans_presets.java:2152
 #: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182
 msgid "track"
 msgstr "следа"
@@ -26598,158 +26578,194 @@
 
 #: build/trans_presets.java:2070
-msgid "Football"
-msgstr "Американски футбол"
-
-#. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2071
-msgid "Edit Football"
-msgstr "Редактирай американски футбол"
-
-#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "Австралийски футбол"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2071
 msgid "Edit Australian Football"
 msgstr "Редактирай австралийски футбол"
 
+#: build/trans_presets.java:2076
+#, fuzzy
+msgid "American Football"
+msgstr "Австралийски футбол"
+
+#. item "Sport (Ball)/American Football"
+#: build/trans_presets.java:2077
+#, fuzzy
+msgid "Edit American Football"
+msgstr "Редактирай австралийски футбол"
+
 #: build/trans_presets.java:2082
+#, fuzzy
+msgid "Canadian Football"
+msgstr "Редактирай американски футбол"
+
+#. item "Sport (Ball)/Canadian Football"
+#: build/trans_presets.java:2083
+#, fuzzy
+msgid "Edit Canadian Football"
+msgstr "Редактирай австралийски футбол"
+
+#: build/trans_presets.java:2088
+#, fuzzy
+msgid "Gaelic Football"
+msgstr "Редактирай американски футбол"
+
+#. item "Sport (Ball)/Gaelic Football"
+#: build/trans_presets.java:2089
+#, fuzzy
+msgid "Edit Gaelic Football"
+msgstr "Редактирай американски футбол"
+
+#: build/trans_presets.java:2094
+msgid "Rugby League"
+msgstr ""
+
+#. item "Sport (Ball)/Rugby League"
+#: build/trans_presets.java:2095
+#, fuzzy
+msgid "Edit Rugby League"
+msgstr "Редактирай ръгби"
+
+#: build/trans_presets.java:2100
+#, fuzzy
+msgid "Rugby Union"
+msgstr "Ръгби"
+
+#. item "Sport (Ball)/Rugby Union"
+#: build/trans_presets.java:2101
+#, fuzzy
+msgid "Edit Rugby Union"
+msgstr "Редактирай ръгби"
+
+#: build/trans_presets.java:2106
 msgid "Baseball"
 msgstr "Бейсбол"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2107
 msgid "Edit Baseball"
 msgstr "Редактирай бейсбол"
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2112
 msgid "Basketball"
 msgstr "Баскетбол"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2113
 msgid "Edit Basketball"
 msgstr "Редактирай баскетбол"
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2118
 msgid "Golf"
 msgstr "Голф"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2119
 msgid "Edit Golf"
 msgstr "Редактирай голф"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2122
 msgid "golf_course"
 msgstr "поле за голф"
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2124
 msgid "Boule"
 msgstr "Буле (игра с мет.топчета)"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2125
 msgid "Edit Boule"
 msgstr "Редактирай Игра с мет.топчета"
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2130
 msgid "Bowls"
 msgstr "Игра с асим.мет.топки (bowls)"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2131
 msgid "Edit Bowls"
 msgstr "Редактирай игра с асим.мет.топки"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2136
 msgid "Cricket"
 msgstr "Крикет"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2137
 msgid "Edit Cricket"
 msgstr "Редактирай крикет"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2142
 msgid "Cricket Nets"
 msgstr "Крикет мрежи"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2143
 msgid "Edit Cricket Nets"
 msgstr "Рекдатирай крикет мрежи"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2148
 msgid "Croquet"
 msgstr "Крокет"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2149
 msgid "Edit Croquet"
 msgstr "Редактирай крокет"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2154
 msgid "Hockey"
 msgstr "Хокей"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2155
 msgid "Edit Hockey"
 msgstr "Редактирай хокей"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2160
 msgid "Pelota"
 msgstr "Пелота"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2161
 msgid "Edit Pelota"
 msgstr "Редактирай пелота"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2166
 msgid "Racquet"
 msgstr "ракет"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2167
 msgid "Edit Racquet"
 msgstr "Редактирай ракет"
 
-#: build/trans_presets.java:2148
-msgid "Rugby"
-msgstr "Ръгби"
-
-#. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2149
-msgid "Edit Rugby"
-msgstr "Редактирай ръгби"
-
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2172
 msgid "Table Tennis"
 msgstr "Тенис на маса"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2173
 msgid "Edit Table Tennis"
 msgstr "Редактирай тенис на маса"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2178
 msgid "Tennis"
 msgstr "Тенис"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2179
 msgid "Edit Tennis"
 msgstr "Редактирай тенис"
 
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2186
 msgid "Man-Made"
 msgstr "Изкуствени"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2188
 msgid "Building"
 msgstr "Сграда"
@@ -26757,5 +26773,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2191
 msgid "Public Building"
 msgstr "Обществена сграда"
@@ -26763,10 +26779,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2193
 msgid "Edit Public Building"
 msgstr "Редактирай обществена сграда"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2197
 msgid "Town hall"
 msgstr "Кметство"
@@ -26774,10 +26790,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2199
 msgid "Edit Town hall"
 msgstr "Редактирай кметство"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2203
 msgid "Embassy"
 msgstr "Посолство"
@@ -26785,10 +26801,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2205
 msgid "Edit Embassy"
 msgstr "Редактирай посолство"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2209
 msgid "Courthouse"
 msgstr "Съдебна сграда"
@@ -26797,10 +26813,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2212
 msgid "Edit Courthouse"
 msgstr "Редактирай съдебна сграда"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2216
 msgid "Prison"
 msgstr "Затвор"
@@ -26809,10 +26825,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2219
 msgid "Edit Prison"
 msgstr "Редактирай затвор"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2223
 msgid "Police"
 msgstr "Полиция/Милиция"
@@ -26822,10 +26838,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2227
 msgid "Edit Police"
 msgstr "Редактирай полиция/милиция"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2231
 msgid "Fire Station"
 msgstr "Пожарна"
@@ -26834,10 +26850,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2234
 msgid "Edit Fire Station"
 msgstr "Редактирай пожарна"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2238
 msgid "Post Office"
 msgstr "Пощенска станция"
@@ -26845,5 +26861,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2240
 msgid "Edit Post Office"
 msgstr "Редактирай пощенска станция"
@@ -26851,15 +26867,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2246
 msgid "Kindergarten"
 msgstr "Детска градина"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2247
 msgid "Edit Kindergarten"
 msgstr "Редактирай детска градина"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2233
+#: build/trans_presets.java:2251
 msgid "School"
 msgstr "Училище"
@@ -26867,10 +26883,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2235
+#: build/trans_presets.java:2253
 msgid "Edit School"
 msgstr "Редактирай училището"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2257
 msgid "University"
 msgstr "Университет"
@@ -26878,10 +26894,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2259
 msgid "Edit University"
 msgstr "Редактирай университет"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2263
 msgid "College"
 msgstr "Колеж"
@@ -26889,5 +26905,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2265
 msgid "Edit College"
 msgstr "Редактирай колеж"
@@ -26895,5 +26911,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2270
 msgid "Cinema"
 msgstr "Кино"
@@ -26902,10 +26918,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2255
+#: build/trans_presets.java:2273
 msgid "Edit Cinema"
 msgstr "Редактирай кино"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2277
 msgid "Library"
 msgstr "Библиотека"
@@ -26914,9 +26930,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2280
 msgid "Edit Library"
 msgstr "Редактирай библиотека"
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2285
 msgid "Arts Centre"
 msgstr "Център на изкуствата"
@@ -26924,10 +26940,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2287
 msgid "Edit Arts Centre"
 msgstr "Редактирай център на изкуствата"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2291
 msgid "Theatre"
 msgstr "Театър"
@@ -26936,10 +26952,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2294
 msgid "Edit Theatre"
 msgstr "Редактирай театър"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2298
 msgid "Place of Worship"
 msgstr "Място за богослужение"
@@ -26949,5 +26965,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2302
 msgid "Edit Place of Worship"
 msgstr "Редактирай място за богослужение"
@@ -26956,6 +26972,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "Religion"
 msgstr "Религия"
@@ -26964,66 +26980,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "bahai"
 msgstr "Бахаи"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "buddhist"
 msgstr "Будизъм"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "christian"
 msgstr "Християнство"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "hindu"
 msgstr "Индуизъм"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "jain"
 msgstr "Джайнизъм"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "jewish"
 msgstr "Юдаизъм"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "muslim"
 msgstr "Мусулманство"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "sikh"
 msgstr "Сикхизъм"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "spiritualist"
 msgstr "Спиритуализъм"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "taoist"
 msgstr "Даосизъм"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "unitarian"
 msgstr "Унитаристи"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "zoroastrian"
 msgstr "Зороастризъм"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "Denomination"
 msgstr "Конфесия"
@@ -27032,81 +27048,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "anglican"
 msgstr "Англиканска"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "baptist"
 msgstr "Баптизъм"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "catholic"
 msgstr "Католическо"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "evangelical"
 msgstr "Евангелска"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "jehovahs_witness"
 msgstr "Свидетели на Йехова"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "lutheran"
 msgstr "Лютеранство"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "methodist"
 msgstr "Методизъм"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "mormon"
 msgstr "Мормони"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "orthodox"
 msgstr "Православие"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "pentecostal"
 msgstr "Петдесетници"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "presbyterian"
 msgstr "Пресвитериани"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "protestant"
 msgstr "Протестантизъм"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "quaker"
 msgstr "Кваркери"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "shia"
 msgstr "Шийти"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "sunni"
 msgstr "Сунити"
 
 #. <separator/>
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2310
 msgid "Addresses"
 msgstr "Адреси"
@@ -27115,5 +27131,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2313
 msgid "Edit Address Information"
 msgstr "Редактиране на информацията за адреса"
@@ -27121,5 +27137,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2315
 msgid "House number"
 msgstr "Номер"
@@ -27127,25 +27143,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2317
 msgid "House name"
 msgstr "Име на дом"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2318
 msgid "Street name"
 msgstr "Име на улица"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2319
 msgid "City name"
 msgstr "Име на град"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2320
 msgid "Post code"
 msgstr "Пощенски код"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2321
 msgid "Country code"
 msgstr "Код на държава"
@@ -27154,5 +27170,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2309
+#: build/trans_presets.java:2327
 msgid "Edit Address Interpolation"
 msgstr "Редактирай интерполация на адреси"
@@ -27160,61 +27176,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2329
 msgid "Numbering scheme"
 msgstr "Схема на номериране"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2329
 msgid "odd"
 msgstr "нечетни"
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2329
 msgid "even"
 msgstr "четни"
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2329
 msgid "alphabetic"
 msgstr "по азбучен ред"
 
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2332
 msgid "Man Made"
 msgstr "Изкуствени"
 
 #. group "Man Made"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2333
 msgid "Works"
 msgstr "Цех"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2334
 msgid "Edit Works"
 msgstr "Редактирай цех"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2338
 msgid "Tower"
 msgstr "Кула"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2339
 msgid "Edit Tower"
 msgstr "Редактирай кула"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2342
 msgid "Tower type"
 msgstr "Тип на кулата"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2342
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2342
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2344
 msgid "Height (meters)"
 msgstr "Височина (в метри)"
@@ -27222,25 +27238,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2348
 msgid "Water Tower"
 msgstr "Водонапорна кула"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2349
 msgid "Edit Water Tower"
 msgstr "Редактирай водонапорна кула"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2353
 msgid "Gasometer"
 msgstr "Газохранилище"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2354
 msgid "Edit Gasometer"
 msgstr "Редактирай газохранилище"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2358
 msgid "Lighthouse"
 msgstr "Маяк / Светлинен фар"
@@ -27248,10 +27264,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2360
 msgid "Edit Lighthouse"
 msgstr "Редактирай маяк / светлинен фар"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2364
 msgid "Windmill"
 msgstr "Мелница"
@@ -27259,10 +27275,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2366
 msgid "Edit Windmill"
 msgstr "Редактирай мелница"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2370
 msgid "Pipeline"
 msgstr "Тръбопровод"
@@ -27271,41 +27287,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2373
 msgid "Edit Pipeline"
 msgstr "Редактирай газопровод"
 
-#: build/trans_presets.java:2358 build/trans_presets.java:2401
+#: build/trans_presets.java:2376 build/trans_presets.java:2419
 msgid "gas"
 msgstr "газ"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2376
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2376
 msgid "oil"
 msgstr "нефт"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2376
 msgid "sewage"
 msgstr "отходна тръба"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2376
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2377
 msgid "Location"
 msgstr "Местоположение"
 
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2377
 msgid "underwater"
 msgstr "подводно"
 
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2377
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2379
 msgid "Wastewater Plant"
 msgstr "Пречиствателна станция"
@@ -27315,10 +27331,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2383
 msgid "Edit Wastewater Plant"
 msgstr "Редактирай пречиствателна станция"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2387
 msgid "Crane"
 msgstr "Кран"
@@ -27326,5 +27342,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2389
 msgid "Edit Crane"
 msgstr "Редактирай кран"
@@ -27332,10 +27348,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2395
 msgid "Edit Beacon"
 msgstr "Редактирай маяк / радиопредавател"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2399
 msgid "Survey Point"
 msgstr "Точка на наблюдение"
@@ -27343,10 +27359,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2401
 msgid "Edit Survey Point"
 msgstr "Редактирай точка на наблюдение"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2405
 msgid "Surveillance"
 msgstr "Видеонаблюдение"
@@ -27354,23 +27370,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2407
 msgid "Edit Surveillance Camera"
 msgstr "Редактирай видеонаблюдение"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2410
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2410
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2410
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2413
 msgid "Power Generator"
 msgstr "Електроцентрала"
@@ -27380,35 +27396,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2417
 msgid "Edit Power Generator"
 msgstr "Редактирай електрогенератор"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2419
 msgid "wind"
 msgstr "вятърна енергия"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2419
 msgid "hydro"
 msgstr "водна енергия"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2419
 msgid "fossil"
 msgstr "енергия от изкопаеми горива"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2419
 msgid "nuclear"
 msgstr "атомна"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2419
 msgid "coal"
 msgstr "въглища"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2419
 msgid "photovoltaic"
 msgstr "слънчева енергия"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2422
 msgid "Power Station"
 msgstr "Електростанция"
@@ -27417,10 +27433,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2425
 msgid "Edit Power Station"
 msgstr "Редактирай електростанция"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2431
 msgid "Power Sub Station"
 msgstr "Електроподстанция"
@@ -27429,5 +27445,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2434
 msgid "Edit Power Sub Station"
 msgstr "Редактирай електроподстанция"
@@ -27435,10 +27451,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2419 build/trans_presets.java:2436
+#: build/trans_presets.java:2437 build/trans_presets.java:2454
 msgid "Line reference"
 msgstr "Номер линия"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2439
 msgid "Power Tower"
 msgstr "Електрически стълб от ЕПМ"
@@ -27449,23 +27465,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2444
 msgid "Edit Power Tower"
 msgstr "Редактирай стълб от ЕПМ"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2445
 msgid "tower"
 msgstr "кула"
 
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2445
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2446
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2448
 msgid "Power Line"
 msgstr "Линия за електропренос"
@@ -27474,74 +27490,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2451
 msgid "Edit Power Line"
 msgstr "Редактирай линия за електропренос"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2452
 msgid "Line type"
 msgstr "Тип на линия"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2452
 msgid "line"
 msgstr "линия"
 
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2452
 msgid "minor_line"
 msgstr "второстепенна линия"
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2457
 msgid "Amount of Cables"
 msgstr "Брой проводници"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2458
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Брой на жилата на всеки кабел"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2458
 msgid "single"
 msgstr "един"
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2458
 msgid "double"
 msgstr "два"
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2458
 msgid "triple"
 msgstr "три"
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2458
 msgid "quad"
 msgstr "четири"
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2461
 msgid "Amenities"
 msgstr "Обществени удобства"
 
 #. group "Amenities"
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2462
 msgid "Toilets"
 msgstr "Тоалетни"
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2469
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2452 build/trans_presets.java:2742
+#: build/trans_presets.java:2470 build/trans_presets.java:2760
 msgid "Note"
 msgstr "Забележка"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2472
 msgid "Post Box"
 msgstr "Пощенска кутия"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2477
 msgid "Telephone"
 msgstr "Телефон"
@@ -27550,5 +27566,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2480
 msgid "Edit Telephone"
 msgstr "Редактирай телефон"
@@ -27556,5 +27572,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2465 build/trans_presets.java:2743
+#: build/trans_presets.java:2483 build/trans_presets.java:2761
 msgid "Coins"
 msgstr "Монети"
@@ -27562,5 +27578,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2466 build/trans_presets.java:2744
+#: build/trans_presets.java:2484 build/trans_presets.java:2762
 msgid "Notes"
 msgstr "Банкноти"
@@ -27568,5 +27584,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2467 build/trans_presets.java:2745
+#: build/trans_presets.java:2485 build/trans_presets.java:2763
 msgid "Electronic purses and Charge cards"
 msgstr "Електрони средства за разплата"
@@ -27574,5 +27590,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2468 build/trans_presets.java:2746
+#: build/trans_presets.java:2486 build/trans_presets.java:2764
 msgid "Debit cards"
 msgstr "Дебитни карти"
@@ -27580,15 +27596,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2469 build/trans_presets.java:2747
+#: build/trans_presets.java:2487 build/trans_presets.java:2765
 msgid "Credit cards"
 msgstr "Кредитни карти"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2488
 msgid "Telephone cards"
 msgstr "Телефонни карти"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2490
 msgid "Recycling"
 msgstr "Рециклиране"
@@ -27597,5 +27613,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2493
 msgid "Edit Recycling station"
 msgstr "Редактиране на станция за рециклиране"
@@ -27603,35 +27619,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2495
 msgid "Batteries"
 msgstr "Батерии"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2496
 msgid "Cans"
 msgstr "Консервни кутии"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2497
 msgid "Clothes"
 msgstr "Дрехи"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2498
 msgid "Glass"
 msgstr "Стъкло"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2499
 msgid "Paper"
 msgstr "Хартия"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2482
+#: build/trans_presets.java:2500
 msgid "Scrap Metal"
 msgstr "Вторични суровини"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2502
 msgid "Waste Basket"
 msgstr ""
@@ -27639,5 +27655,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2504
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27646,31 +27662,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2510
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2511
 msgid "Material"
 msgstr "Материал"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2511
 msgid "stone"
 msgstr "камък"
 
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2511
 msgid "plastic"
 msgstr "пластмаса"
 
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2512
 msgid "Colour"
 msgstr "Цвят"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2512
 msgid "black"
 msgstr "черно"
 
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2512
 msgid "brown"
 msgstr "кафяво"
@@ -27749,5 +27765,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2494 build/trans_style.java:3190
+#: build/trans_presets.java:2512 build/trans_style.java:3190
 #: build/trans_style.java:3198 build/trans_style.java:3206
 #: build/trans_style.java:3214 build/trans_style.java:3222
@@ -27757,31 +27773,31 @@
 msgstr "зеленина"
 
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2512
 msgid "red"
 msgstr "червено"
 
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2512
 msgid "blue"
 msgstr "синьо"
 
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2512
 msgid "gray"
 msgstr "сиво"
 
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2512
 msgid "white"
 msgstr "бяло"
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2513
 msgid "Amount of Seats"
 msgstr "Брой седящи места"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2515
 msgid "Hunting Stand"
 msgstr "Ловно скривалище"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2516
 msgid "Edit Hunting Stand"
 msgstr "Редактирай ловно скривалище"
@@ -27790,30 +27806,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2500 build/trans_presets.java:2982
+#: build/trans_presets.java:2518 build/trans_presets.java:3000
 msgid "Height"
 msgstr "Височина"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2518
 msgid "low"
 msgstr "нисък"
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2518
 msgid "half"
 msgstr "среден"
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2518
 msgid "full"
 msgstr "пълен"
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2520
 msgid "Hide"
 msgstr "Скривалище"
 
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2521
 msgid "Lock"
 msgstr "Заключване"
 
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2523
 msgid "Fountain"
 msgstr "Фонтан"
@@ -27822,10 +27838,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2526
 msgid "Edit Fountain"
 msgstr "Редактирай фонтан"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2530
 msgid "Drinking Water"
 msgstr "Питейна вода"
@@ -27834,10 +27850,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2533
 msgid "Edit Drinking Water"
 msgstr "Редактирай питейна вода"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2537
 msgid "Fire Hydrant"
 msgstr "Пожарен кран"
@@ -27846,5 +27862,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2540
 msgid "Edit Fire Hydrant"
 msgstr "редактиране на \"Пожарен кран\""
@@ -27852,5 +27868,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2543
 msgid "Baby Hatch"
 msgstr "Дестка ясла"
@@ -27858,15 +27874,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2545
 msgid "Edit Baby Hatch"
 msgstr "Редактирай детска ясла"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2551
 msgid "Shops"
 msgstr "Магазини"
 
 #. group "Shops"
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2552
 msgid "Car Dealer"
 msgstr "Автомобили"
@@ -27874,10 +27890,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2554
 msgid "Edit Car Shop"
 msgstr "Редактирай автосалон"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2559
 msgid "Bike Dealer"
 msgstr "Велосипеди"
@@ -27886,28 +27902,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2562
 msgid "Edit Bicycle Shop"
 msgstr "Редактирай вело-магазин"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:2566
 msgid "Supermarket"
 msgstr "Супермаркет"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2567
 msgid "Edit Supermarket"
 msgstr "Редактирай супермаркет"
 
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2572
 msgid "Chemist"
 msgstr "Аптека"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2573
 msgid "Edit Chemist"
 msgstr "Редактиране на: аптека"
 
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2578
 msgid "Convenience Store"
 msgstr "Хранителни стоки"
@@ -27915,9 +27931,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2580
 msgid "Edit Convenience Store"
 msgstr "Редактиране на \"магазин за хранителни стоки\""
 
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2585
 msgid "Kiosk"
 msgstr "Будка"
@@ -27925,27 +27941,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2587
 msgid "Edit Kiosk"
 msgstr "Редактирай будка"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2592
 msgid "Book Store"
 msgstr "Книжарница"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2593
 msgid "Edit Book Store"
 msgstr "Редактиране на книжарница"
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2598
 msgid "Travel Agency"
 msgstr "Туристическа агенция"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2599
 msgid "Edit Travel Agency"
 msgstr "Редактиране на туристическа агенция"
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2604
 msgid "Butcher"
 msgstr "Месарница"
@@ -27953,9 +27969,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2606
 msgid "Edit Butcher"
 msgstr "Редактирай месарница"
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2611
 msgid "Baker"
 msgstr "Фурна"
@@ -27963,9 +27979,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2613
 msgid "Edit Baker"
 msgstr "Редактирай фурна"
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2618
 msgid "Florist"
 msgstr "Цветарски магазин"
@@ -27973,18 +27989,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2620
 msgid "Edit Florist"
 msgstr "Редактирай цветарски магазин"
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2625
 msgid "Organic"
 msgstr "Био магазин"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2626
 msgid "Edit Organic Shop"
 msgstr "Редактирай био магазин"
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2631
 msgid "Alcohol"
 msgstr "Алкохол"
@@ -27992,54 +28008,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2633
 msgid "Edit Alcohol Shop"
 msgstr "Редактиране магазин за алкохол"
 
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2638
 msgid "Beverages"
 msgstr "Напитки"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2639
 msgid "Edit Beverages Shop"
 msgstr "Редактиране магазин за безалкохолни"
 
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2644
 msgid "Computer"
 msgstr "Компютри"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2627
+#: build/trans_presets.java:2645
 msgid "Edit Computer Shop"
 msgstr "Редактирай компютърен магазин"
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2650
 msgid "Electronics"
 msgstr "Електроника"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2651
 msgid "Edit Electronics Shop"
 msgstr "Редактирай магазин за електроника"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2656
 msgid "Hifi"
 msgstr "Аудио HiFi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2657
 msgid "Edit Hifi Shop"
 msgstr "Редактирай магазин за Аудио HiFi"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2662
 msgid "Furniture"
 msgstr "Мебелен магазин"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2663
 msgid "Edit Furniture Shop"
 msgstr "Редактирай мебелен магазин"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2668
 msgid "Garden Centre"
 msgstr "Градински център"
@@ -28047,9 +28063,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2670
 msgid "Edit Garden Centre"
 msgstr "Редактирай градински център"
 
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2675
 msgid "Hardware"
 msgstr "Железария"
@@ -28057,9 +28073,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2677
 msgid "Edit Hardware Store"
 msgstr "Редактирай железария"
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2682
 msgid "Do-it-yourself-store"
 msgstr "Магазин \"Направи си сам\""
@@ -28067,54 +28083,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2684
 msgid "Edit Do-it-yourself-store"
 msgstr "Редактирай магазин \"Направи си сам\""
 
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2689
 msgid "Stationery"
 msgstr "Книжарница"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2690
 msgid "Edit Stationery Shop"
 msgstr "Редактирай книжарница"
 
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2695
 msgid "Hairdresser"
 msgstr "Фризьорски салон / козметика"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2678
+#: build/trans_presets.java:2696
 msgid "Edit Hairdresser"
 msgstr "Редактирай фризьорски салон / козметика"
 
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2701
 msgid "Shoes"
 msgstr "Обувки"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2702
 msgid "Edit Shoe Shop"
 msgstr "Редактирай магазин за обувки"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2707
 msgid "Toys"
 msgstr "Играчки"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2708
 msgid "Edit Toy Shop"
 msgstr "Редактирай магазин за играчки"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2713
 msgid "Video"
 msgstr "Видео"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2714
 msgid "Edit Video Shop"
 msgstr "Редактирай Видео-магазин"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2719
 msgid "Dry Cleaning"
 msgstr "Химическо чистене"
@@ -28122,9 +28138,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2721
 msgid "Edit Dry Cleaning"
 msgstr "Редактирай химическо чистене"
 
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2726
 msgid "Laundry"
 msgstr "Пералня"
@@ -28132,9 +28148,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2728
 msgid "Edit Laundry"
 msgstr "Редактирай пералня"
 
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2733
 msgid "Outdoor"
 msgstr "Туристически стоки (за активен отдих)"
@@ -28142,24 +28158,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2735
 msgid "Edit Outdoor Shop"
 msgstr "Редактирай мазизин за туристически стоки"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2741
 msgid "Edit Sports Shop"
 msgstr "Редактирай магазин за спортни стоки"
 
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2746
 msgid "Optician"
 msgstr "Оптика"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2747
 msgid "Edit Optician"
 msgstr "Редактирай оптика"
 
 #. <separator/>
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2753
 msgid "Vending machine"
 msgstr "Автомат за стоки"
@@ -28167,5 +28183,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2755
 msgid "Edit Vending machine"
 msgstr "Редактирай автомат за стоки"
@@ -28173,97 +28189,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "Vending products"
 msgstr "Продукти за автоматична продажба"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "public_transport_tickets"
 msgstr "билети за обществен транспорт"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "public_transport_plans"
 msgstr "карта на обществен транспорт"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "parking_tickets"
 msgstr "билети за паркиране"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "food"
 msgstr "храна"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "drinks"
 msgstr "напитки"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "sweets"
 msgstr "сладки"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "cigarettes"
 msgstr "цигари"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "photos"
 msgstr "фотографии"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "animal_food"
 msgstr "храна за животни"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "news_papers"
 msgstr "вестници"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "toys"
 msgstr "играчки"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "stamps"
 msgstr "пощенски марки"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "SIM-cards"
 msgstr "SIM-карти"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "telephone_vouchers"
 msgstr "телефонни ваучери"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "vouchers"
 msgstr "ваучери"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "condoms"
 msgstr "презервативи"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "tampons"
 msgstr "тампони"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "excrement_bags"
 msgstr "торби за екскременти"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2766
 msgid "Account or loyalty cards"
 msgstr "клиентски карти"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2769
 msgid "Cash"
 msgstr "Пари"
 
 #. group "Cash"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2770
 msgid "Bank"
 msgstr "Банка"
@@ -28271,14 +28287,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2772
 msgid "Edit Bank"
 msgstr "Редактирай банка"
 
-#: build/trans_presets.java:2759 build/trans_presets.java:2768
+#: build/trans_presets.java:2777 build/trans_presets.java:2786
 msgid "Automated Teller Machine"
 msgstr "Банкомат"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2779
 msgid "Money Exchange"
 msgstr "Обмяна на валута"
@@ -28286,5 +28302,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2781
 msgid "Edit Money Exchange"
 msgstr "Редактирай обмяна на валута"
@@ -28292,15 +28308,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2788
 msgid "Edit Automated Teller Machine"
 msgstr "Редактирай банкомат"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2793
 msgid "Health"
 msgstr "Здраве"
 
 #. group "Health"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2794
 msgid "Doctors"
 msgstr "Лекар"
@@ -28308,18 +28324,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2796
 msgid "Edit Doctors"
 msgstr "редактиране на \"Лекар\""
 
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2801
 msgid "Dentist"
 msgstr "Стоматолог"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2802
 msgid "Edit Dentist"
 msgstr "Редактирай стоматолигия"
 
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2807
 msgid "Pharmacy"
 msgstr "Аптека"
@@ -28327,5 +28343,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2809
 msgid "Edit Pharmacy"
 msgstr "Редактирай аптека"
@@ -28333,9 +28349,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2811
 msgid "Dispensing"
 msgstr "Приготвят лекарства по рецепти"
 
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2815
 msgid "Hospital"
 msgstr "Болница"
@@ -28343,10 +28359,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2817
 msgid "Edit Hospital"
 msgstr "Редактирай болница"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2821
 msgid "Emergency Access Point"
 msgstr "Пункт за връзка със спешна помощ"
@@ -28355,5 +28371,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2824
 msgid "Edit Emergency Access Point"
 msgstr "Редактирай пункт за връзка със спешна помощ"
@@ -28362,20 +28378,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2827
 msgid "Point Number"
 msgstr "Номер на пункта"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2828
 msgid "Point Name"
 msgstr "Име на пункта"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2830
 msgid "Phone Number"
 msgstr "Телефонен номер"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2831
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Използвайте международен код, като например +12-345-67890)"
@@ -28383,5 +28399,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2834
 msgid "Veterinary"
 msgstr "Ветеринар"
@@ -28390,64 +28406,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2837
 msgid "Edit Veterinary"
 msgstr "Редактирай ветеринар"
 
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2844
 msgid "Geography"
 msgstr "География"
 
 #. group "Geography"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2845
 msgid "Places"
 msgstr "Места"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2846
 msgid "Continent"
 msgstr "Континент"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2847
 msgid "Edit Continent"
 msgstr "Редактирай континент"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2852
 msgid "Country"
 msgstr "Държава"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2853
 msgid "Edit Country"
 msgstr "Редактирай държава"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2858
 msgid "State"
 msgstr "Област/Щат"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2859
 msgid "Edit State"
 msgstr "Редактирай област/щат"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2864
 msgid "Region"
 msgstr "Област"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2865
 msgid "Edit Region"
 msgstr "Редактирай област"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2870
 msgid "County"
 msgstr "Графство"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2871
 msgid "Edit County"
 msgstr "Редактирай графство"
@@ -28455,15 +28471,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2877
 msgid "City"
 msgstr "Град (над 100 000)"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2878
 msgid "Edit City"
 msgstr "Редактирай голям град"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2883
 msgid "Town"
 msgstr "Град (под 100 000)"
@@ -28471,10 +28487,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2885
 msgid "Edit Town"
 msgstr "Редактирай град"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2890
 msgid "Suburb"
 msgstr "Квартал/предградие"
@@ -28482,25 +28498,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2874
+#: build/trans_presets.java:2892
 msgid "Edit Suburb"
 msgstr "Редактирай квартал"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2897
 msgid "Village"
 msgstr "Село"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2898
 msgid "Edit Village"
 msgstr "Редактирай село"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2903
 msgid "Hamlet"
 msgstr "Махала"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2904
 msgid "Edit Hamlet"
 msgstr "Редактирай махала"
@@ -28508,5 +28524,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2910
 msgid "Locality"
 msgstr "Местност"
@@ -28514,10 +28530,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2912
 msgid "Edit Locality"
 msgstr "Редактирай местност"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2917
 msgid "Island"
 msgstr "Остров"
@@ -28525,10 +28541,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2901
+#: build/trans_presets.java:2919
 msgid "Edit Island"
 msgstr "Редактирай остров"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2924
 msgid "Islet"
 msgstr "Скала"
@@ -28536,5 +28552,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2926
 msgid "Edit Islet"
 msgstr "Редактиране на: скала"
@@ -28542,5 +28558,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2932
 msgid "Cave Entrance"
 msgstr "Пещерен вход"
@@ -28548,10 +28564,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:2934
 msgid "Edit Cave Entrance"
 msgstr "Редактиране пещерен вход"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2938
 msgid "Peak"
 msgstr "Връх"
@@ -28559,10 +28575,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2940
 msgid "Edit Peak"
 msgstr "Редактиране връх"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2945
 msgid "Glacier"
 msgstr "Ледник"
@@ -28570,10 +28586,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2947
 msgid "Edit Glacier"
 msgstr "Редактиране ледник"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2952
 msgid "Volcano"
 msgstr "Вулкан"
@@ -28581,70 +28597,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:2954
 msgid "Edit Volcano"
 msgstr "Редактиране вулкан"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:2960
 msgid "Boundaries"
 msgstr "Граници"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2961
 msgid "National"
 msgstr "Национална"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2962
 msgid "Edit National Boundary"
 msgstr "Редактирай национална граница"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2967
 msgid "Administrative"
 msgstr "Административна"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2968
 msgid "Edit Administrative Boundary"
 msgstr "Редактирай административна граница"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2955
+#: build/trans_presets.java:2973
 msgid "Civil"
 msgstr "Гражданска"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2956
+#: build/trans_presets.java:2974
 msgid "Edit Civil Boundary"
 msgstr "Редактирай гражданска граница"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2979
 msgid "Political"
 msgstr "Политическа"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2980
 msgid "Edit Political Boundary"
 msgstr "Редактирай политическа граница"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2985
 msgid "National park"
 msgstr "Национален парк"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2986
 msgid "Edit National Park Boundary"
 msgstr "Редактирай граница национален парк"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2992
 msgid "Land use"
 msgstr "Земеползване"
 
 #. group "Land use"
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2993
 msgid "Tree"
 msgstr "Дърво"
@@ -28653,15 +28669,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2996
 msgid "Edit Tree"
 msgstr "Редактирай дърво"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3001
 msgid "Botanical Name"
 msgstr "Ботаническо название"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3003
 msgid "Wood"
 msgstr "Гора"
@@ -28670,5 +28686,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:3006
 msgid "Edit Wood"
 msgstr "Редактирай гората"
@@ -28676,17 +28692,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2991 build/trans_presets.java:3000
+#: build/trans_presets.java:3009 build/trans_presets.java:3018
 msgid "coniferous"
 msgstr "иглолистен"
 
-#: build/trans_presets.java:2991 build/trans_presets.java:3000
+#: build/trans_presets.java:3009 build/trans_presets.java:3018
 msgid "deciduous"
 msgstr "широколистен"
 
-#: build/trans_presets.java:2991 build/trans_presets.java:3000
+#: build/trans_presets.java:3009 build/trans_presets.java:3018
 msgid "mixed"
 msgstr "смесен"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3011
 msgid "Forest"
 msgstr "Гора"
@@ -28695,14 +28711,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3014
 msgid "Edit Forest Landuse"
 msgstr "Редактирай гора"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3020
 msgid "Nature Reserve"
 msgstr "Природен резерват"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3021
 msgid "Edit Nature Reserve"
 msgstr "Редактирай природен резерват"
@@ -28710,25 +28726,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3026
 msgid "Scree"
 msgstr "Сипей"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3027
 msgid "Edit Scree"
 msgstr "Редактирай сипей"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3031
 msgid "Scrub"
 msgstr "Шубрак"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3032
 msgid "Edit Scrub"
 msgstr "Редактирай шубрака"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3036
 msgid "Fell"
 msgstr "Скалист склон"
@@ -28736,10 +28752,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3038
 msgid "Edit Fell"
 msgstr "Редактирай скалист склон"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:3042
 msgid "Heath"
 msgstr "Пустош"
@@ -28747,5 +28763,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3044
 msgid "Edit Heath"
 msgstr "Редактиране пустош"
@@ -28753,5 +28769,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3049
 msgid "Farmyard"
 msgstr "Двор ферма"
@@ -28760,45 +28776,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3052
 msgid "Edit Farmyard Landuse"
 msgstr "Редактирай двор ферма"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:3057
 msgid "Farmland"
 msgstr "Обработваема земя"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3058
 msgid "Edit Farmland Landuse"
 msgstr "Редактирай обработваема земя"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3063
 msgid "Meadow"
 msgstr "Поляна"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3064
 msgid "Edit Meadow Landuse"
 msgstr "Редактиране поляна"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3069
 msgid "Vineyard"
 msgstr "Лозе"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3070
 msgid "Edit Vineyard Landuse"
 msgstr "Редактирай лозе"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3075
 msgid "Allotments"
 msgstr "Земя за лично ползване"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3076
 msgid "Edit Allotments Landuse"
 msgstr "Редактиране на: Земя за лично ползване"
@@ -28806,25 +28822,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3082
 msgid "Garden"
 msgstr "Градина"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3083
 msgid "Edit Garden"
 msgstr "Редактирай градина"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3087
 msgid "Grass"
 msgstr "Трева"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3088
 msgid "Edit Grass Landuse"
 msgstr "Редактирай трева"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3093
 msgid "Village Green"
 msgstr "Зелено село"
@@ -28832,10 +28848,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3095
 msgid "Edit Village Green Landuse"
 msgstr "Редактирай зелено селище"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3100
 msgid "Common"
 msgstr "Общи"
@@ -28843,20 +28859,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3084
+#: build/trans_presets.java:3102
 msgid "Edit Common"
 msgstr "Редактирай общи"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3106
 msgid "Park"
 msgstr "Парк"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3107
 msgid "Edit Park"
 msgstr "Редактирай парк"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3111
 msgid "Recreation Ground"
 msgstr "Спортна площадка"
@@ -28864,5 +28880,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3113
 msgid "Edit Recreation Ground Landuse"
 msgstr "Редактирай спортна площадка"
@@ -28870,15 +28886,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3119
 msgid "Residential area"
 msgstr "Жилищна зона"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3120
 msgid "Edit Residential Landuse"
 msgstr "Редактирай жилищна зона"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3125
 msgid "Graveyard"
 msgstr "Църковно гробище"
@@ -28886,9 +28902,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3109
+#: build/trans_presets.java:3127
 msgid "Edit Graveyard"
 msgstr "Редактирай църковно гробище"
 
-#: build/trans_presets.java:3115
+#: build/trans_presets.java:3133
 msgid "Cemetery"
 msgstr "Гробище"
@@ -28896,39 +28912,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3135
 msgid "Edit Cemetery Landuse"
 msgstr "Редактирай гробище"
 
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3142
 msgid "Retail"
 msgstr "Търговия на дребно"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3143
 msgid "Edit Retail Landuse"
 msgstr "Редактирай търговия на дребно"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3148
 msgid "Commercial"
 msgstr "Търговия"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3149
 msgid "Edit Commercial Landuse"
 msgstr "Редактирай търговия"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3154
 msgid "Industrial"
 msgstr "Промишленост"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3155
 msgid "Edit Industrial Landuse"
 msgstr "Редактирай промишленост"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3160
 msgid "Railway land"
 msgstr "Железопътен път"
@@ -28936,15 +28952,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3162
 msgid "Edit Railway Landuse"
 msgstr "Редактирай ЖП"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3167
 msgid "Military"
 msgstr "Военен"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3168
 msgid "Edit Military Landuse"
 msgstr "Редакирай военна земя"
@@ -28952,50 +28968,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3174
 msgid "Construction area"
 msgstr "Строителна площадка"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3175
 msgid "Edit Construction Landuse"
 msgstr "Редактирай строителна площадка"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3180
 msgid "Brownfield"
 msgstr "Индустриални развалини"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3181
 msgid "Edit Brownfield Landuse"
 msgstr "Редактирай ундустриални развалини"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3186
 msgid "Greenfield"
 msgstr "Зелени площи"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3169
+#: build/trans_presets.java:3187
 msgid "Edit Greenfield Landuse"
 msgstr "Редактирай зелени площи"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3192
 msgid "Landfill"
 msgstr "Сметище"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3193
 msgid "Edit Landfill Landuse"
 msgstr "Редактирай сметище"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3198
 msgid "Quarry"
 msgstr "Кариера"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3199
 msgid "Edit Quarry Landuse"
 msgstr "Редактирай кариера"
@@ -29005,5 +29021,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3211
 msgid "Edit Multipolygon"
 msgstr "Редактиране мултиполигон"
@@ -29015,5 +29031,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3199 build/trans_presets.java:3216
+#: build/trans_presets.java:3217 build/trans_presets.java:3234
 msgid "outer segment"
 msgstr "външен сегмент"
@@ -29021,5 +29037,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3200 build/trans_presets.java:3217
+#: build/trans_presets.java:3218 build/trans_presets.java:3235
 msgid "inner segment"
 msgstr "вътрешен сегмент"
@@ -29027,5 +29043,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3203
+#: build/trans_presets.java:3221
 msgid "Boundary"
 msgstr ""
@@ -29036,5 +29052,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3208
+#: build/trans_presets.java:3226
 msgid "Edit Boundary"
 msgstr ""
@@ -29042,36 +29058,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3230
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3230
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3230
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3230
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3230
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3231
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3218
+#: build/trans_presets.java:3236
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3237
 msgid "Administration centre"
 msgstr ""
@@ -29079,5 +29095,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:3240
 msgid "Turn restriction"
 msgstr "Ограничения при завиване"
@@ -29086,5 +29102,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3243
 msgid "Edit Turn Restriction"
 msgstr "Редактиране на ограничения при завиване"
@@ -29092,34 +29108,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3245
 msgid "Restriction"
 msgstr "Ограничения"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3245
 msgid "no_left_turn"
 msgstr "забранен ляв завой"
 
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3245
 msgid "no_right_turn"
 msgstr "забранен десен завой"
 
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3245
 msgid "no_straight_on"
 msgstr "забранено напред"
 
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3245
 msgid "no_u_turn"
 msgstr "забранен обратен завой"
 
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3245
 msgid "only_right_turn"
 msgstr "само десен завой"
 
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3245
 msgid "only_left_turn"
 msgstr "само ляв завой"
 
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3245
 msgid "only_straight_on"
 msgstr "само направо"
@@ -29128,15 +29144,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3232
+#: build/trans_presets.java:3250
 msgid "from way"
 msgstr "от път"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3251
 msgid "via node or way"
 msgstr "през точка или път"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3252
 msgid "to way"
 msgstr "до път"
@@ -29144,5 +29160,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3255
 msgid "Route"
 msgstr "Маршрут"
@@ -29151,5 +29167,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3258
 msgid "Edit Route"
 msgstr "Редактиране маршрут"
@@ -29157,5 +29173,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3260
 msgid "Route type"
 msgstr "Тип маршрут"
@@ -29263,5 +29279,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3242 build/trans_style.java:233
+#: build/trans_presets.java:3260 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29272,17 +29288,17 @@
 msgstr "велосипед"
 
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3260
 msgid "bus"
 msgstr "автобус"
 
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3260
 msgid "road"
 msgstr "път"
 
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3260
 msgid "ferry"
 msgstr "ферибот"
 
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3260
 msgid "ski"
 msgstr "ски"
@@ -29350,5 +29366,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3242 build/trans_style.java:247
+#: build/trans_presets.java:3260 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29358,9 +29374,9 @@
 msgstr "пеш"
 
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3260
 msgid "tram"
 msgstr "трамваен маршрут"
 
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3260
 msgid "detour"
 msgstr "обиколка"
@@ -29374,10 +29390,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3242 build/trans_style.java:1233
+#: build/trans_presets.java:3260 build/trans_style.java:1233
 msgid "subway"
 msgstr "метро"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3263
 msgid "Symbol description"
 msgstr "Описание на символ"
@@ -29385,31 +29401,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3248
+#: build/trans_presets.java:3266
 msgid "Network"
 msgstr "Мрежа"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3268
 msgid "Route state"
 msgstr "Състояние на пътя"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3268
 msgid "proposed"
 msgstr "предложен"
 
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3268
 msgid "alternate"
 msgstr "алтернативен"
 
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3268
 msgid "temporary"
 msgstr "временен"
 
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3268
 msgid "connection"
 msgstr "връзка"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3269
 msgid "Color (hex)"
 msgstr "Цвят (hex)"
@@ -29418,30 +29434,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3254
+#: build/trans_presets.java:3272
 msgid "route segment"
 msgstr "сегмент от маршрут"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3273
 msgid "forward segment"
 msgstr "сегмент напред"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3274
 msgid "backward segment"
 msgstr "сегмент назад"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3275
 msgid "halt point"
 msgstr "точка за спиране"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3276
 msgid "forward halt point"
 msgstr "точка за спиране напред"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3259
+#: build/trans_presets.java:3277
 msgid "backward halt point"
 msgstr "точка за спиране назад"
@@ -29668,5 +29684,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4120
+#: build/trans_style.java:633 build/trans_style.java:4144
 msgid "deprecated"
 msgstr "остарял, вече невалиден"
@@ -32994,11 +33010,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4168 build/trans_style.java:4176
-#: build/trans_style.java:4184 build/trans_style.java:4192
-#: build/trans_style.java:4200 build/trans_style.java:4208
-#: build/trans_style.java:4216 build/trans_style.java:4224
-#: build/trans_style.java:4232 build/trans_style.java:4240
-#: build/trans_style.java:4248 build/trans_style.java:4256
-#: build/trans_style.java:4264
+#: build/trans_style.java:4192 build/trans_style.java:4200
+#: build/trans_style.java:4208 build/trans_style.java:4216
+#: build/trans_style.java:4224 build/trans_style.java:4232
+#: build/trans_style.java:4240 build/trans_style.java:4248
+#: build/trans_style.java:4256 build/trans_style.java:4264
+#: build/trans_style.java:4272 build/trans_style.java:4280
+#: build/trans_style.java:4288
 msgid "place"
 msgstr "място"
@@ -33012,5 +33028,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4272
+#: build/trans_style.java:4296
 msgid "tiger_data"
 msgstr ""
@@ -33365,4 +33381,62 @@
 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 ""
