Index: applications/editors/josm/i18n/po/ru.po
===================================================================
--- applications/editors/josm/i18n/po/ru.po	(revision 13948)
+++ applications/editors/josm/i18n/po/ru.po	(revision 14020)
@@ -8,307 +8,83 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-01 14:41+0100\n"
-"PO-Revision-Date: 2009-03-01 15:27+0000\n"
-"Last-Translator: SoNick_RND <sonick.rnd@gmail.com>\n"
+"POT-Creation-Date: 2009-03-08 15:15+0100\n"
+"PO-Revision-Date: 2009-03-04 22:07+0000\n"
+"Last-Translator: JekaDer <yourname@mail.ru>\n"
 "Language-Team: Koptev Oleg <koptev.oleg@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2009-03-01 22:32+0000\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2009-03-08 12:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 "X-Poedit-Language: Russian\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440
-#, java-format
-msgid ""
-"Setting the keyboard shortcut ''{0}'' for the action ''{1}'' ({2}) failed\n"
-"because the shortcut is already taken by the action ''{3}'' ({4}).\n"
-"\n"
-msgstr ""
-"Назначение комбинации клавиш ''{0}'' на действие ''{1}'' ({2}) невозможно,\n"
-"так как это сочетание уже используется действием ''{3}'' ({4}).\n"
-"\n"
-
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445
-msgid ""
-"This action will have no shortcut.\n"
-"\n"
-msgstr ""
-"На это действие не будет назначено сочетания клавиш\n"
-"\n"
-
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447
-#, java-format
-msgid ""
-"Using the shortcut ''{0}'' instead.\n"
-"\n"
-msgstr ""
-"Вместо этого, назначается сочетание ''{0}''\n"
-"\n"
-
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449
-msgid "(Hint: You can edit the shortcuts in the preferences.)"
-msgstr "(Подсказка: Горячие клавиши можно назначить в настройках программы)"
-
-#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32
-msgid "Do not show again"
-msgstr "Больше не показывать"
-
-#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305
-msgid "Information"
-msgstr "Информация"
-
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
-msgid "Do nothing"
-msgstr "Ничего не делать"
-
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
-msgid "Report Bug"
-msgstr "Сообщить об ошибке"
-
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
-msgid ""
-"An unexpected exception occurred.\n"
-"\n"
-"This is always a coding error. If you are running the latest\n"
-"version of JOSM, please consider being kind and file a bug report."
-msgstr ""
-"Произошла неожиданная ошибка.\n"
-"\n"
-"Это всегда говорит об ошибке в коде программы. Если Вы пользуетесь\n"
-"последней версией JOSM, будьте добры, отправьте отчёт об ошибке."
-
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
-msgid "Unexpected Exception"
-msgstr "Неожиданная ошибка"
-
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67
-#, java-format
-msgid "Please report a ticket at {0}"
-msgstr "Пожалуйста, создайте отчёт об ошибке по адресу {0}"
-
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68
-msgid "Include your steps to get to the error (as detailed as possible)!"
-msgstr ""
-"Укажите последовательность деййствий, которая вызвала ошибку (как можно "
-"подробнее!)"
-
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
-msgid ""
-"Try updating to the newest version of JOSM and all plugins before reporting "
-"a bug."
-msgstr ""
-"Попытайтесь обновиться до новейшей версии модуля перед созданием отчёта об "
-"ошибке."
-
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
-msgid "Be sure to include the following information:"
-msgstr "Прикрепите следующую информацию к отчёту:"
-
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(Текст уже скопирован в буфер обмена)"
-
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:289
-msgid "This is after the end of the recording"
-msgstr "Это позже конца записи"
-
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:329
-msgid "Error playing sound"
-msgstr "Ошибка при воспроизведении звука"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:39
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:94
-msgid "Contacting OSM Server..."
-msgstr "Подключение к серверу OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:50
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:32
-msgid "Downloading OSM data..."
-msgstr "Скачивание данных OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:266
-msgid "NullPointerException, possibly some missing tags."
-msgstr "Ошибка! Возможно отсутствуют тэги."
-
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83
-msgid "Preparing data..."
-msgstr "Подготовка данных..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38
-msgid "Error during parse."
-msgstr "Ошибка при разборе."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:62
-msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
-msgstr ""
-"Не удается соединиться с сервером OSM. Пожалуйста, проверьте Ваше интернет-"
-"соединение."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:69
-msgid ""
-"Server returned internal error. Try a reduced area or retry after waiting "
-"some time."
-msgstr ""
-"Сервер сообщил о внутренней ошибке. Попробуйте уменьшить область, или "
-"повторите попытку позже."
-
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50
-#, java-format
-msgid "Downloading points {0} to {1}..."
-msgstr "Загрузка точек с {0} до {1}..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:165
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:167
-msgid "Unknown version"
-msgstr "Неизвестная версия"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226
-msgid "Found <nd> element in non-way."
-msgstr "Найден элемент <nd> вне пути."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
-msgid "<nd> has zero ref"
-msgstr "у <nd> нет ссылок ref"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-msgid "Found <member> element in non-relation."
-msgstr "Найден тэг <member> вне отношения."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
-msgid "Incomplete <member> specification with ref=0"
-msgstr "Неполная спецификация <member> с ref=0"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295
-msgid "Illegal object with id=0"
-msgstr "Недопустимый объект с id=0"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
-#, java-format
-msgid "Missing required attribute \"{0}\"."
-msgstr "Отсутствует необходимый атрибут \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378
-#, java-format
-msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
-msgid "Prepare OSM data..."
-msgstr "Подготовка данных..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:522
-msgid "Ill-formed node id"
-msgstr "Неверный номер точки"
-
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:287
-msgid "Parse error: invalid document structure for gpx document"
-msgstr "Ошибка разбора: неправильная структура документа gpx"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:27
-msgid "Contacting Server..."
-msgstr "Соединение с сервером..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Опишите изменения для закачиваемых данных:"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Commit comment"
-msgstr "Комментарий правки"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
-#, java-format
-msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:114
-#, java-format
-msgid "An error occurred: {0}"
-msgstr "Произошла ошибка: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190
-msgid "Opening changeset..."
-msgstr "Открывается список правок..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224
-msgid "Server does not support changesets"
-msgstr "Сервер не поддерживает управление версиями"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607
-msgid "Unknown host"
-msgstr "Неизвестный хост"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282
-msgid "Preparing..."
-msgstr "Подготовка..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292
-msgid "Uploading..."
-msgstr "Закачка..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375
-msgid "Closing changeset..."
-msgstr "Закрывается список правок..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650
-msgid "Transfer aborted due to error (will wait for 5 seconds):"
-msgstr "Передача прервана из-за ошибки (повторная попытка через 5 с):"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
-msgid "Incorrect password or username."
-msgstr "Неправильный пароль или имя пользователя."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-msgid "Username"
-msgstr "Имя пользователя"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-msgid "Password"
-msgstr "Пароль"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
-msgid "Warning: The password is transferred unencrypted."
-msgstr "Внимание: Пароль будет передан в незашифрованном виде."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
-msgid "Save user and password (unencrypted)"
-msgstr "Сохранить имя пользователя и пароль (не зашифровано)"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:93
-msgid "Enter Password"
-msgstr "Введите пароль"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
-msgid "Login"
-msgstr "Идентификатор пользователя"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/Main.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+msgid "Creating main GUI"
+msgstr "Создание интерфейса"
+
+#. FIXME why is help not a JosmAction?
+#: ../core/src/org/openstreetmap/josm/Main.java:195
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:143
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:278
+msgid "Help"
+msgstr "Справка"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:258
+msgid "The projection could not be read from preferences. Using EPSG:4326"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/Main.java:345
+msgid "Hint: Some changes came from uploading new data to the server."
+msgstr "Прим.: Некоторые изменения произошли из-за загрузки данных на сервер."
+
+#: ../core/src/org/openstreetmap/josm/Main.java:346
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
+msgid "Unsaved Changes"
+msgstr "Несохранённые изменения"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:347
+msgid "There are unsaved changes. Discard the changes and continue?"
+msgstr "Присутствуют несохранённые изменения. Сбросить изменения и продолжить?"
+
 #: ../core/src/org/openstreetmap/josm/Main.java:348
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:29
+msgid "Save and Exit"
+msgstr "Сохранить и выйти"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:348
+msgid "Discard and Exit"
+msgstr "Отменить и выйти"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
@@ -316,74 +92,15 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83
-#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105
 msgid "Cancel"
 msgstr "Отмена"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:132
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
-msgid "Aborting..."
-msgstr "Прерывание..."
-
-#: ../core/src/org/openstreetmap/josm/Main.java:186
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
-msgid "Creating main GUI"
-msgstr "Создание интерфейса"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:195
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:143
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:278
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:56
-msgid "Help"
-msgstr "Справка"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:258
-msgid "The projection could not be read from preferences. Using EPSG:4326"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:345
-msgid "Hint: Some changes came from uploading new data to the server."
-msgstr ""
-"Прим.: Некоторые изменения произошли из-за загрузки данных на сервер."
-
-#: ../core/src/org/openstreetmap/josm/Main.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
-msgid "Unsaved Changes"
-msgstr "Несохранённые изменения"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:347
-msgid "There are unsaved changes. Discard the changes and continue?"
-msgstr ""
-"Присутствуют несохранённые изменения. Сбросить изменения и продолжить?"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:348
-msgid "Save and Exit"
-msgstr "Сохранить и выйти"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:348
-msgid "Discard and Exit"
-msgstr "Отменить и выйти"
-
 #: ../core/src/org/openstreetmap/josm/Main.java:374
 #, java-format
@@ -396,207 +113,2457 @@
 msgstr "Игнорируется неверный адрес файла: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
-msgid "min lat"
-msgstr "мин. широта"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
-msgid "min lon"
-msgstr "мин. долгота"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
-msgid "max lat"
-msgstr "макс. широта"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
-msgid "max lon"
-msgstr "макс. долгота"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:172
+msgid "UNKNOWN"
+msgstr "НЕИЗВЕСТНО"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:111
+msgid "About"
+msgstr "О программе"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:111
+msgid "Display the about screen."
+msgstr "Отобразить информацию о программе."
+
+#. TODO: put in a platformHook for system that have no console by default
+#. Add the name of this application
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:141
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:225
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:293
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:157
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+msgid "Java OpenStreetMap Editor"
+msgstr "Редактор OpenStreetMap на Java"
+
+#. Add the version number
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:125
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#, java-format
+msgid "Version {0}"
+msgstr "Версия {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:127
+#, java-format
+msgid "Last change at {0}"
+msgstr "Последние изменения: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:129
+#, java-format
+msgid "Java Version {0}"
+msgstr "Версия Java: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+msgid "Homepage"
+msgstr "Домашняя страница"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
+msgid "Bug Reports"
+msgstr "Отчёты об ошибках"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
+msgid "News about JOSM"
+msgstr "Новости о JOSM"
+
+#. <button label="Camping" hotkey="Z" icon="caravan">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Camping"/>
+#. </button>
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: build/trans_surveyor.java:64
+msgid "Info"
+msgstr "Сведения"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+msgid "Readme"
+msgstr "Для прочтения"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+msgid "Revision"
+msgstr "Версия"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
+msgid "Contribution"
+msgstr "Авторы"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
+#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:141
+msgid "Plugins"
+msgstr "Модули"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+msgid "About JOSM..."
+msgstr "О программе"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
+msgid "File could not be found."
+msgstr "Файл не найден"
+
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53
+msgid "Add Node..."
+msgstr "Добавить точку..."
+
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+msgid "Add a node by entering latitude and longitude."
+msgstr "Добавить точку, указав её широту и долготу"
+
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34
+#: ../plugins/livegps/src/LiveGpsPlugin.java:54
+#, java-format
+msgid "Edit: {0}"
+msgstr "Править: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37
+msgid "Enter the coordinates for the new node."
+msgstr "Введите координаты новой точки"
+
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38
+msgid "Use decimal degrees."
+msgstr "Использовать десятичные градусы"
+
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39
+msgid "Negative values denote Western/Southern hemisphere."
+msgstr "Отрицательные значения обозначают западное/южное полушарие"
+
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../plugins/grid/src/grid/GridLayer.java:193
+#: ../plugins/livegps/src/LiveGpsDialog.java:54
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
+msgid "Latitude"
+msgstr "Широта"
+
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
+#: ../plugins/grid/src/grid/GridLayer.java:195
+#: ../plugins/livegps/src/LiveGpsDialog.java:56
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96
+msgid "Longitude"
+msgstr "Долгота"
+
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245
+msgid "Align Nodes in Circle"
+msgstr "Выстроить точки окружностью"
+
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
+msgid "Move the selected nodes into a circle."
+msgstr "Переместить выделенные точки так, чтобы они сформировали окружность."
+
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
+#: ../plugins/terracer/src/terracer/TerracerAction.java:82
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:113
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
+#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#, java-format
+msgid "Tool: {0}"
+msgstr "Инструмент: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:93
+msgid "Some of the nodes are (almost) in the line"
+msgstr "Некоторые точки - (почти) на одной линии"
+
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180
+msgid "Please select at least four nodes."
+msgstr "Выделите не менее четырёх точек."
+
+#. Do it!
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:123
+msgid "Align Nodes in Line"
+msgstr "Выстроить точки линией"
+
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
+msgid "Move the selected nodes in to a line."
+msgstr ""
+"Переместить выделенные точки на прямую, проходящую через две крайние точки."
+
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58
+msgid "Please select at least three nodes."
+msgstr "Выделите не менее трёх точек."
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+msgid "data"
+msgstr "данные"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+msgid "layer"
+msgstr "слой"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+msgid "selection"
+msgstr "выделение"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162
+msgid "conflict"
+msgstr "конфликт"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+msgid "download"
+msgstr "скачанное"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#, java-format
+msgid "Zoom to {0}"
+msgstr "Показать {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#, java-format
+msgid "Zoom the view to {0}."
+msgstr "Изменить масштаб чтобы показать {0}."
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#, java-format
+msgid "View: {0}"
+msgstr "Вид: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+msgid "Nothing selected to zoom to."
+msgstr "Ничего не выделено для показа."
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+msgid "No conflicts to zoom to"
+msgstr "Нет конфликтов чтобы их показать."
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+msgid "Combine Way"
+msgstr "Объединить линию"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+msgid "Combine several ways into one."
+msgstr "Объединить несколько линий в одну."
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:67
+msgid "Please select at least two ways to combine."
+msgstr "Выделите не менее двух линий для объединения."
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112
+msgid "Combine ways with different memberships?"
+msgstr "Объединить линии, входящие в разные отношения?"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113
 msgid ""
-"URL from www.openstreetmap.org (you can paste an URL here to download the "
-"area)"
-msgstr ""
-"URL с www.openstreetmap.org (вы можете вставить URL сюда чтобы загрузить "
-"область)"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
-msgid "Bounding Box"
-msgstr "Рамка"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:45
+"The selected ways have differing relation memberships.  Do you still want to "
+"combine them?"
+msgstr ""
+"У выделенных линий различается участие в отношениях. Всё равно хотите их "
+"объединить?"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
+msgid "Combine Anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141
+msgid "Change directions?"
+msgstr "Изменить направления?"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142
+msgid ""
+"The ways can not be combined in their current directions.  Do you want to "
+"reverse some of them?"
+msgstr ""
+"Линии с их текущими направлениями не объединить. Обратить некоторые линии?"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
+msgid "Reverse and Combine"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:123
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:315
+msgid "Enter values for all conflicts."
+msgstr "Введите значения для всех конфликтов."
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317
+msgid "Solve Conflicts"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231
+#, java-format
+msgid "Combine {0} ways"
+msgstr "Объединить {0} линии"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:256
+msgid "All the ways were empty"
+msgstr "Все линии были пустыми"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:285
+msgid ""
+"Could not combine ways (They could not be merged into a single string of "
+"nodes)"
+msgstr ""
+"Не удаётся объединить линии: они не могут быть представлены одной "
+"последовательностью точек."
+
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35
+msgid "Copy"
+msgstr "Копировать"
+
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:34
+msgid "Copy selected objects to paste buffer."
+msgstr "Копировать выделенные объекты в буфер обмена."
+
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:125
+msgid "Please select something to copy."
+msgstr "Выделите что-нибудь для копирования."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+msgid "Create Circle"
+msgstr "Создать окружность"
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+msgid "Create a circle from three selected nodes."
+msgstr "Создать окружность по трём выделенным точкам"
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101
+msgid "Please select exactly three nodes or one way with exactly three nodes."
+msgstr ""
+"Пожалуйста, выберите ровно три точки, или линию, состоящую ровно из трёх "
+"точек."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
+msgid "Those nodes are not in a circle."
+msgstr "Точки не расположены по кругу"
+
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:293
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:541
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+msgid "Delete"
+msgstr "Удалить"
+
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
+msgid "Delete selected objects."
+msgstr "Удалить выделенные объекты."
+
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379
+msgid "Overwrite"
+msgstr "Перезаписать"
+
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379
+msgid "File exists. Overwrite?"
+msgstr "Файл уже существует. Перезаписать?"
+
+#. Do it!
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:124
+msgid "Distribute Nodes"
+msgstr "Распределить точки"
+
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
+msgid "Distribute the selected nodes to equal distances along a line."
+msgstr "Расположить точки на равных расстояниях вдоль линии."
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+msgid "Download from OSM..."
+msgstr "Скачать с OSM..."
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+msgid "Download map data from the OSM server."
+msgstr "Скачать картографические данные с сервера OSM."
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#, java-format
+msgid "File: {0}"
+msgstr "Файл: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+msgid "Download"
+msgstr "Скачать"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69
+msgid "Please select at least one task to download"
+msgstr "Выберите хотя бы один тип данных для загрузки."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23
+msgid "Duplicate"
+msgstr "Дублировать"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22
+msgid "Duplicate selection by copy and immediate paste."
+msgstr "Создать копию выделения копированием и вставкой."
+
+#. <button label="Info" hotkey="I">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Info"/>
+#. </button>
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
+#: build/trans_surveyor.java:68
+msgid "Exit"
+msgstr "Выход"
+
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
+msgid "Exit the application."
+msgstr "Выйти из программы"
+
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
+msgid "OSM Server Files"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
+msgid "GPX Files"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28
+msgid "NMEA-0183 Files"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"Внимание: GPL несовместима с лицензией OSM. Не загружайте треков, "
+"лицензированных под GPL"
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
+msgid "Export to GPX..."
+msgstr "Экспорт в GPX..."
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+msgid "Export the data to GPX file."
+msgstr "Экспортировать данные в GPX файл"
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55
+msgid "Nothing to export. Get some data first."
+msgstr "Нет данных для экспорта. Создайте данные."
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79
+msgid "gps track description"
+msgstr "описание трека GPS"
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85
+msgid "Add author information"
+msgstr "Добавить информацию об авторе"
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88
+msgid "Real name"
+msgstr "Настоящее имя"
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
+msgid "Email"
+msgstr "Электронная почта"
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
+msgid "Copyright (URL)"
+msgstr "Авторские права (ссылка)"
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100
+msgid "Predefined"
+msgstr "Набор"
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102
+msgid "Copyright year"
+msgstr "Авторские права (год)"
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:110
+msgid "Keywords"
+msgstr "Ключевые слова"
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:115
+msgid "Export options"
+msgstr "Опции экспорта"
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
+msgid "Export and Save"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+"Ошибка при экспорте {0}:\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:598
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:115
+#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:64
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+msgid "Error"
+msgstr "Ошибка"
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:197
+msgid "Choose a predefined license"
+msgstr "Выберите лицензию из набора"
+
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+msgid "JOSM Online Help"
+msgstr "Online-справка по JOSM"
+
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:104
+msgid "Open in Browser"
+msgstr "Открыть в браузере"
+
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../plugins/grid/src/grid/GridPlugin.java:43
+#: ../plugins/grid/src/grid/GridPlugin.java:49
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:510
+msgid "Edit"
+msgstr "Правка"
+
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
+msgid "Reload"
+msgstr "Обновить"
+
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
+msgid "Can only edit help pages from JOSM Online Help"
+msgstr "Возможно только редактирование справочных страниц JOSM Online Help"
+
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:176
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:195
+#, java-format
+msgid "Error while loading page {0}"
+msgstr "Ошибка при загрузке страницы {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:28
+msgid "History of Element"
+msgstr "История элемента"
+
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:26
+msgid "Display history information about OSM ways or nodes."
+msgstr "Открыть в браузере историю изменений выделенного объекта."
+
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:60
+msgid ""
+"Please select at least one node, way or relation. Only already uploaded "
+"elements have a history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
+msgid "Join Node to Way"
+msgstr "Включить точку в линию"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
+msgid "Join a node into the nearest way segments"
+msgstr "Включить точку в состав ближайшей линии."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66
+msgid "Join Node and Line"
+msgstr "Включить точку в линию"
+
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30
+msgid "No Shortcut"
+msgstr "Нет ярлыка"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
+msgid "Merge Nodes"
+msgstr "Объединить точки"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+msgid "Merge nodes into the oldest one."
+msgstr "Объединить точки в одну (более старую)"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:73
+msgid "Please select at least two nodes to merge."
+msgstr "Пожалуйста, выберите как минимум две точки для объединения."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:148
+msgid "Merge nodes with different memberships?"
+msgstr "Объединить точки из разных отношений?"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:149
+msgid ""
+"The selected nodes have differing relation memberships.  Do you still want "
+"to merge them?"
+msgstr ""
+"Выделенные точки участвуют в различных отношениях. Всё равно хотите "
+"объединить?"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
+msgid "Merge Anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239
+msgid "Cannot merge nodes: Would have to delete a way that is still used."
+msgstr ""
+"Не удаётся объединить точки: пришлось бы удалить линию, которая еще "
+"используется."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:277
+#, java-format
+msgid "Merge {0} nodes"
+msgstr "Объединить {0} точек"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+msgid "up"
+msgstr "вверх"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#, java-format
+msgid "Move objects {0}"
+msgstr "Переместить объекты {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+msgid "down"
+msgstr "вниз"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+msgid "left"
+msgstr "влево"
+
+#. dir == Direction.RIGHT) {
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+msgid "right"
+msgstr "вправо"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#, java-format
+msgid "Move {0}"
+msgstr "Переместить {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#, java-format
+msgid "Moves Objects {0}"
+msgstr "Перемещает объекты {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+msgid "Cannot move objects outside of the world."
+msgstr "Невозможно переместить объекты за пределы мира."
+
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94
+msgid "New"
+msgstr "Создать"
+
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+msgid "Create a new map."
+msgstr "Создать новую карту."
+
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22
+msgid "unnamed"
+msgstr "безымянный"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42
+msgid "Open..."
+msgstr "Открыть..."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41
+msgid "Open a file."
+msgstr "Открыть файл."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:68
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170
+#, java-format
+msgid "Error while parsing {0}"
+msgstr "Ошибка парсинга {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:71
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Невозможно прочитать \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108
+#, java-format
+msgid "Unknown file extension: {0}"
+msgstr "Неизвестное расширение файла: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:160
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123
+#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:88
+#, java-format
+msgid "Markers from {0}"
+msgstr "Маркеры из {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:134
+msgid "Coordinates imported: "
+msgstr "Координаты импортированы: "
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135
+msgid "Malformed sentences: "
+msgstr "Неправильно составленные предложения: "
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136
+msgid "Checksum errors: "
+msgstr "Ошибки контрольных сумм: "
+
+#. don't scare the user unneccessarily
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:138
+msgid "Unknown sentences: "
+msgstr "Неизвестные предложения: "
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139
+msgid "Zero coordinates: "
+msgstr "Пустые координаты: "
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:143
+msgid "NMEA import success"
+msgstr "Импорт NMEA успешно завершён"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:147
+msgid "NMEA import faliure!"
+msgstr "Сбой при импорте NMEA!"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+msgid "Open Location..."
+msgstr "Открыть адрес..."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
+msgid "Open an URL."
+msgstr "Открыть ссылку."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38
+msgid "Separate Layer"
+msgstr "На отдельный слой"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41
+msgid "Enter URL to download:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46
+msgid "Download Location"
+msgstr "Путь загрузки"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
+msgid "Download URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
+msgid "Orthogonalize Shape"
+msgstr "Сделать углы прямыми"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41
+msgid "Move nodes so all angles are 90 or 270 degree"
+msgstr ""
+"Выстроить точки таким образом, чтобы углы между линиями были 90 или 270 "
+"градусов"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58
+msgid "Only two nodes allowed"
+msgstr "Возможно выбрать только две точки"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66
+msgid "Selection must consist only of ways."
+msgstr "Возможно выбирать только линии."
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73
+msgid "Please select one or more closed ways of at least four nodes."
+msgstr ""
+"Пожалуйста, выберите один или более путей, состоящих из как минимум четырех "
+"точек."
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88
+msgid "Please select ways with almost right angles to orthogonalize."
+msgstr ""
+"Пожалуйста, выберите контуры, у которых углы почти прямые, для применения "
+"функции."
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95
+msgid ""
+"<html>You are using the EPSG:4326 projection which might lead<br>to "
+"undesirable results when doing rectangular alignments.<br>Change your "
+"projection to get rid of this warning.<br>Do you want to continue?"
+msgstr ""
+"<html>Используется проекция EPSG:4326, что может привести<br>к нежелательным "
+"результатам при выравнивании углов.<br>Измените проекцию, чтобы это "
+"предупреждение больше не появлялось.<br>Всё равно продолжить?"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+msgid "Only one node selected"
+msgstr "Выбрана только одна точка"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243
+msgid "Orthogonalize"
+msgstr "Сделать углы прямыми"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:112
+msgid "Paste"
+msgstr "Вставить"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+msgid "Paste contents of paste buffer."
+msgstr "Вставить содержимое буфера."
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:58
+msgid "Paste Tags"
+msgstr "Вставить тэги"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28
+msgid "Apply tags of contents of paste buffer to all selected items."
+msgstr "Применить тэги из буфера ко всем выделенным объектам."
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+msgid "Preferences..."
+msgstr "Настройки..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+msgid "Open a preferences page for global settings."
+msgstr "Изменить настройки программы"
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:45
+msgid "Preferences"
+msgstr "Настройки"
+
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+msgid "Redo"
+msgstr "Вернуть"
+
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo the last undone action."
+msgstr "Вернуть последнее отменённое действие."
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63
+msgid "Rename layer"
+msgstr "Переименовать слой"
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+msgid "Also rename the file"
+msgstr "Переименовать файл"
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87
+#, java-format
+msgid "Could not rename the file \"{0}\"."
+msgstr "Невозможно переименовать файл \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+msgid "Reverse Ways"
+msgstr "Изменить направление линии"
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+msgid "Reverse the direction of all selected ways."
+msgstr "Изменить направление линии на противоположное."
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56
+msgid "Please select at least one way."
+msgstr "Пожалуйста, выберите как минимум одну линию."
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
+msgid "Reverse ways"
+msgstr "Изменить направление линии"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+msgid "Save"
+msgstr "Сохранить"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26
+msgid "Save the current data."
+msgstr "Сохранить текущие данные."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:73
+msgid ""
+"Internal Error: cannot check conditions for no layer. Please report this as "
+"a bug."
+msgstr ""
+"Внутренняя ошибка: невозможно проверить условия без слоя. Пожалуйста, "
+"создайте отчёт об ошибке."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:77
+msgid "No document open so nothing to save."
+msgstr "Нет открытых документов. Нечего сохранять."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+msgid "Empty document"
+msgstr "Пустой документ"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+msgid "The document contains no data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+msgid "Save anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148
+msgid "Conflicts"
+msgstr "Конфликты"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
+msgid ""
+"There are unresolved conflicts. Conflicts will not be saved and handled as "
+"if you rejected all. Continue?"
+msgstr ""
+"Имеются неразрешенные конфликты. Конфликтующие объекты не будут сохранены и "
+"будут обработаны, как будто вы отменили их все. Продолжить?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+msgid "Reject Conflicts and Save"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+msgid "Save GPX file"
+msgstr "Сохранить файл GPX"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+msgid "Save OSM file"
+msgstr "Сохранить файл OSM"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+msgid "Could not back up file."
+msgstr "Невозможно создать резервную копию."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+msgid "Unknown file extension."
+msgstr "Неизвестное расширение файла."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:171
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+msgid "An error occurred while saving."
+msgstr "При сохранении возникла ошибка."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:181
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
+msgid "An error occurred while restoring backup file."
+msgstr "При восстановлении из резервной копии возникла ошибка."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+msgid "Save As..."
+msgstr "Сохранить как..."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+msgid "Save the current data to a new file."
+msgstr "Сохранить текущие данные в новый файл."
+
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
+msgid "Select All"
+msgstr "Выбрать всё"
+
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+msgid ""
+"Select all undeleted objects in the data layer. This selects incomplete "
+"objects too."
+msgstr ""
+"Выделить все восстановленные объекты слоя данных. Также будут выделены "
+"незаконченные объекты."
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+msgid "Show Status Report"
+msgstr "Показать отчёт о состоянии"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+msgid "Show status report with useful information that can be attached to bugs"
+msgstr ""
+"Отображает отчёт о состоянии, содержащий полезную информацию, которую можно "
+"прикрепить к сообщению об ошибке"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#, java-format
+msgid "Help: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
+msgid "Status Report"
+msgstr "Отчёт о состоянии"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93
+msgid "Copy to clipboard and close"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+msgid "Close"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+msgid "Split Way"
+msgstr "Разделить линию"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+msgid "Split a way at the selected node."
+msgstr "Разделить линию в выбранной точке."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+msgid "The current selection cannot be used for splitting."
+msgstr "Текущее выделение невозможно разделить."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
+msgid "The selected node is not in the middle of any way."
+msgid_plural "The selected nodes are not in the middle of any way."
+msgstr[0] "Выбранная точка не является частью пути."
+msgstr[1] "Выбранные точки не являются частью пути."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
+msgid ""
+"There is more than one way using the node you selected. Please select the "
+"way also."
+msgid_plural ""
+"There is more than one way using the nodes you selected. Please select the "
+"way also."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+msgid "The selected nodes do not share the same way."
+msgstr "Выбранные точки не являются частью одной линии."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+msgid "The selected way does not contain the selected node."
+msgid_plural "The selected way does not contain all the selected nodes."
+msgstr[0] "Выбранная линия не содержит выбранной точки"
+msgstr[1] "Выбранная линия не содержит выбранных точек"
+msgstr[2] "Выбранная линия не содержит выбранных точек"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229
+msgid "You must select two or more nodes to split a circular way."
+msgstr "Чтобы разделить замкнутую линию, выберите две или более точки."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231
+msgid ""
+"The way cannot be split at the selected nodes. (Hint: Select nodes in the "
+"middle of the way.)"
+msgstr ""
+"Линию невозможно разделить в выделенных точках. (Выберите точки в середине "
+"линии)"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291
+msgid ""
+"A role based relation membership was copied to all new ways.\n"
+"You should verify this and correct it when necessary."
+msgstr ""
+"Участие в отношениях было применено ко всем новым линиям.\n"
+"Проверьте, и при необходимости внесите корректировки."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:296
+#, java-format
+msgid "Split way {0} into {1} parts"
+msgstr "Разделить линию {0} на {1} частей"
+
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+msgid "Toggle GPX Lines"
+msgstr "Показать/скрыть линии GPX"
+
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+msgid "Draw lines between raw gps points."
+msgstr "Отображать линии между точками трэков GPS"
+
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#, java-format
+msgid "Toggles the global setting ''{0}''."
+msgstr "Включает/выключает глобальную установку: «{0}»."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
+msgid "UnGlue Ways"
+msgstr "Разъединить линии"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+msgid "Duplicate nodes that are used by multiple ways."
+msgstr "Дублировать точки, используемые несколькими линиями."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80
+msgid "This node is not glued to anything else."
+msgstr "Данная точка не связана с чем-либо еще."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100
+msgid "None of these nodes are glued to anything else."
+msgstr "Ни одна из этих точек не притянута к другим."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+msgid "None of this way's nodes are glued to anything else."
+msgstr "Ни одна из этих линий не притянута к другим."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
+msgid "The current selection cannot be used for unglueing."
+msgstr "Выделенные объекты невозможно разъединить"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+msgid "Select either:"
+msgstr "Выберите один из вариантов:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
+msgid "* One tagged node, or"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+msgid "* One node that is used by more than one way, or"
+msgstr "* Одна точка, используемая несколькими линиями, либо"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+msgid "* One node that is used by more than one way and one of those ways, or"
+msgstr ""
+"* Одна точка, используемая несколькими линиями и одной из этих линий, либо"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+msgid ""
+"* One way that has one or more nodes that are used by more than one way, or"
+msgstr "* Одна линия, имеющая точки, используемые несколькими линиями, либо"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+msgid ""
+"* One way and one or more of its nodes that are used by more than one way."
+msgstr ""
+"* Одна линия, и одна или несколько её точек, которые используются "
+"несколькими линиями."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+msgid ""
+"Note: If a way is selected, this way will get fresh copies of the unglued\n"
+"nodes and the new nodes will be selected. Otherwise, all ways will get "
+"their\n"
+"own copy and all nodes will be selected."
+msgstr ""
+"Прим.: Если выбрана линия, она получит дубликаты узлов, \n"
+"и они будут выбраны. В противном случае, все линии получат\n"
+"дубликаты точек, и все точки будут выбраны"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:160
+msgid "Unglued Node"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:373
+#, java-format
+msgid "Dupe into {0} nodes"
+msgstr "Дублировать в {0} точек"
+
+#. only one changeCommand for a way, else garbage will happen
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:397
+#, java-format
+msgid "Dupe {0} nodes into {1} nodes"
+msgstr "Дублировать {0} точек в {1} точек"
+
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+msgid "Undo"
+msgstr "Отмена"
+
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+msgid "Undo the last action."
+msgstr "Отменить последнее действие."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+msgid "Unselect All"
+msgstr "Снять выделение"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+msgid "Unselect all objects."
+msgstr "Снять выделение со всех объектов."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23
+msgid "Unselect All (Focus)"
+msgstr "Снять выделение со всего (Фокус)"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34
+msgid "Unselect All (Escape)"
+msgstr "Снять выделение со всего (Escape)"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
+msgid "Update Data"
+msgstr "Обновить данные"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+msgid "Updates the current data layer from the server (re-downloads data)"
+msgstr "Обновить слой данных с сервера (скачать данные заново)"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:71
+msgid ""
+"No data to update found. Have you already opened or downloaded a data layer?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:77
+#, java-format
+msgid ""
+"This action will require {0} individual download requests. Do you wish to "
+"continue?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+msgid "Upload to OSM..."
+msgstr "Загрузить на OSM..."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
+msgid "Upload all changes to the OSM server."
+msgstr "Загрузить все изменения на OSM"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:78
+msgid "Objects to add:"
+msgstr "Новые объекты:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
+msgid "Objects to modify:"
+msgstr "Изменённые объекты:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
+msgid "Objects to delete:"
+msgstr "Удаляемые объекты:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
+msgid "Upload these changes?"
+msgstr "Загрузить эти изменения?"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+msgid "Upload Changes"
+msgstr "Загрузить изменения"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+msgid "Nothing to upload. Get some data first."
+msgstr "Нечего загружать. Сначала создайте данные."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
+msgid "There are unresolved conflicts. You have to resolve these first."
+msgstr "Присутствуют неразрешённые конфликты. Для начала, разрешите их"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
+msgid "No changes to upload."
+msgstr "Нет изменений для загрузки."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
+msgid "Uploading data"
+msgstr "Загрузка данных"
+
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+msgid "Zoom In"
+msgstr "Увеличить масштаб"
+
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+msgid "Zoom Out"
+msgstr "Уменьшить масштаб"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+msgid "Back"
+msgstr "Назад"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
+msgid "Jump back."
+msgstr "Перемотать назад."
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
+#, java-format
+msgid "Audio: {0}"
+msgstr "Звук: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
+msgid "Faster"
+msgstr "Быстрее"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12
+msgid "Faster Forward"
+msgstr "Играть быстрее."
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
+msgid "Forward"
+msgstr "Вперёд"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
+msgid "Jump forward"
+msgstr "Перемотать вперёд"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
+msgid "Next Marker"
+msgstr "Следующий маркер"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
+msgid "Play next marker."
+msgstr "Воспроизвести следующий маркер"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
+msgid "Play/Pause"
+msgstr "Воспроизвести/пауза"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
+msgid "Play/pause audio."
+msgstr "Воспроизвести/пауза"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
+msgid "Previous Marker"
+msgstr "Предыдущий маркер"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
+msgid "Play previous marker."
+msgstr "Воспроизвести предыдущий маркер"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
+msgid "Slower"
+msgstr "Медленнее"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12
+msgid "Slower Forward"
+msgstr "Играть медленнее."
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31
+msgid "Downloading GPS data"
+msgstr "Скачивание данных GPS"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47
+msgid "Downloaded GPX Data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78
+msgid "Raw GPS data"
+msgstr "Данные GPS"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+msgid "Downloading data"
+msgstr "Загрузка данных"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+msgid "No data imported."
+msgstr "Данные не импортированы"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:68
+#, fuzzy, java-format
+msgid "Data Layer {0}"
+msgstr "Слой данных"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:83
+msgid "OpenStreetMap data"
+msgstr "Данные OpenStreetMap"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:37
+msgid "Data Layer"
+msgstr "Слой данных"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:47
+#, java-format
+msgid "Download {0} of {1} ({2} left)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
+msgid "The following errors occured during mass download:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:89
+#, fuzzy
+msgid "Errors during Download"
+msgstr "Ошибка при разборе."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45
+msgid "Delete Mode"
+msgstr "Режим удаления"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47
+msgid "Delete nodes or ways."
+msgstr "Удалить точки или линии."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
+#, java-format
+msgid "Mode: {0}"
+msgstr "Режим: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131
+msgid ""
+"Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
+"when deleting a way. Ctrl: delete referring objects."
+msgstr ""
+"Щёлкните для удаления. Shift: удалить сегмент. Alt: не удалять "
+"неиспользуемые точки при удалении линии. Ctrl: удалить линию, но оставить "
+"точки."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
+msgid "Draw"
+msgstr "Рисовать"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90
+msgid "Draw nodes"
+msgstr "Рисовать точки"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
+msgid "Mode: Draw Focus"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
+msgid "selected"
+msgstr "выбранные"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:334
+msgid "Cannot add a node outside of the world."
+msgstr "Точка не может быть добавлена за пределами мира."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:486
+msgid "Add node"
+msgstr "Добавить точку"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:488
+msgid "Add node into way"
+msgstr "Вставить точку в линию"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493
+msgid "Connect existing way to node"
+msgstr "Присоединить линию к точке"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
+msgid "Add a new node to an existing way"
+msgstr "Добавить точку к линии"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
+msgid "Add node into way and connect"
+msgstr "Добавить точку к линии и объединить"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:876
+msgid "Create new node."
+msgstr ""
+
+#. We already know oldHighlights is not empty, but shift is pressed.
+#. We can assume the new node will be joined into an existing way
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:880
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888
+#, java-format
+msgid "Insert new node into way."
+msgid_plural "Insert new node into {0} ways."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:909
+msgid "Select node under cursor."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897
+msgid "Start new way from last node."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899
+msgid "Continue way from last node."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:911
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:921
+msgid "Finish drawing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
+msgid "Extrude"
+msgstr "Выдавливание"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+msgid "Create areas"
+msgstr "Создание областей"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248
+msgid "Extrude Way"
+msgstr "Выдавливание линии"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr "Отпустите кнопку мыши, чтобы выделить объекты в прямоугольнике."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263
+msgid "Draw a rectangle of the desired size, then release the mouse button."
+msgstr "Нарисуйте прямоугольник желаемых размеров, и отпустите кнопку мыши."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471
+msgid "Release the mouse button to stop rotating."
+msgstr "Отпустите кнопку мыши, чтобы прекратить вращение."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267
+msgid "Drag a way segment to make a rectangle."
+msgstr "Перемещайте сегмент линии, чтобы образовать прямоугольник"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
+msgid ""
+"Drag play head and release near track to play audio from there; SHIFT"
+"+release to synchronize audio at that point."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
+msgid "Select"
+msgstr "Выбор"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+msgid "Select, move and rotate objects"
+msgstr "Выбирать, двигать и вращать объекты"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#, java-format
+msgid "Add and move a virtual new node to way"
+msgid_plural "Add and move a virtual new node to {0} ways"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+msgid ""
+"Release the mouse button to stop moving. Ctrl to merge with nearest node."
+msgstr ""
+"Отпустите кнопку мыши, чтобы прекратить перемещение. Нажмите Ctrl для "
+"объединения с ближайшей точкой."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473
+msgid ""
+"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
+"Ctrl to rotate selected; or change selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
+msgid "Zoom"
+msgstr "Масштаб"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+msgid "Zoom and move map"
+msgstr "Изменять масштаб и двигать карту"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+msgid ""
+"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
+"move zoom with right button"
+msgstr ""
+"Меняйте масштаб колесом мыши, или клавишами  Ctrl+. и Ctrl+,; перемещайте "
+"карту, нажав правую кнопку мыши, или Ctrl+вверх/вниз/влево/вправо"
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:45
 msgid "Search..."
 msgstr "Поиск..."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120
-msgid "Null pointer exception, possibly some missing tags."
-msgstr "Нулевой исключение, возможно есть отсутствующие тэги"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168
-msgid "Please enter a search string"
-msgstr "Задайте строку для поиска"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186
-msgid "Cannot read place search results from server"
-msgstr "Не удается получить результаты поиска"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206
-msgid "Enter a place name to search for:"
-msgstr "Название места для поиска:"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
-#: trans_presets.java:2558
-msgid "Places"
-msgstr "Места"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:894
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:956
-msgid "name"
-msgstr "название"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
-#: trans_presets.java:1631 trans_presets.java:1799 trans_presets.java:1805
-#: trans_presets.java:1811 trans_presets.java:1817 trans_presets.java:1823
-#: trans_presets.java:1829 trans_presets.java:1835 trans_presets.java:1841
-#: trans_presets.java:1847 trans_presets.java:1853 trans_presets.java:1859
-#: trans_presets.java:1865 trans_presets.java:1871 trans_presets.java:1877
-#: trans_presets.java:1883 trans_presets.java:1892 trans_presets.java:1899
-#: trans_presets.java:1907 trans_presets.java:1913 trans_presets.java:1919
-#: trans_presets.java:1925 trans_presets.java:1931 trans_presets.java:1937
-#: trans_presets.java:1943 trans_presets.java:1949 trans_presets.java:1955
-#: trans_presets.java:1961 trans_presets.java:1967 trans_presets.java:1973
-#: trans_presets.java:1979 trans_presets.java:1985 trans_presets.java:1991
-#: trans_presets.java:1997 trans_presets.java:2003
-msgid "type"
-msgstr "тип"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-msgid "near"
-msgstr "возле"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-msgid "zoom"
-msgstr "масштаб"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
+msgid "Search for objects."
+msgstr "Поиск объектов."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:46
+#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66
+msgid "No data loaded."
+msgstr "Никаких данных не загружено"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56
+msgid "Please enter a search string."
+msgstr "Пожалуйста, введите строку для поиска."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:60
+msgid "replace selection"
+msgstr "заменить выделение"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61
+msgid "add to selection"
+msgstr "добавить к выделению"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62
+msgid "remove from selection"
+msgstr "убрать из выделения"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:68
+msgid "case sensitive"
+msgstr "регистрозависимый"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+msgid "regular expression"
+msgstr "регулярное выражение"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
+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:83
+msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
+msgstr "<b>\"Baker Street\"</b> - 'Baker Street' в любом ключе или названии."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84
+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:85
+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:86
+msgid "<b>foot:</b> - key=foot set to any value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87
+msgid "<u>Special targets:</u>"
+msgstr "<u>Специальные цели:</u>"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88
 msgid ""
-"Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-"move mouse.   Select: Click."
-msgstr ""
-"Масштабирование: Колесо прокрутки или двойной щелчок.  Сдвинуть карту: "
-"Нажмите правую кнопку мыши и двигайте карту мышью. Выбор: щелчок."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:109
-msgid "Slippy map"
-msgstr "Интерактивная карта"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
-msgid "Bookmarks"
-msgstr "Закладки"
-
+"<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
+msgstr "<b>type:</b> - тип объекта (<b>node</b>, <b>way</b>, <b>relation</b>)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89
+msgid "<b>user:</b>... - all objects changed by user"
+msgstr "<b>user:</b>... - все объекты, измененные заданным пользователем"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90
+msgid "<b>id:</b>... - object with given ID"
+msgstr "<b>id:</b>... - объект с заданным ID"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
+msgid "<b>nodes:</b>... - object with given number of nodes"
+msgstr "<b>nodes:</b>... - объект с заданным количеством узлов"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+msgid "<b>modified</b> - all changed objects"
+msgstr "<b>modified</b> - все измененные объекты"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+msgid "<b>selected</b> - all selected objects"
+msgstr "<b>selected</b> - все выбранные объекты"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+msgid "<b>incomplete</b> - all incomplete objects"
+msgstr "<b>incomplete</b> - все незаконченные объекты"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+msgid "<b>untagged</b> - all untagged objects"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+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:97
+msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
+msgstr ""
+"Используйте <b>\"</b> чтобы заключить в кавычки операторы (например, если "
+"ключ содержит двоеточие)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+msgid "Use <b>(</b> and <b>)</b> to group expressions"
+msgstr "Используйте <b>(</b> и <b>)</b> для группировки выражений"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
+msgid "Search"
+msgstr "Поиск"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+msgid "Start Search"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:171
+#, java-format
+msgid "No match found for ''{0}''"
+msgstr "Не найдено совпадений для ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:173
+#, java-format
+msgid "Nothing added to selection by searching for ''{0}''"
+msgstr "Ничего не добавлено к выделению в результате поиска ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
+#, java-format
+msgid "Nothing removed from selection by searching for ''{0}''"
+msgstr "Ничего не удалено из выделения в результате поиска ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#, java-format
+msgid "Found {0} matches"
+msgstr "Найдено {0} совпадений"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+msgid "CI"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+msgid "CS"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+msgid "RX"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:28
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error at offset {1}, full error:\n"
+"\n"
+"{2}"
+msgstr ""
+"Ошибка в регулярном выражении \"{0}\" на позиции {1}, полный текст ошибки:\n"
+"\n"
+"{2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:360
+msgid "Missing arguments for or."
+msgstr "Отсутствуют параметры для \"ИЛИ\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:371
+msgid "Missing argument for not."
+msgstr "Отсутствуют параметры для \"НЕ\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382
+msgid "Expected closing parenthesis."
+msgstr "Отсутствует закрывающая скобка"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33
+msgid "Load Selection"
+msgstr "Загрузить выделенное"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:40
+#, java-format
+msgid "Contact {0}..."
+msgstr "Связаться с {0}..."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
+msgid "Downloading..."
+msgstr "Загрузка..."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:57
+#, java-format
+msgid "Could not read from URL: \"{0}\""
+msgstr "Ошибка соединения с адресом: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:60
+#, java-format
+msgid "Parsing error in URL: \"{0}\""
+msgstr "Ошибка разбора ссылки: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:602
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:602
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:89
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:61
 msgid "Add"
 msgstr "Добавить"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80
-msgid "Please enter the desired coordinates first."
-msgstr "Пожалуйста, введите сначала желаемые координаты"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-msgid "Please enter a name for the location."
-msgstr "Пожалуйста, введите название места."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
-msgid "Remove"
-msgstr "Удалить"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-msgid "Select a bookmark first."
-msgstr "Сначала выберите закладку."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr "масштаб"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr "x от"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "до"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr "y от"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr "Номера квадратов"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
-msgid "Data Sources and Types"
-msgstr "Источники и типы данных"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:143
-msgid "Download as new layer"
-msgstr "Скачать как новый слой"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:146
-msgid "Download Area"
-msgstr "Область для скачивания"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:195
-msgid "Download area too large; will probably be rejected by server"
-msgstr ""
-"Область для скачивания слишком велика. Вероятно, сервер откажется обработать "
-"запрос."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:198
-msgid "Download area ok, size probably acceptable to server"
-msgstr "Область для скачивания приемлема по площади."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:103
-msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-msgstr "Используйте мышь, или Ctrl+стрелки/./ для изменения масштаба."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104
-msgid "Map"
-msgstr "Карта"
-
-#: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
-msgid "false: the property is explicitly switched off"
-msgstr "false: параметр явно выключен"
-
-#: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:91
-msgid "true: the property is explicitly switched on"
-msgstr "true: параметр явно включён"
-
-#: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:96
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
+msgid "Change"
+msgstr "Изменить"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+#, java-format
+msgid "Remove \"{0}\" for {1} ''{2}''"
+msgstr "Удалить \"{0}\" для {1} ''{2}''"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+#, java-format
+msgid "Set {0}={1} for {2} ''{3}''"
+msgstr "Установить {0}={1} для {2} ''{3}''"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
+msgid "object"
+msgid_plural "objects"
+msgstr[0] "объект"
+msgstr[1] "объекта"
+msgstr[2] "объектов"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#, java-format
+msgid "Remove \"{0}\" for {1} {2}"
+msgstr "Удалить \"{0}\" для {1} {2}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#, java-format
+msgid "Set {0}={1} for {2} {3}"
+msgstr "Установить {0}={1} для {2} {3}"
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78
+#, java-format
+msgid "Resolve {0} conflicts in {1} objects"
+msgstr "Разрешить {0} конфликтов в {1} объектах"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#, java-format
+msgid "Delete {1} {0}"
+msgstr "Удалить {1} {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#, java-format
+msgid "Delete {0} {1}"
+msgstr "Удалить {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152
+msgid "Conflicting relation"
+msgstr "Конфликтующее отношение"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
+#, java-format
 msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr "partial: выбранные объекты имеют различные значения, не изменяйте"
-
-#: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:101
-msgid "unset: do not set this property on the selected objects"
-msgstr "unset: не устанавливать этот параметр у выбранных объектов"
+"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
+"Delete from relation?"
+msgstr ""
+"Выделенный объект \"{0}\" используется отношением \"{1}\" в роли \"{2}\".\n"
+"Удалить из отношения?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
+msgid "Delete from relation"
+msgstr "Удалить из связи"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\".\n"
+"Delete from relation?"
+msgstr ""
+"Выделенный объект \"{0}\" используется отношением \"{1}\".\n"
+"Удалить из отношения?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:330
+msgid "Split way segment"
+msgstr "Разделить сегмент линии"
+
+#. leave message in one tr() as there is a grammatical connection.
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:349
+msgid ""
+"You are about to delete nodes outside of the area you have downloaded."
+"<br>This can cause problems because other objects (that you don't see) might "
+"use them.<br>Do you really want to delete?"
+msgstr ""
+"Вы собираетесь удалить точки, выходящие за скачанную зону.<br>Это может "
+"вызвать проблемы, потому что другие объекты (которых не видно) могут "
+"использовать их.<br> Вы действительно хотите удалить их?"
+
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122
+msgid "Move"
+msgstr "Переместить"
+
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:214
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467
+msgid "node"
+msgid_plural "nodes"
+msgstr[0] "узел"
+msgstr[1] "узла"
+msgstr[2] "узлов"
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
+msgid "RemoveRelationMember"
+msgstr "Удалить Участника Отношения"
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135
+msgid "Rotate"
+msgstr "Вращать"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+msgid "Sequence"
+msgstr "Последовательность"
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Применить?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:136
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+"При изменении направления линии, предлагается исправить следующие параметры "
+"для поддержания целостности данных"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
+msgid "Relation"
+msgstr "Отношение"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
+msgid "Old role"
+msgstr "Старая роль"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
+msgid "New role"
+msgstr "Новая роль"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Старый ключ"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Старое значение"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Новый ключ"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+msgid "New value"
+msgstr "Новое значение"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:39
+msgid "Apply selected changes"
+msgstr "Применить выбранные изменения"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
+msgid "Don't apply changes"
+msgstr "Не применять изменения"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82
+msgid "Please select which property changes you want to apply."
+msgstr "Пожалуйста, выберите, какие параметры нужно изменить."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:95
+msgid "Properties of "
+msgstr "Параметры "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119
+msgid "Roles in relations referring to"
+msgstr "Роли в отношениях, относящихся к"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135
+msgid "Automatic tag correction"
+msgstr "Автоматически исправлять тэги"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:305
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Ошибка в файле конфигурации на строках {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:315
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Не удается прочитать каталог с настройками: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:333
+#, java-format
+msgid "Preferences file had errors. Making backup of old one to {0}."
+msgstr "Файл настроек поврежден. Восстанавливаем из старой копии в {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Параметры сохранены на {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Невозможно загрузить параметры. Причина: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
+msgid "Could not load preferences from server."
+msgstr "Невозможно скачать параметры с сервера."
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
+msgid "different"
+msgstr "различный"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
+msgid "deleted"
+msgstr "удалён"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "true"
+msgstr "истина"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "false"
+msgstr "ложь"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
+msgid "position"
+msgstr "положение"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+msgid "Decimal Degrees"
+msgstr "Десятичные градусы"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Degrees Minutes Seconds"
+msgstr "Градусы, минуты, секунды"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "S"
+msgstr "Ю"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "N"
+msgstr "С"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "W"
+msgstr "З"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "E"
+msgstr "В"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:114
+msgid "incomplete"
+msgstr "неполный"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:51
+#, java-format
+msgid "Error: {0}"
+msgstr "Ошибка: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:51
+#, java-format
+msgid "Warning: {0}"
+msgstr "Предупреждение: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467
+msgid "relation"
+msgid_plural "relations"
+msgstr[0] "отношение"
+msgstr[1] "отношения"
+msgstr[2] "отношений"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101
+#, java-format
+msgid "{0} member"
+msgid_plural "{0} members"
+msgstr[0] "{0} участник"
+msgstr[1] "{0} участника"
+msgstr[2] "{0} участников"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:120
+msgid "highway"
+msgstr "дорога"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:121
+#: build/trans_presets.java:2973
+msgid "railway"
+msgstr "железная дорога"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
+msgid "waterway"
+msgstr "водоёмы"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123
+msgid "landuse"
+msgstr "землепользование"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323
+#, java-format
+msgid "{0} node"
+msgid_plural "{0} nodes"
+msgstr[0] "{0} точка"
+msgstr[1] "{0} точки"
+msgstr[2] "{0} точек"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:235
+msgid "Area style way is not closed."
+msgstr "Путь, обозначающий границу области, не закрыт."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:429
+#, java-format
+msgid "multipolygon way ''{0}'' is not closed."
+msgstr "многополигональная линия ''{0}'' не замкнута"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:530
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:777
+msgid "Empty member in relation."
+msgstr "В отношении имеется пустой член."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:532
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:779
+#, java-format
+msgid "Deleted member ''{0}'' in relation."
+msgstr "В отношении «{0}» имеется член, который был удален."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:545
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:790
+#, java-format
+msgid "Way ''{0}'' with less than two points."
+msgstr "Путь «{0}» имеет меньше двух точек."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:550
+msgid "More than one \"from\" way found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:556
+msgid "More than one \"to\" way found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:575
+msgid "More than one \"via\" found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:567
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:580
+#, java-format
+msgid "Unknown role ''{0}''."
+msgstr "Неизвестная роль «{0}»."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
+#, java-format
+msgid "Unknown member type for ''{0}''."
+msgstr "Неизвестный тип членства для «{0}»."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+msgid "No \"from\" way found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
+msgid "No \"to\" way found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
+msgid "No \"via\" node or way found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+msgid "The \"from\" way doesn't start or end at a \"via\" node."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:609
+msgid "The \"to\" way doesn't start or end at a \"via\" node."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+msgid "The \"from\" way doesn't start or end at the \"via\" way."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+msgid "The \"to\" way doesn't start or end at the \"via\" way."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:743
+#, java-format
+msgid "Style for restriction {0} not found."
+msgstr "Стиль для ограничения {0} не найден."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:799
+#, java-format
+msgid "No useful role ''{0}'' for Way ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:810
+#, java-format
+msgid "Non-Way ''{0}'' in multipolygon."
+msgstr "не-линия ''{0}'' в мультиполигональном отношении"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:859
+#, java-format
+msgid "No outer way for multipolygon ''{0}''."
+msgstr "Для мультиполигона «{0}» отсутствует внешний путь."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:939
+#, java-format
+msgid "Intersection between ways ''{0}'' and ''{1}''."
+msgstr "Перекрёсток между линиями ''{0}'' и ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#, java-format
+msgid "Inner way ''{0}'' is outside."
+msgstr "Внутренний путь «{0}» находится снаружи."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:999
+#, java-format
+msgid "Style for inner way ''{0}'' equals multipolygon."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1024
+#, java-format
+msgid "Style for outer way ''{0}'' mismatches."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207
+msgid "untagged"
+msgstr "без тэга"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1208
+msgid "text"
+msgstr "текст"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467
+msgid "way"
+msgid_plural "ways"
+msgstr[0] "линия"
+msgstr[1] "линии"
+msgstr[2] "линий"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79
+#, java-format
+msgid " [id: {0}]"
+msgstr " [id: {0}]"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95
+msgid "inactive"
+msgstr "неактивный"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100
+msgid "untagged way"
+msgstr "линия без тэгов"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101
+msgid "incomplete way"
+msgstr "незаконченная линия"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:136
+msgid "background"
+msgstr "фон"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103
+msgid "highlight"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
+msgid "EPSG:4326"
+msgstr "EPSG:4326"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
+#, java-format
+msgid ""
+"The projection \"{0}\" is designed for\n"
+"latitudes between 46.1° and 57° only.\n"
+"Use another projection system if you are not using\n"
+"a French WMS server.\n"
+"Do not upload any data after this message."
+msgstr ""
+"Проекция \"{0}\" разработана только\n"
+"для широт между 46.1° и 57°.\n"
+"Используйте другую проекцию, если не пользуетесь\n"
+"французским сервером WMS. Не загружайте \n"
+"никаких данных на сервер после этого сообщения."
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+msgid ""
+"IMPORTANT : data positioned far away from\n"
+"the current Lambert zone limits.\n"
+"Do not upload any data after this message.\n"
+"Undo your last action, save your work\n"
+"and start a new layer on the new zone."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+msgid "Lambert Zone (France)"
+msgstr "Зоны Ламберта (Франция)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+msgid "Lambert Zone (Estonia)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+msgid "Mercator"
+msgstr "Проекция Меркатора"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
+msgid "Could not read bookmarks."
+msgstr "Невозможно прочитать закладки"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57
+msgid "Could not write bookmark."
+msgstr "Невозможно записать закладки"
+
+#. setting up the properties table
+#: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:95
+msgid "Key"
+msgstr "Ключ"
+
+#: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Value"
+msgstr "Значение"
+
+#: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:224
+#, java-format
+msgid "{0} object has conflicts:"
+msgid_plural "{0} objects have conflicts:"
+msgstr[0] "{0} объект имеет конфликты."
+msgstr[1] "{0} объекта имеет конфликты."
+msgstr[2] "{0} объектов имеет конфликты."
+
+#: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:227
+msgid "my version:"
+msgstr "моя версия:"
+
+#: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:233
+msgid "their version:"
+msgstr "их версия:"
+
+#: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:239
+msgid "resolved version:"
+msgstr "Разрешённая версия:"
+
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:143
+msgid "Message of the day not available"
+msgstr "Сообщение дня недоступно"
+
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:270
+msgid "Update available"
+msgstr "Доступно обновление"
+
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:271
+msgid "Version Details:"
+msgstr "Данные о версии:"
+
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:272
+#, java-format
+msgid ""
+"Yours: {2}; Current: {0}; <font style=\"font-size:x-small\">(latest "
+"untested: {1} &#150; not recommended)</font>"
+msgstr ""
+"Установленная: {2}; Текущая: {0}; <font style=\"font-size:x-small\">"
+"(последняя нестабильная: {1} &#150; не рекомендуется)</font>"
+
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:295
+msgid "Downloading \"Message of the day\""
+msgstr "Загружается \"Сообщение дня\""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
@@ -665,37 +2632,139 @@
 msgstr "Если выбрано - установить настройки по умолчанию."
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:141
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:225
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:293
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:157
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
-msgid "Java OpenStreetMap Editor"
-msgstr "Редактор OpenStreetMap на Java"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:143
-msgid "Message of the day not available"
-msgstr "Сообщение дня недоступно"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:270
-msgid "Update available"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:271
-msgid "Version Details:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:272
-#, java-format
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+msgid "Username"
+msgstr "Имя пользователя"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:82
+msgid "Password"
+msgstr "Пароль"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#, java-format
+msgid "Unable to find translation for the locale {0}. Reverting to {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
+msgid "usage"
+msgstr "использование"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+msgid "options"
+msgstr "опции"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
+msgid "Show this help"
+msgstr "Показать эту справку"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
+msgid "Standard unix geometry argument"
+msgstr "Стандартный параметр геометрии unix"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+msgid "Download the bounding box"
+msgstr "Скачать область в пределах рамки"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
+msgstr "Скачать область по ссылке (с параметрами lat=x&lon=y&zoom=z)"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+msgid "Open file (as raw gps, if .gpx)"
+msgstr "Открыть файл (как данные GPS, если .gpx)"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+msgid "Download the bounding box as raw gps"
+msgstr "Скачать область в пределах рамки, как данные GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
+msgid "Select with the given search"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
+msgid "Don't launch in fullscreen mode"
+msgstr "Не запускать в полноэкранном режиме"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+msgid "Reset the preferences to default"
+msgstr "Восстановить параметры по умолчанию"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
+msgid "Set the language."
+msgstr "Установить язык."
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+msgid "examples"
+msgstr "примеры"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
 msgid ""
-"Yours: {2}; Current: {0}; <font style=\"font-size:x-small\">(latest "
-"untested: {1} &#150; not recommended)</font>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:295
-msgid "Downloading \"Message of the day\""
-msgstr "Загружается \"Сообщение дня\""
+"Parameters are read in the order they are specified, so make sure you load\n"
+"some data before --selection"
+msgstr ""
+"Параметры читаются в том порядке, в котором указаны, поэтому\n"
+"убедитесь, что загружаете данные перед --selection"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
+msgstr "Вместо --download=<bbox> можно указать osm://<bbox>\n"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
+msgid "Activating updated plugins"
+msgstr "Включение обновлённых модулей"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
+msgid "Loading early plugins"
+msgstr "Загрузка ранних модулей"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
+msgid "Setting defaults"
+msgstr "Настройки по умолчанию"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
+msgid "Loading plugins"
+msgstr "Загрузка модулей"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:107
+msgid "File"
+msgstr "Файл"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139
+msgid "View"
+msgstr "Вид"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140
+#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:26
+msgid "Tools"
+msgstr "Инструменты"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:141
+msgid "Audio"
+msgstr "Аудио"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:142
+msgid "Presets"
+msgstr "Шаблоны"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113
+#: ../plugins/livegps/src/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/LiveGpsPlugin.java:68
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46
+#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:40
+#, java-format
+msgid "Menu: {0}"
+msgstr "Меню: {0}"
+
+#. TODO move code to an "action" like the others?
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:210
+msgid "Wireframe View"
+msgstr "Каркас"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212
+msgid "Toggle Wireframe view"
+msgstr "Показать/скрыть каркас"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
@@ -733,174 +2802,242 @@
 msgstr "Уменьшить масштаб"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:95
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:471
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:512
-msgid "<different>"
-msgstr "<различные>"
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:380
-msgid "More information about this feature"
-msgstr "Ещё информации о этой возможности"
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:390
-msgid "Optional Attributes:"
-msgstr "Дополнительные атрибуты:"
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434
-#, java-format
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Использовать шаблон ''{0}'' из группы ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:435
-#, java-format
-msgid "Use preset ''{0}''"
-msgstr "Использовать шаблон ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
-msgid "way"
-msgid_plural "ways"
-msgstr[0] "линия"
-msgstr[1] "линии"
-msgstr[2] "линий"
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:214
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91
-msgid "node"
-msgid_plural "nodes"
-msgstr[0] "узел"
-msgstr[1] "узла"
-msgstr[2] "узлов"
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87
-msgid "relation"
-msgid_plural "relations"
-msgstr[0] "отношение"
-msgstr[1] "отношения"
-msgstr[2] "отношений"
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467
-msgid "closedway"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472
-#, java-format
-msgid "Unknown type: {0}"
-msgstr "Неизвестный тип: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:549
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
-#, java-format
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552
-#, java-format
-msgid "Error parsing {0}: "
-msgstr "Ошибка при разборе {0}: "
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:569
-#, java-format
-msgid "Elements of type {0} are supported."
-msgstr "Элемент типа {0} не поддерживается."
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
-#, java-format
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Изменить {0} объект"
-msgstr[1] "Изменить {0} объекта"
-msgstr[2] "Изменить {0} объектов"
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598
-msgid "Nothing selected!"
-msgstr "Ничего не выбрано!"
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
-msgid "Selection unsuitable!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
-msgid "Apply Preset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673
-msgid "Change Properties"
-msgstr "Изменить параметры"
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, java-format
-msgid "Preset group ''{0}''"
-msgstr "Группа настроек ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:107
-msgid "File"
-msgstr "Файл"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:107
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:86
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:106
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
-#: ../plugins/grid/src/grid/GridPlugin.java:43
-#: ../plugins/grid/src/grid/GridPlugin.java:49
-msgid "Edit"
-msgstr "Правка"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139
-msgid "View"
-msgstr "Вид"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140
-#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:26
-msgid "Tools"
-msgstr "Инструменты"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:141
-msgid "Audio"
-msgstr "Аудио"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:142
-msgid "Presets"
-msgstr "Шаблоны"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:40
-#: ../plugins/livegps/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/livegps/LiveGpsPlugin.java:68
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113
-#, java-format
-msgid "Menu: {0}"
-msgstr "Меню: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:210
-msgid "Wireframe View"
-msgstr "Каркас"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212
-msgid "Toggle Wireframe view"
-msgstr "Показать/скрыть каркас"
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+msgid "scale"
+msgstr "масштаб"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+msgid "The geographic longitude at the mouse pointer."
+msgstr "Географическая долгота положения курсора"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95
+msgid "The name of the object at the mouse pointer."
+msgstr "Название объекта, на который наведён курсор"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+msgid "The geographic latitude at the mouse pointer."
+msgstr "Географическая широта положения курсора"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+msgid "The angle between the previous and the current way segment."
+msgstr "Угол между предыдущим и текущим сегментом линии"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+msgid "The (compass) heading of the line segment being drawn."
+msgstr "Путевой угол создаваемого сегмента"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+msgid "The length of the new way segment being drawn."
+msgstr "Длина создаваемого сегмента линии"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166
+msgid "(no object)"
+msgstr "(нет объекта)"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:236
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:250
+msgid "layer not in list."
+msgstr "слоя нет в списке."
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
 msgid "Contacting the OSM server..."
 msgstr "Соединение с OSM сервером..."
+
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:89
+msgid "Error while parsing"
+msgstr "Ошибка разбора"
+
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:92
+msgid "File not found"
+msgstr "Файл не найден"
+
+#: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
+msgid "false: the property is explicitly switched off"
+msgstr "false: параметр явно выключен"
+
+#: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:91
+msgid "true: the property is explicitly switched on"
+msgstr "true: параметр явно включён"
+
+#: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:96
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr "partial: выбранные объекты имеют различные значения, не изменяйте"
+
+#: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:101
+msgid "unset: do not set this property on the selected objects"
+msgstr "unset: не устанавливать этот параметр у выбранных объектов"
+
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+msgid "Initializing"
+msgstr "Инициализация"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+msgid "Command Stack"
+msgstr "Список изменений"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
+msgid "Open a list of all commands (undo buffer)."
+msgstr "Показать список всех действий (буфер отмены)"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
+#: ../plugins/livegps/src/LiveGpsDialog.java:46
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
+#, java-format
+msgid "Toggle: {0}"
+msgstr "Переключить: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#, java-format
+msgid "Command Stack: {0}"
+msgstr "Стек команд: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
+msgid ""
+"Set the selected elements on the map to the selected items in the list above."
+msgstr "Выбрать на карте объекты, выбранные в списке вверху."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
+msgid "Resolve"
+msgstr "Разрешить"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr "Открыть диалоговое окно для слияния выбранных объектов."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
+msgid "Conflict"
+msgstr "Конфликт"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71
+msgid "Merging conflicts."
+msgstr "Разрешение конфликтов."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
+msgid "Resolve Conflicts"
+msgstr "Разрешить конфликты"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123
+msgid "Solve Conflict"
+msgstr "Разрешить конфликт"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146
+#, java-format
+msgid "Conflicts: {0}"
+msgstr "Конфликты: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
+msgid "Click Reload to refresh list"
+msgstr "Нажмите \"Обновить\" для обновления списка"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:90
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+msgid "History"
+msgstr "Журнал"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:90
+msgid "Display the history of all selected items."
+msgstr "Отобразить журнал по всем выделенным объектам."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:102
+msgid "Object"
+msgstr "Объект"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:102
+msgid "Date"
+msgstr "Дата"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:128
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Перегрузить все выбранные объекты, и обновить список."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:134
+msgid "Revert"
+msgstr "Откатить"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
+msgid ""
+"Revert the state of all currently selected objects to the version selected "
+"in the history list."
+msgstr ""
+"Откатить состояние выбранных объектов до версии, указанной в списке правок."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:180
+msgid "Not implemented yet."
+msgstr "Ещё не реализовано."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
+msgid "Delete the selected layer."
+msgstr "Удалить выбранный слой."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80
+msgid "There are unsaved changes. Delete the layer anwyay?"
+msgstr "Присутствуют несохранённые изменения. Всё равно удалить слой?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
+msgid "Delete Layer"
+msgstr "Удалить слой"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
+msgid "Do you really want to delete the whole layer?"
+msgstr "Вы действительно хотите удалить весь слой?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103
+msgid "Show/Hide"
+msgstr "Показать/скрыть"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104
+msgid "Toggle visible state of the selected layer."
+msgstr "Показать/скрыть выбранный слой"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123
+msgid "Show/Hide Text/Icons"
+msgstr "Показать/скрыть текст/значки"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124
+msgid "Toggle visible state of the marker text and icons."
+msgstr "Показать/скрыть текст и значки маркеров."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Layers"
+msgstr "Слои"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164
+msgid "Open a list of all loaded layers."
+msgstr "Показать список всех загруженных слоёв."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:250
+msgid "Move the selected layer one row up."
+msgstr "Переместить выделенный слой вверх."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:253
+msgid "Move the selected layer one row down."
+msgstr "Переместить выделенный слой вниз."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
+msgid "Merge the layer directly below into the selected layer."
+msgstr "Объединить выделенный слой с нижележащим."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
+#, java-format
+msgid "Layers: {0}"
+msgstr "Слои: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138
@@ -917,22 +3054,11 @@
 msgstr "Пустое значение удаляет ключ."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:95
-#: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78
-msgid "Key"
-msgstr "Ключ"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
-#: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78
-msgid "Value"
-msgstr "Значение"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:179
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:471
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:95
+msgid "<different>"
+msgstr "<различные>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
@@ -970,25 +3096,10 @@
 msgstr "Параметры выделенных объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
-#: ../plugins/livegps/livegps/LiveGpsDialog.java:46
-#, java-format
-msgid "Toggle: {0}"
-msgstr "Переключить: {0}"
-
+#. setting up the membership table
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486
 msgid "Member Of"
 msgstr "Член группы"
 
+#. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
@@ -1005,10 +3116,4 @@
 msgstr "Удалить выделение из отношения {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
-msgid "Delete from relation"
-msgstr "Удалить из связи"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:600
 msgid "Add Properties"
@@ -1031,20 +3136,4 @@
 msgstr "Удалить параметры"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:293
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:503
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
-msgid "Delete"
-msgstr "Удалить"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615
 msgid "Delete the selected key in all objects"
@@ -1060,7 +3149,10 @@
 msgstr "Параметры / отношения"
 
+#. =================== FIXME FIXME FIXME =====================
+#. ... until here, and also get rid of the "Collections.sort..." below.
+#. We need this twice, so cache result
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178
 msgid "Apply Changes"
-msgstr ""
+msgstr "Применить изменения"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206
@@ -1095,5 +3187,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
 msgid "Move Up"
-msgstr ""
+msgstr "Переместить вверх"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
@@ -1119,5 +3211,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
 msgid "Move Down"
-msgstr ""
+msgstr "Переместить вниз"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
@@ -1125,4 +3217,10 @@
 msgstr "Переместить выбранных членов отношения вниз"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+msgid "Remove"
+msgstr "Удалить"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381
 msgid "Remove the member in the current table row from this relation"
@@ -1145,5 +3243,5 @@
 #, java-format
 msgid "Relation Editor: {0}"
-msgstr ""
+msgstr "Редактор отношений: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:585
@@ -1156,73 +3254,103 @@
 msgstr "Ошибка при разборе ответа от сервера."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:594
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:598
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:115
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:64
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
-msgid "Error"
-msgstr "Ошибка"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597
 msgid "Cannot connect to server."
 msgstr "Невозможно связаться с сервером."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
-msgid "Click Reload to refresh list"
-msgstr "Нажмите \"Обновить\" для обновления списка"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-msgid "History"
-msgstr "Журнал"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:90
-msgid "Display the history of all selected items."
-msgstr "Отобразить журнал по всем выделенным объектам."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:102
-msgid "Object"
-msgstr "Объект"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:102
-msgid "Date"
-msgstr "Дата"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57
+msgid "Open an editor for the selected relation"
+msgstr "Открыть редактор для выбранного отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67
+msgid "Delete the selected relation"
+msgstr "Удалить выбранное отношение"
+
+#. item "Land use/Heath" text "Name"
+#. <!-- FIXME: element role not yet supported! -->
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
+#: build/trans_presets.java:2938
+msgid "Relations"
+msgstr "Отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
+msgid "Open a list of all relations."
+msgstr "Показать список всех отношений."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94
+msgid "Create a new relation"
+msgstr "Создать новое отношение"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:130
+#, java-format
+msgid "Relations: {0}"
+msgstr "Отношений: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
+msgid "Current Selection"
+msgstr "Текущее выделение"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
+msgid "Open a selection list window."
+msgstr "Показать окно со списком выбранных объектов."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
+msgid "Zoom to selected element(s)"
+msgstr "Масштаб по выбранным объектам"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
-msgid "Reload"
-msgstr "Обновить"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:128
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Перегрузить все выбранные объекты, и обновить список."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:134
-msgid "Revert"
-msgstr "Откатить"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
+msgid "Refresh the selection list."
+msgstr "Обновить список выбранного."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
+msgid "Zoom to selection"
+msgstr "Масштаб по выделению"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278
+#, java-format
+msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
+msgstr "Отн.:{0} / Путей:{1} / Точек:{2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280
+msgid "Selection"
+msgstr "выделение"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320
+#, java-format
+msgid "{0} way"
+msgid_plural "{0} ways"
+msgstr[0] "{0} линия"
+msgstr[1] "{0} линии"
+msgstr[2] "{0} линий"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326
+#, java-format
+msgid "{0} relation"
+msgid_plural "{0} relations"
+msgstr[0] "{0} отношение"
+msgstr[1] "{0} отношения"
+msgstr[2] "{0} отношений"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327
+#, java-format
+msgid "Selection: {0}"
+msgstr "Выбор: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+msgid "Undock the panel"
+msgstr "Отсоединить панель"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
 msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-"Откатить состояние выбранных объектов до версии, указанной в списке правок."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:137
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:180
-msgid "Not implemented yet."
-msgstr "Ещё не реализовано."
+"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgstr ""
+"Закрыть эту панель. Вы можете открыть ее снова, используя кнопки на левой "
+"панели."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+msgid "Click to minimize/maximize the panel content"
+msgstr "Щёлкните для уменьшения/увеличения содержимого панели"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53
@@ -1249,621 +3377,213 @@
 msgstr "Авторы: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
-msgid "Undock the panel"
-msgstr "Отсоединить панель"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+msgid "Bookmarks"
+msgstr "Закладки"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80
+msgid "Please enter the desired coordinates first."
+msgstr "Пожалуйста, введите сначала желаемые координаты"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
+msgid "Please enter a name for the location."
+msgstr "Пожалуйста, введите название места."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
+msgid "Select a bookmark first."
+msgstr "Сначала выберите закладку."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+msgid "min lat"
+msgstr "мин. широта"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+msgid "min lon"
+msgstr "мин. долгота"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+msgid "max lat"
+msgstr "макс. широта"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+msgid "max lon"
+msgstr "макс. долгота"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
 msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
-msgstr ""
-"Закрыть эту панель. Вы можете открыть ее снова, используя кнопки на левой "
-"панели."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
-msgid "Click to minimize/maximize the panel content"
-msgstr "Щёлкните для уменьшения/увеличения содержимого панели"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
-msgid "Delete the selected layer."
-msgstr "Удалить выбранный слой."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80
-msgid "There are unsaved changes. Delete the layer anwyay?"
-msgstr "Присутствуют несохранённые изменения. Всё равно удалить слой?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
-msgid "Delete Layer"
-msgstr "Удалить слой"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
-msgid "Do you really want to delete the whole layer?"
-msgstr "Вы действительно хотите удалить весь слой?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103
-msgid "Show/Hide"
-msgstr "Показать/скрыть"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104
-msgid "Toggle visible state of the selected layer."
-msgstr "Показать/скрыть выбранный слой"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123
-msgid "Show/Hide Text/Icons"
-msgstr "Показать/скрыть текст/значки"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124
-msgid "Toggle visible state of the marker text and icons."
-msgstr "Показать/скрыть текст и значки маркеров."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
-msgid "Layers"
-msgstr "Слои"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164
-msgid "Open a list of all loaded layers."
-msgstr "Показать список всех загруженных слоёв."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:250
-msgid "Move the selected layer one row up."
-msgstr "Переместить выделенный слой вверх."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:253
-msgid "Move the selected layer one row down."
-msgstr "Переместить выделенный слой вниз."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-msgid "Merge the layer directly below into the selected layer."
-msgstr "Объединить выделенный слой с нижележащим."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, java-format
-msgid "Layers: {0}"
-msgstr "Слои: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
-msgid "Current Selection"
-msgstr "Текущее выделение"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
-msgid "Open a selection list window."
-msgstr "Показать окно со списком выбранных объектов."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
-msgid "Select"
-msgstr "Выбор"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
+"URL from www.openstreetmap.org (you can paste an URL here to download the "
+"area)"
+msgstr ""
+"URL с www.openstreetmap.org (вы можете вставить URL сюда чтобы загрузить "
+"область)"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+msgid "Bounding Box"
+msgstr "Рамка"
+
+#. adding the download tasks
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121
+msgid "Data Sources and Types"
+msgstr "Источники и типы данных"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:171
+msgid "Download as new layer"
+msgstr "Скачать как новый слой"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:174
+msgid "Download Area"
+msgstr "Область для скачивания"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:223
+msgid "Download area too large; will probably be rejected by server"
+msgstr ""
+"Область для скачивания слишком велика. Вероятно, сервер откажется обработать "
+"запрос."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:226
+msgid "Download area ok, size probably acceptable to server"
+msgstr "Область для скачивания приемлема по площади."
+
+#. SAXException does not chain correctly
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Нулевой исключение, возможно есть отсутствующие тэги"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168
+msgid "Please enter a search string"
+msgstr "Задайте строку для поиска"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186
+msgid "Cannot read place search results from server"
+msgstr "Не удается получить результаты поиска"
+
+#. this is manually tuned so that it looks nice on a GNOME
+#. desktop - maybe needs some cross platform proofing.
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206
+msgid "Enter a place name to search for:"
+msgstr "Название места для поиска:"
+
+#. item "Health/Veterinary" text "Name"
+#. <separator/>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
+#: build/trans_presets.java:2588
+msgid "Places"
+msgstr "Места"
+
+#. TODO - this is probably not the coolest way to set relative sizes?
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241
+msgid "name"
+msgstr "название"
+
+#. item "Sport/Multi" text "Name"
+#. item "Sport/10pin" text "Name"
+#. item "Sport/Athletics" text "Name"
+#. item "Sport/Archery" text "Name"
+#. item "Sport/Climbing" text "Name"
+#. item "Sport/Canoeing" text "Name"
+#. item "Sport/Cycling" text "Name"
+#. item "Sport/Dog Racing" text "Name"
+#. item "Sport/Equestrian" text "Name"
+#. item "Sport/Horse Racing" text "Name"
+#. item "Sport/Gymnastics" text "Name"
+#. item "Sport/Motor Sports" text "Name"
+#. item "Sport/Skating" text "Name"
+#. item "Sport/Skateboard" text "Name"
+#. item "Sport/Swimming" text "Name"
+#. 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)/Baseball" text "Name"
+#. item "Sport (Ball)/Basketball" text "Name"
+#. item "Sport (Ball)/Golf" text "Name"
+#. item "Sport (Ball)/Boule" text "Name"
+#. item "Sport (Ball)/Bowls" text "Name"
+#. item "Sport (Ball)/Cricket" text "Name"
+#. item "Sport (Ball)/Cricket Nets" text "Name"
+#. item "Sport (Ball)/Croquet" text "Name"
+#. item "Sport (Ball)/Hockey" text "Name"
+#. 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"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
+#: build/trans_presets.java:1829 build/trans_presets.java:1835
+#: build/trans_presets.java:1841 build/trans_presets.java:1847
+#: build/trans_presets.java:1853 build/trans_presets.java:1859
+#: build/trans_presets.java:1865 build/trans_presets.java:1871
+#: build/trans_presets.java:1877 build/trans_presets.java:1883
+#: build/trans_presets.java:1889 build/trans_presets.java:1895
+#: build/trans_presets.java:1901 build/trans_presets.java:1907
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1929 build/trans_presets.java:1937
+#: build/trans_presets.java:1943 build/trans_presets.java:1949
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+msgid "type"
+msgstr "тип"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
+msgid "near"
+msgstr "возле"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
+msgid "zoom"
+msgstr "масштаб"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:107
 msgid ""
-"Set the selected elements on the map to the selected items in the list above."
-msgstr "Выбрать на карте объекты, выбранные в списке вверху."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
-msgid "Zoom to selected element(s)"
-msgstr "Масштаб по выбранным объектам"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
-msgid "Refresh the selection list."
-msgstr "Обновить список выбранного."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
-msgid "Search"
-msgstr "Поиск"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40
-msgid "Search for objects."
-msgstr "Поиск объектов."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
-msgid "Zoom to selection"
-msgstr "Масштаб по выделению"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278
-#, java-format
-msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
-msgstr "Отн.:{0} / Путей:{1} / Точек:{2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280
-msgid "Selection"
-msgstr "выделение"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320
-#, java-format
-msgid "{0} way"
-msgid_plural "{0} ways"
-msgstr[0] "{0} линия"
-msgstr[1] "{0} линии"
-msgstr[2] "{0} линий"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:126
-#, java-format
-msgid "{0} node"
-msgid_plural "{0} nodes"
-msgstr[0] "{0} точка"
-msgstr[1] "{0} точки"
-msgstr[2] "{0} точек"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326
-#, java-format
-msgid "{0} relation"
-msgid_plural "{0} relations"
-msgstr[0] "{0} отношение"
-msgstr[1] "{0} отношения"
-msgstr[2] "{0} отношений"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327
-#, java-format
-msgid "Selection: {0}"
-msgstr "Выбор: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57
-msgid "Open an editor for the selected relation"
-msgstr "Открыть редактор для выбранного отношения"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67
-msgid "Delete the selected relation"
-msgstr "Удалить выбранное отношение"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
-#: trans_presets.java:2908
-msgid "Relations"
-msgstr "Отношения"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
-msgid "Open a list of all relations."
-msgstr "Показать список всех отношений."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-msgid "New"
-msgstr "Создать"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94
-msgid "Create a new relation"
-msgstr "Создать новое отношение"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:130
-#, java-format
-msgid "Relations: {0}"
-msgstr "Отношений: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
-#: trans_surveyor.java:64
-msgid "Info"
-msgstr "Сведения"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
-msgid "Command Stack"
-msgstr "Список изменений"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
-msgid "Open a list of all commands (undo buffer)."
-msgstr "Показать список всех действий (буфер отмены)"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
-#, java-format
-msgid "Command Stack: {0}"
-msgstr "Стек команд: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
-msgid "Resolve"
-msgstr "Разрешить"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr "Открыть диалоговое окно для слияния выбранных объектов."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
-msgid "Conflict"
-msgstr "Конфликт"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71
-msgid "Merging conflicts."
-msgstr "Разрешение конфликтов."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
-msgid "Resolve Conflicts"
-msgstr "Разрешить конфликты"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123
-msgid "Solve Conflict"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146
-#, java-format
-msgid "Conflicts: {0}"
-msgstr "Конфликты: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-msgid "Conflicts"
-msgstr "Конфликты"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-msgid "conflict"
-msgstr "конфликт"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:136
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-msgid "background"
-msgstr "фон"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr "маркер GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] "маркер"
-msgstr[1] "маркера"
-msgstr[2] "маркеров"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0} состоит из {1} маркера"
-msgstr[1] "{0} состоит из {1} маркеров"
-msgstr[2] "{0} состоит из {1} маркеров"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
-msgid "Customize Color"
-msgstr "Выбрать цвет"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "По умолчанию"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:152
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Выбор цвета"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr "Синхронизировать аудио"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-msgid ""
-"You need to pause audio at the moment when you hear your synchronization cue."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr "Аудио синхронизировано на точке {0}."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-msgid "Unable to synchronize in layer being played."
-msgstr "Невозможно синхронизировать слой который используется"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
-msgid "Make Audio Marker at Play Head"
-msgstr "Установить маркер аудио на позиции проигрывания"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-msgstr ""
-"Вы должны поставить аудио на паузу в той точке пути, где хотите поставить "
-"маркер."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr "Нет существующих аудио маркеров на этом слое"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:958
-msgid "desc"
-msgstr "описание"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:102
-msgid "symbol"
-msgstr "символ"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr "Произошла ошибка при попытке показать URL для этого маркера"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr "(по ссылке: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr "Невозможно отобразить URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr "Невозможно создать новый аудио-маркер."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
-msgid "Convert to data layer"
-msgstr "Преобразовать в слой данных"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:645
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered "
-"harmful.<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>Загрузка на карту необработанных данных GPS считается "
-"вредоносной.<br>Если хотите загрузить трэк, сделайте это по ссылке:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:646
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Преобразовано из: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:217
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
-msgid "gps point"
-msgstr "точка GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: trans_presets.java:1799 trans_presets.java:1805 trans_presets.java:1811
-#: trans_presets.java:1817 trans_presets.java:1823 trans_presets.java:1829
-#: trans_presets.java:1835 trans_presets.java:1841 trans_presets.java:1847
-#: trans_presets.java:1853 trans_presets.java:1859 trans_presets.java:1865
-#: trans_presets.java:1871 trans_presets.java:1877 trans_presets.java:1883
-#: trans_presets.java:1892 trans_presets.java:1899 trans_presets.java:1907
-#: trans_presets.java:1913 trans_presets.java:1919 trans_presets.java:1925
-#: trans_presets.java:1931 trans_presets.java:1937 trans_presets.java:1943
-#: trans_presets.java:1949 trans_presets.java:1955 trans_presets.java:1961
-#: trans_presets.java:1967 trans_presets.java:1973 trans_presets.java:1979
-#: trans_presets.java:1985 trans_presets.java:1991 trans_presets.java:1997
-#: trans_presets.java:2003
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "трек"
-msgstr[1] "треки"
-msgstr[2] "треков"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "точка"
-msgstr[1] "точки"
-msgstr[2] "точек"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "трек с {0} точкой"
-msgstr[1] "трек с {0} точками"
-msgstr[2] "трек с {0} точками"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "{0} состоит из {1} трека"
-msgstr[1] "{0} состоит из {1} треков"
-msgstr[2] "{0} состоит из {1} треков"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} точка"
-msgstr[1] "{0} точки"
-msgstr[2] "{0} точек"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-msgid "Customize line drawing"
-msgstr "Настроить отрисовку линий"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-msgid "Use global settings."
-msgstr "Использовать глобальные настройки."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-msgid "Draw lines between points for this layer."
-msgstr "Отображать линии между точками для этого слоя."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
-msgid "Do not draw lines between points for this layer."
-msgstr "Не отображать линии между точками для этого слоя."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:135
-msgid "Select line drawing options"
-msgstr "Выбрать варианты отрисовки линий"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-msgid "Markers From Named Points"
-msgstr "Маркеры из именованых точек"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:186
-msgid "Import Audio"
-msgstr "Импортировать аудиофайлы"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Wave Audio files (*.wav)"
-msgstr "Аудиофайлы Wave (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
-msgid "Import images"
-msgstr "Импорт изображений"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:436
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr "Изображения JPEG (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} дорожка, "
-msgstr[1] "{0} дорожки, "
-msgstr[2] "{0} дорожек, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} маршрут, "
-msgstr[1] "{0} маршрута, "
-msgstr[2] "{0} маршрутов, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} путевая точка"
-msgstr[1] "{0} путевые точки"
-msgstr[2] "{0} путевых точек"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#, java-format
-msgid "Name: {0}"
-msgstr "Название: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
-#, java-format
-msgid "Description: {0}"
-msgstr "Описание: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-msgid "Timespan: "
-msgstr "Временной интервал: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
-msgid "Length: "
-msgstr "Длина: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:655
-msgid "time"
-msgstr "время"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:679
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:700
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791
-msgid "Download from OSM along this track"
-msgstr "Скачать с JSM данные вдоль трэка"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:686
-msgid "Download everything within:"
-msgstr "Скачать всё в пределах:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
-#, java-format
-msgid "{0} meters"
-msgstr "{0} метров"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:692
-msgid "Maximum area per request:"
-msgstr "Максимальная область для одного запроса:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} кв. км."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Это действие потребует {0} отдельных<br>запросов на скачивание. "
-"Продолжить?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:844
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Аудиомаркеры из {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
-msgid "No GPX track available in layer to associate audio with."
-msgstr "На слое отсутствует трек GPX, чтобы наложить звук."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969
-msgid ""
-"Some waypoints with timestamps from before the start of the track were "
-"omitted."
-msgstr ""
-"Нектоторые точки, время сохранения которых оказалось раньше времени начала "
-"трека, были проигнорированы."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Нектоторые точки, которые были слишком далеко от остальных, чтобы рассчитать "
-"их время, были проигнорированы."
+"Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
+"move mouse.   Select: Click."
+msgstr ""
+"Масштабирование: Колесо прокрутки или двойной щелчок.  Сдвинуть карту: "
+"Нажмите правую кнопку мыши и двигайте карту мышью. Выбор: щелчок."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:109
+msgid "Slippy map"
+msgstr "Интерактивная карта"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
+msgid "zoom level"
+msgstr "масштаб"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
+msgid "x from"
+msgstr "x от"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "to"
+msgstr "до"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
+msgid "y from"
+msgstr "y от"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
+msgid "Tile Numbers"
+msgstr "Номера квадратов"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:103
+msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+msgstr "Используйте мышь, или Ctrl+стрелки/./ для изменения масштаба."
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="guidepost" />
+#: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104
+#: build/trans_presets.java:1676
+msgid "Map"
+msgstr "Карта"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
@@ -1937,4 +3657,10 @@
 msgstr "Синхронизация часов"
 
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:436
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:237
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr "Изображения JPEG (*.jpg)"
+
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:482
 #, java-format
@@ -1968,4 +3694,211 @@
 msgstr "Введённое время невозможно использовать"
 
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:108
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:217
+msgid "gps point"
+msgstr "точка GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+msgid "Customize line drawing"
+msgstr "Настроить отрисовку линий"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+msgid "Use global settings."
+msgstr "Использовать глобальные настройки."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Draw lines between points for this layer."
+msgstr "Отображать линии между точками для этого слоя."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+msgid "Do not draw lines between points for this layer."
+msgstr "Не отображать линии между точками для этого слоя."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Select line drawing options"
+msgstr "Выбрать варианты отрисовки линий"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:141
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "Выбрать цвет"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "По умолчанию"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Выбор цвета"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+msgid "Markers From Named Points"
+msgstr "Маркеры из именованых точек"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
+msgid "Import Audio"
+msgstr "Импортировать аудиофайлы"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:194
+msgid "Wave Audio files (*.wav)"
+msgstr "Аудиофайлы Wave (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Аудиомаркеры из {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:224
+msgid "Import images"
+msgstr "Импорт изображений"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} дорожка, "
+msgstr[1] "{0} дорожки, "
+msgstr[2] "{0} дорожек, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} маршрут, "
+msgstr[1] "{0} маршрута, "
+msgstr[2] "{0} маршрутов, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} путевая точка"
+msgstr[1] "{0} путевые точки"
+msgstr[2] "{0} путевых точек"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
+#, java-format
+msgid "Name: {0}"
+msgstr "Название: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303
+#, java-format
+msgid "Description: {0}"
+msgstr "Описание: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:327
+msgid "Timespan: "
+msgstr "Временной интервал: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+msgid "Length: "
+msgstr "Длина: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "Преобразовать в слой данных"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>Загрузка на карту необработанных данных GPS считается вредоносной."
+"<br>Если хотите загрузить трэк, сделайте это по ссылке:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:650
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:671
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Преобразовано из: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:795
+msgid "Download from OSM along this track"
+msgstr "Скачать с JSM данные вдоль трэка"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:690
+msgid "Download everything within:"
+msgstr "Скачать всё в пределах:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
+#, java-format
+msgid "{0} meters"
+msgstr "{0} метров"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
+msgid "Maximum area per request:"
+msgstr "Максимальная область для одного запроса:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:699
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} кв. км."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Это действие потребует {0} отдельных<br>запросов на скачивание. "
+"Продолжить?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
+msgid "No GPX track available in layer to associate audio with."
+msgstr "На слое отсутствует трек GPX, чтобы наложить звук."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1012
+#, fuzzy
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+"Нектоторые точки, время сохранения которых оказалось раньше времени начала "
+"трека, были проигнорированы."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1016
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Нектоторые точки, которые были слишком далеко от остальных, чтобы рассчитать "
+"их время, были проигнорированы."
+
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:140
 msgid "outside downloaded area"
@@ -1986,53 +3919,308 @@
 msgstr "Преобразовать в слой GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
-msgid "scale"
-msgstr "масштаб"
-
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:125
-#, java-format
-msgid "Version {0}"
-msgstr "Версия {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
-msgid "Initializing"
-msgstr "Инициализация"
-
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
-msgid "Could not read bookmarks."
-msgstr "Невозможно прочитать закладки"
-
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57
-msgid "Could not write bookmark."
-msgstr "Невозможно записать закладки"
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
-msgid "The geographic longitude at the mouse pointer."
-msgstr "Географическая долгота положения курсора"
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95
-msgid "The name of the object at the mouse pointer."
-msgstr "Название объекта, на который наведён курсор"
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
-msgid "The geographic latitude at the mouse pointer."
-msgstr "Географическая широта положения курсора"
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
-msgid "The angle between the previous and the current way segment."
-msgstr "Угол между предыдущим и текущим сегментом линии"
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
-msgid "The (compass) heading of the line segment being drawn."
-msgstr "Путевой угол создаваемого сегмента"
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
-msgid "The length of the new way segment being drawn."
-msgstr "Длина создаваемого сегмента линии"
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166
-msgid "(no object)"
-msgstr "(нет объекта)"
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1829 build/trans_presets.java:1835
+#: build/trans_presets.java:1841 build/trans_presets.java:1847
+#: build/trans_presets.java:1853 build/trans_presets.java:1859
+#: build/trans_presets.java:1865 build/trans_presets.java:1871
+#: build/trans_presets.java:1877 build/trans_presets.java:1883
+#: build/trans_presets.java:1889 build/trans_presets.java:1895
+#: build/trans_presets.java:1901 build/trans_presets.java:1907
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1929 build/trans_presets.java:1937
+#: build/trans_presets.java:1943 build/trans_presets.java:1949
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "трек"
+msgstr[1] "треки"
+msgstr[2] "треков"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "точка"
+msgstr[1] "точки"
+msgstr[2] "точек"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "трек с {0} точкой"
+msgstr[1] "трек с {0} точками"
+msgstr[2] "трек с {0} точками"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{0} состоит из {1} трека"
+msgstr[1] "{0} состоит из {1} треков"
+msgstr[2] "{0} состоит из {1} треков"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} точка"
+msgstr[1] "{0} точки"
+msgstr[2] "{0} точек"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr "маркер GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "маркер"
+msgstr[1] "маркера"
+msgstr[2] "маркеров"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} состоит из {1} маркера"
+msgstr[1] "{0} состоит из {1} маркеров"
+msgstr[2] "{0} состоит из {1} маркеров"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr "Синхронизировать аудио"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+msgid ""
+"You need to pause audio at the moment when you hear your synchronization cue."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr "Аудио синхронизировано на точке {0}."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
+msgid "Unable to synchronize in layer being played."
+msgstr "Невозможно синхронизировать слой который используется"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+msgid "Make Audio Marker at Play Head"
+msgstr "Установить маркер аудио на позиции проигрывания"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr ""
+"Вы должны поставить аудио на паузу в той точке пути, где хотите поставить "
+"маркер."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr "Нет существующих аудио маркеров на этом слое"
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
+#, fuzzy
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+"Вы должны поставить аудио на паузу в той точке пути, где хотите поставить "
+"маркер."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
+msgid "Unable to create new audio marker."
+msgstr "Невозможно создать новый аудио-маркер."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr "Произошла ошибка при попытке показать URL для этого маркера"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr "(по ссылке: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr "Невозможно отобразить URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:38
+msgid "Advanced Preferences"
+msgstr "Дополнительные параметры"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:39
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr "Установка параметров напрямую. Пользоваться с осторожностью!"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:55
+msgid "Current value is default."
+msgstr "Текущее значение - по умолчанию"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:57
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr "Текущее значение - ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:60
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr "Значение по умолчанию неизвестно (настройка ещё не использовалась)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+msgid "Enter a new key/value pair"
+msgstr "Введите новый ключ и значение"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
+msgid "Please select the row to delete."
+msgstr "Пожалуйста, выберите ряд для удаления."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:529
+msgid "Please select the row to edit."
+msgstr "Пожалуйста, выберите ряд для редактирования."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:159
+#, java-format
+msgid "New value for {0}"
+msgstr "Новое значение для {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
+msgid "Display the Audio menu."
+msgstr "Показать меню Аудио."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:30
+msgid "Label audio (and image and web) markers."
+msgstr "Подписывать маркеры аудио, картинок и веба."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:31
+msgid "Display live audio trace."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
+msgid "Create non-audio markers when reading GPX."
+msgstr "Создать не звуковые маркеры при обработке GPX данных"
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Explicit waypoints with valid timestamps."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Explicit waypoints with time estimated from track position."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:37
+msgid "Named trackpoints."
+msgstr "Именованые точки пути."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
+msgid "Modified times (time stamps) of audio files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Start of track (will always do this if no other markers available)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:67
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
+msgid "When importing audio, make markers from..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:113
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:146
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:135
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:150
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+"Показывает, на сколько секунд вперёд или назад нужно перейти при нажатии "
+"соответствующей кнопки"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:151
+msgid "Forward/back time (seconds)"
+msgstr "Время перемотки (секунд)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:155
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr ""
+"Показывает, во сколько раз увеличивается скорость при быстром проигрывании"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:156
+msgid "Fast forward multiplier"
+msgstr "Множитель быстрого проигрывания"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:160
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:161
+msgid "Lead-in time (seconds)"
+msgstr "Продолжительность вступления (в секундах)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:165
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:166
+msgid "Voice recorder calibration"
+msgstr "Калибровка звукозаписи"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
@@ -2040,100 +4228,847 @@
 msgstr "Цвет"
 
+#. item "Streets/Motorway" text "Reference"
+#. <optional>
+#. item "Streets/Trunk" text "Reference"
+#. <optional>
+#. item "Streets/Primary" text "Reference"
+#. <optional>
+#. item "Streets/Secondary" text "Reference"
+#. <optional>
+#. item "Streets/Tertiary" text "Reference"
+#. <optional>
+#. item "Streets/Unclassified" label "Edit a Unclassified Road"
+#. <space />
+#. <key key="highway" value="unclassified" />
+#. <optional>
+#. item "Streets/Residential" label "Edit a Residential Street"
+#. <space />
+#. <key key="highway" value="residential" />
+#. item "Streets/Living Street" label "Edit a Living Street"
+#. <space />
+#. <key key="highway" value="living_street" />
+#. item "Streets/Road (Unknown Type)" label "Edit a Road of unknown type"
+#. <space />
+#. <key key="highway" value="road" />
+#. <optional>
+#. item "Streets/Bridge" label "Edit a Bridge"
+#. <space />
+#. <key key="bridge" value="yes" />
+#. <optional>
+#. item "Streets/Tunnel" label "Edit a Tunnel"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:tunnel" />
+#. <space />
+#. <key key="tunnel" value="yes" />
+#. <optional>
+#. item "Ways/Construction" label "Edit a highway under construction"
+#. <!--     FIXME: no entry in the Wiki
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. -->
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
+#. item "Ways/Bridleway" label "Edit a Bridleway"
+#. <space />
+#. <key key="highway" value="bridleway" />
+#. <optional>
+#. item "Ways/Cycleway" label "Edit a Cycleway"
+#. <space />
+#. <key key="highway" value="cycleway" />
+#. <optional>
+#. item "Ways/Footway" label "Edit a Footway"
+#. <space />
+#. <key key="highway" value="footway" />
+#. <optional>
+#. item "Ways/Pedestrian" label "Edit a Pedestrian Street"
+#. <space />
+#. <key key="highway" value="pedestrian" />
+#. item "Ways/Steps" label "Edit a flight of Steps"
+#. <space />
+#. <key key="highway" value="steps" />
+#. <optional>
+#. item "Ways/Track" label "Edit a Track"
+#. <space />
+#. <key key="highway" value="track" />
+#. <optional>
+#. item "Ways/Track Grade 1" label "Edit a Track of grade 1"
+#. <space />
+#. <key key="highway" value="track" />
+#. <key key="tracktype" value="grade1" />
+#. <optional>
+#. item "Ways/Track Grade 2" label "Edit a Track of grade 2"
+#. <space />
+#. <key key="highway" value="track" />
+#. <key key="tracktype" value="grade2" />
+#. <optional>
+#. item "Ways/Track Grade 3" label "Edit a Track of grade 3"
+#. <space />
+#. <key key="highway" value="track" />
+#. <key key="tracktype" value="grade3" />
+#. <optional>
+#. item "Ways/Track Grade 4" label "Edit a Track of grade 4"
+#. <space />
+#. <key key="highway" value="track" />
+#. <key key="tracktype" value="grade4" />
+#. <optional>
+#. item "Ways/Track Grade 5" label "Edit a Track of grade 5"
+#. <space />
+#. <key key="highway" value="track" />
+#. <key key="tracktype" value="grade5" />
+#. <optional>
+#. item "Ways/Hiking" label "Edit Hiking"
+#. <space />
+#. <key key="highway" value="path" />
+#. <key key="sac_scale" value="hiking" />
+#. <optional>
+#. item "Ways/Mountain Hiking" label "Edit Mountain Hiking"
+#. <space />
+#. <key key="highway" value="path" />
+#. <key key="sac_scale" value="mountain_hiking" />
+#. <optional>
+#. item "Ways/Demanding Mountain Hiking" label "Edit Demanding Mountain Hiking"
+#. <space />
+#. <key key="highway" value="path" />
+#. <key key="sac_scale" value="demanding_mountain_hiking" />
+#. <optional>
+#. item "Ways/Alpine Hiking" label "Edit Alpine Hiking"
+#. <space />
+#. <key key="highway" value="path" />
+#. <key key="sac_scale" value="alpine_hiking" />
+#. <optional>
+#. item "Ways/Demanding alpine hiking" label "Edit Demanding alpine hiking"
+#. <space />
+#. <key key="highway" value="path" />
+#. <key key="sac_scale" value="demanding_alpine_hiking" />
+#. <optional>
+#. item "Ways/Difficult alpine hiking" label "Edit Difficult alpine hiking"
+#. <space />
+#. <key key="highway" value="path" />
+#. <key key="sac_scale" value="difficult_alpine_hiking" />
+#. <optional>
+#. item "Waypoints/Motorway Junction" label "Edit Motorway Junction"
+#. <space />
+#. <key key="highway" value="motorway_junction" />
+#. item "Waypoints/Services" label "Edit Service Station"
+#. <space />
+#. <key key="highway" value="services" />
+#. <optional>
+#. item "Waypoints/City Limit" label "Edit a city limit sign"
+#. <space />
+#. <key key="traffic_sign" value="city_limit" />
+#. <space />
+#. item "Waypoints/Ford" label "Edit Ford"
+#. <space />
+#. <key key="highway" value="ford" />
+#. <optional>
+#. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
+#. <space />
+#. <key key="highway" value="mountain_pass" />
+#. <optional>
+#. item "Barriers/Toll Booth" label "Edit Toll Booth"
+#. <space />
+#. <key key="barrier" value="toll_booth" />
+#. <optional>
+#. item "Water/Spring" label "Edit a Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Drain" label "Edit a Drain"
+#. <space />
+#. <key key="waterway" value="drain" />
+#. item "Water/Stream" label "Edit a Stream"
+#. <space />
+#. <key key="waterway" value="stream" />
+#. item "Water/Canal" label "Edit a Canal"
+#. <space />
+#. <key key="waterway" value="canal" />
+#. item "Water/River" label "Edit a River"
+#. <space />
+#. <key key="waterway" value="river" />
+#. item "Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Basin" label "Edit Basin Landuse"
+#. <space />
+#. <key key="landuse" value="basin" />
+#. item "Water/Reservoir" label "Edit Reservoir Landuse"
+#. <space />
+#. <key key="landuse" value="reservoir" />
+#. item "Water/Covered Reservoir" label "Edit Covered Reservoir"
+#. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Riverbank" label "Edit a riverbank"
+#. <key key="waterway" value="riverbank" />
+#. item "Water/Wetland" label "Edit Wetland"
+#. <key key="natural" value="wetland" />
+#. item "Water/Mud" label "Edit Mud"
+#. <key key="natural" value="mud" />
+#. item "Water/Beach" label "Edit Beach"
+#. <key key="natural" value="beach" />
+#. item "Water/Bay" label "Edit Bay"
+#. <key key="natural" value="bay" />
+#. item "Water/Cliff" label "Edit Cliff"
+#. <key key="natural" value="cliff" />
+#. item "Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
+#. item "Water/Ferry Route" label "Edit a Ferry"
+#. <space />
+#. <key key="route" value="ferry" />
+#. <optional>
+#. item "Water/Boatyard" label "Edit a Boatyard"
+#. <space />
+#. <key key="waterway" value="boatyard" />
+#. item "Water/Dock" label "Edit a Dock"
+#. <space />
+#. <key key="waterway" value="dock" />
+#. item "Water/Dam" label "Edit a Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
+#. item "Waterway Point/Weir" label "Edit a Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Waterway Point/Waterfall" label "Edit a Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Waterway Point/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Waterway Point/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Waterway Point/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Railway/Bus Guideway" label "Edit a Bus Guideway"
+#. <space />
+#. <key key="highway" value="bus_guideway" />
+#. <optional>
+#. item "Aerialway/Chair Lift" label "Edit a Chair Lift"
+#. <key key="aerialway" value="chair_lift" />
+#. item "Aerialway/Drag Lift" label "Edit a Drag Lift"
+#. <key key="aerialway" value="drag_lift" />
+#. item "Aerialway/Cable Car" label "Edit a Cable Car"
+#. <key key="aerialway" value="cable_car" />
+#. item "Aerialway/Station" label "Edit a Station"
+#. <key key="aerialway" value="station" />
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Parking" label "Edit Parking"
+#. <key key="amenity" value="parking" />
+#. item "Car/Wash" label "Edit Car Wash"
+#. <key key="amenity" value="car_wash" />
+#. item "Car/Shop" label "Edit Car Shop"
+#. <key key="shop" value="car" />
+#. item "Car/Repair" label "Edit Car Repair"
+#. <key key="shop" value="car_repair" />
+#. item "Car/Rental" label "Edit Car Rental"
+#. <key key="amenity" value="car_rental" />
+#. item "Car/Sharing" label "Edit Car Sharing"
+#. <key key="amenity" value="car_sharing" />
+#. item "Bicycle/Parking" label "Edit Bicycle Parking"
+#. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Rental" label "Edit Bicycle Rental"
+#. <key key="amenity" value="bicycle_rental" />
+#. item "Bicycle/Shop" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
+#. item "Public Transport/Station" label "Edit Station"
+#. <space />
+#. <key key="railway" value="station" />
+#. <optional>
+#. item "Public Transport/Railway Halt" label "Edit Halt"
+#. <space />
+#. <key key="railway" value="halt" />
+#. <optional>
+#. item "Public Transport/Tram Stop" label "Edit Tram Stop"
+#. <space />
+#. <key key="railway" value="tram_stop" />
+#. <optional>
+#. item "Public Transport/Subway Entrance" label "Edit Subway Entrance"
+#. <space />
+#. <key key="railway" value="subway_entrance" />
+#. <optional>
+#. item "Public Transport/Bus Station" label "Edit a Bus Station"
+#. <key key="amenity" value="bus_station" />
+#. <optional>
+#. item "Public Transport/Bus Stop" label "Edit Bus Stop"
+#. <space />
+#. <key key="highway" value="bus_stop" />
+#. <optional>
+#. item "Public Transport/Taxi" label "Edit a Taxi station"
+#. <key key="amenity" value="taxi" />
+#. item "Public Transport/Airport" label "Edit an airport"
+#. <key key="aeroway" value="aerodrome" />
+#. item "Accomodation/Hotel" label "Edit Hotel"
+#. <key key="tourism" value="hotel" />
+#. item "Accomodation/Motel" label "Edit Motel"
+#. <key key="tourism" value="motel" />
+#. item "Accomodation/Guest House" label "Edit Guest House"
+#. <key key="tourism" value="guest_house" />
+#. item "Accomodation/Chalet" label "Edit Chalet"
+#. <key key="tourism" value="chalet" />
+#. item "Accomodation/Hostel" label "Edit Hostel"
+#. <key key="tourism" value="hostel" />
+#. item "Accomodation/Alpine Hut" label "Edit Alpine Hut"
+#. <key key="tourism" value="alpine_hut" />
+#. item "Accomodation/Caravan Site" label "Edit Caravan Site"
+#. <key key="tourism" value="caravan_site" />
+#. item "Accomodation/Camping Site" label "Edit Camping Site"
+#. <key key="tourism" value="camp_site" />
+#. item "Food+Drinks/Restaurant" label "Edit Restaurant"
+#. <key key="amenity" value="restaurant" />
+#. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
+#. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Cafe" label "Edit Cafe"
+#. <key key="amenity" value="cafe" />
+#. item "Food+Drinks/Pub" label "Edit Pub"
+#. <key key="amenity" value="pub" />
+#. item "Food+Drinks/Biergarten" label "Edit Biergarten"
+#. <key key="amenity" value="biergarten" />
+#. item "Food+Drinks/Bar" label "Edit a Bar"
+#. <key key="amenity" value="bar" />
+#. item "Food+Drinks/Nightclub" label "Edit Nightclub"
+#. <key key="amenity" value="nightclub" />
+#. item "Tourism/Attraction" label "Edit Attraction"
+#. <key key="tourism" value="attraction" />
+#. item "Tourism/Information Office" label "Edit Information Office"
+#. <key key="tourism" value="information" />
+#. <key key="information" value="office" />
+#. item "Tourism/Museum" label "Edit Museum"
+#. <key key="tourism" value="museum" />
+#. item "Tourism/Zoo" label "Edit Zoo"
+#. <key key="tourism" value="zoo" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Theme Park" label "Edit Theme Park"
+#. <key key="tourism" value="theme_park" />
+#. item "Tourism/Artwork" label "Edit Artwork"
+#. <key key="tourism" value="artwork" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
+#. <key key="tourism" value="information" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
+#. <key key="tourism" value="information" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
+#. item "Historic Places/Castle" label "Edit Castle"
+#. <key key="historic" value="castle" />
+#. item "Historic Places/Ruins" label "Edit Ruins"
+#. <key key="historic" value="ruins" />
+#. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
+#. <key key="historic" value="archaeological_site" />
+#. item "Historic Places/Monument" label "Edit Monument"
+#. <key key="historic" value="monument" />
+#. item "Historic Places/Memorial" label "Edit Memorial"
+#. <key key="historic" value="memorial" />
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#. <key key="historic" value="battlefield" />
+#. item "Historic Places/Wayside Cross" label "Edit a Wayside Cross"
+#. <key key="historic" value="wayside_cross" />
+#. item "Historic Places/Wayside Shrine" label "Edit a Wayside Shrine"
+#. <key key="historic" value="wayside_shrine" />
+#. item "Leisure/Water Park" label "Edit Water Park"
+#. <key key="leisure" value="water_park" />
+#. item "Leisure/Playground" label "Edit Playground"
+#. <key key="leisure" value="playground" />
+#. item "Leisure/Fishing" label "Edit Fishing"
+#. <key key="leisure" value="fishing" />
+#. item "Sport Facilities/Stadium" label "Edit Stadium"
+#. <key key="leisure" value="stadium" />
+#. item "Sport Facilities/Sports Centre" label "Edit Sports Centre"
+#. <key key="leisure" value="sports_centre" />
+#. item "Sport Facilities/Pitch" label "Edit Pitch"
+#. <key key="leisure" value="pitch" />
+#. item "Sport Facilities/Racetrack" label "Edit Racetrack"
+#. <key key="leisure" value="track" />
+#. item "Sport Facilities/Golf Course" label "Edit Golf Course"
+#. <key key="leisure" value="golf_course" />
+#. item "Sport Facilities/Miniature Golf" label "Edit Miniature Golf"
+#. <key key="leisure" value="miniature_golf" />
+#. item "Sport/Multi" label "Edit Multi"
+#. <key key="sport" value="multi" />
+#. item "Sport/10pin" label "Edit 10pin"
+#. <key key="sport" value="10pin" />
+#. item "Sport/Athletics" label "Edit Athletics"
+#. <key key="sport" value="athletics" />
+#. item "Sport/Archery" label "Edit Archery"
+#. <key key="sport" value="archery" />
+#. item "Sport/Climbing" label "Edit Climbing"
+#. <key key="sport" value="climbing" />
+#. item "Sport/Canoeing" label "Edit Canoeing"
+#. <key key="sport" value="canoe" />
+#. item "Sport/Cycling" label "Edit Cycling"
+#. <key key="sport" value="cycling" />
+#. item "Sport/Dog Racing" label "Edit Dog Racing"
+#. <key key="sport" value="dog_racing" />
+#. item "Sport/Equestrian" label "Edit Equestrian"
+#. <key key="sport" value="equestrian" />
+#. item "Sport/Horse Racing" label "Edit Horse Racing"
+#. <key key="sport" value="horse_racing" />
+#. item "Sport/Gymnastics" label "Edit Gymnastics"
+#. <key key="sport" value="gymnastics" />
+#. item "Sport/Motor Sports" label "Edit Motor Sports"
+#. <key key="sport" value="motor" />
+#. item "Sport/Skating" label "Edit Skating"
+#. <key key="sport" value="skating" />
+#. item "Sport/Skateboard" label "Edit Skateboard"
+#. <key key="sport" value="skateboard" />
+#. item "Sport/Swimming" label "Edit Swimming"
+#. <key key="sport" value="swimming" />
+#. item "Sport/Skiing" label "Edit Skiing"
+#. <key key="sport" value="skiing" />
+#. item "Sport/Shooting" label "Edit Shooting"
+#. <key key="sport" value="shooting" />
+#. 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)/Baseball" label "Edit Baseball"
+#. <key key="sport" value="baseball" />
+#. item "Sport (Ball)/Basketball" label "Edit Basketball"
+#. <key key="sport" value="basketball" />
+#. item "Sport (Ball)/Golf" label "Edit Golf"
+#. <key key="sport" value="golf" />
+#. item "Sport (Ball)/Boule" label "Edit Boule"
+#. <key key="sport" value="boules" />
+#. item "Sport (Ball)/Bowls" label "Edit Bowls"
+#. <key key="sport" value="bowls" />
+#. item "Sport (Ball)/Cricket" label "Edit Cricket"
+#. <key key="sport" value="cricket" />
+#. item "Sport (Ball)/Cricket Nets" label "Edit Cricket Nets"
+#. <key key="sport" value="cricket_nets" />
+#. item "Sport (Ball)/Croquet" label "Edit Croquet"
+#. <key key="sport" value="croquet" />
+#. item "Sport (Ball)/Hockey" label "Edit Hockey"
+#. <key key="sport" value="hockey" />
+#. item "Sport (Ball)/Pelota" label "Edit Pelota"
+#. <key key="sport" value="pelota" />
+#. 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" />
+#. item "Sport (Ball)/Tennis" label "Edit Tennis"
+#. <key key="sport" value="tennis" />
+#. item "Buildings/Public Building" label "Edit Public Building"
+#. <key key="amenity" value="public_building" />
+#. item "Buildings/Town hall" label "Edit Town hall"
+#. <key key="amenity" value="townhall" />
+#. item "Buildings/Embassy" label "Edit Embassy"
+#. <key key="amenity" value="embassy" />
+#. item "Buildings/Courthouse" label "Edit Courthouse"
+#. <key key="amenity" value="courthouse" />
+#. item "Buildings/Prison" label "Edit Prison"
+#. <key key="amenity" value="prison" />
+#. item "Buildings/Police" label "Edit Police"
+#. <key key="amenity" value="police" />
+#. item "Buildings/Fire Station" label "Edit Fire Station"
+#. <key key="amenity" value="fire_station" />
+#. item "Buildings/Post Office" label "Edit Post Office"
+#. <key key="amenity" value="post_office" />
+#. item "Buildings/Kindergarten" label "Edit Kindergarten"
+#. <key key="amenity" value="kindergarten" />
+#. item "Buildings/School" label "Edit School"
+#. <key key="amenity" value="school" />
+#. item "Buildings/University" label "Edit University"
+#. <key key="amenity" value="university" />
+#. item "Buildings/College" label "Edit College"
+#. <key key="amenity" value="college" />
+#. item "Buildings/Cinema" label "Edit Cinema"
+#. <key key="amenity" value="cinema" />
+#. item "Buildings/Library" label "Edit Library"
+#. <key key="amenity" value="library" />
+#. item "Buildings/Arts Centre" label "Edit Arts Centre"
+#. <key key="amenity" value="arts_centre" />
+#. item "Buildings/Theatre" label "Edit Theatre"
+#. <key key="amenity" value="theatre" />
+#. item "Buildings/Place of Worship" label "Edit Place of Worship"
+#. <key key="amenity" value="place_of_worship" />
+#. item "Man Made/Works" label "Edit Works"
+#. <key key="man_made" value="works" />
+#. item "Man Made/Tower" label "Edit Tower"
+#. <key key="man_made" value="tower" />
+#. item "Man Made/Water Tower" label "Edit Water Tower"
+#. <key key="man_made" value="water_tower" />
+#. item "Man Made/Gasometer" label "Edit Gasometer"
+#. <key key="man_made" value="gasometer" />
+#. item "Man Made/Lighthouse" label "Edit Lighthouse"
+#. <key key="man_made" value="lighthouse" />
+#. item "Man Made/Windmill" label "Edit Windmill"
+#. <key key="man_made" value="windmill" />
+#. item "Man Made/Pipeline" label "Edit Pipeline"
+#. <key key="man_made" value="pipeline" />
+#. item "Man Made/Wastewater Plant" label "Edit Wastewater Plant"
+#. <key key="man_made" value="wastewater_plant" />
+#. item "Man Made/Crane" label "Edit Crane"
+#. <key key="man_made" value="crane" />
+#. item "Man Made/Beacon" label "Edit Beacon"
+#. <key key="man_made" value="beacon" />
+#. item "Man Made/Survey Point" label "Edit Survey Point"
+#. <key key="man_made" value="survey_point" />
+#. item "Man Made/Surveillance" label "Edit Surveillance Camera"
+#. <key key="man_made" value="surveillance" />
+#. item "Amenities/Fountain" label "Edit a Fountain"
+#. <key key="amenity" value="fountain" />
+#. item "Amenities/Drinking Water" label "Edit Drinking Water"
+#. <key key="amenity" value="drinking_water" />
+#. item "Shops/Supermarket" label "Edit Supermarket"
+#. <key key="shop" value="supermarket" />
+#. item "Shops/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Shops/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Shops/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Shops/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
+#. item "Shops/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Shops/Beverages" label "Edit Beverages  Shop"
+#. <key key="shop" value="beverages" />
+#. item "Shops/Computer" label "Edit Computer Shop"
+#. <key key="shop" value="computer" />
+#. item "Shops/Electronics" label "Edit Electronics Shop"
+#. <key key="shop" value="electronics" />
+#. item "Shops/Hifi" label "Edit Hifi Shop"
+#. <key key="shop" value="hifi" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
+#. item "Shops/Garden Centre" label "Edit Garden Centre"
+#. <key key="shop" value="garden_centre" />
+#. item "Shops/Hardware" label "Edit Hardware Store"
+#. <key key="shop" value="hardware" />
+#. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
+#. <key key="shop" value="doityourself" />
+#. item "Shops/Stationery" label "Edit Stationery Shop"
+#. <key key="shop" value="stationery" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Toys" label "Edit Toy Shop"
+#. <key key="shop" value="toys" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Cash/Bank" label "Edit Bank"
+#. <key key="amenity" value="bank" />
+#. item "Cash/Money Exchange" label "Edit Money Exchange"
+#. <key key="amenity" value="bureau_de_change" />
+#. item "Health/Doctors" label "Edit Doctors"
+#. <key key="amenity" value="doctors" />
+#. item "Health/Dentist" label "Edit Dentist"
+#. <key key="amenity" value="dentist" />
+#. item "Health/Hospital" label "Edit Hospital"
+#. <key key="amenity" value="hospital" />
+#. item "Health/Veterinary" label "Edit Veterinary"
+#. <key key="amenity" value="veterinary" />
+#. item "Places/Continent" label "Edit a Continent"
+#. <space />
+#. <key key="place" value="continent" />
+#. item "Places/Country" label "Edit Country"
+#. <space />
+#. <key key="place" value="country" />
+#. item "Places/State" label "Edit State"
+#. <space />
+#. <key key="place" value="state" />
+#. item "Places/Region" label "Edit Region"
+#. <space />
+#. <key key="place" value="region" />
+#. item "Places/County" label "Edit County"
+#. <space />
+#. <key key="place" value="county" />
+#. item "Places/City" label "Edit City"
+#. <space />
+#. <key key="place" value="city" />
+#. item "Places/Town" label "Edit Town"
+#. <space />
+#. <key key="place" value="town" />
+#. item "Places/Suburb" label "Edit Suburb"
+#. <space />
+#. <key key="place" value="suburb" />
+#. item "Places/Village" label "Edit Village"
+#. <space />
+#. <key key="place" value="village" />
+#. item "Places/Hamlet" label "Edit Hamlet"
+#. <space />
+#. <key key="place" value="hamlet" />
+#. item "Places/Locality" label "Edit Locality"
+#. <space />
+#. <key key="place" value="locality" />
+#. item "Places/Island" label "Edit Island"
+#. <space />
+#. <key key="place" value="island" />
+#. item "Places/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Places/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Places/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Places/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Boundaries/political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Boundaries/National_park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Land use/Tree" label "Edit a Tree"
+#. <key key="natural" value="tree" />
+#. item "Land use/Wood" label "Edit Wood"
+#. <key key="natural" value="wood" />
+#. item "Land use/Forest" label "Edit Forest Landuse"
+#. <space />
+#. <key key="landuse" value="forest" />
+#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. <key key="leisure" value="nature_reserve" />
+#. item "Land use/Farmyard" label "Edit Farmyard Landuse"
+#. <space />
+#. <key key="landuse" value="farmyard" />
+#. item "Land use/Farmland" label "Edit Farmland Landuse"
+#. <space />
+#. <key key="landuse" value="farmland" />
+#. item "Land use/Meadow" label "Edit Meadow Landuse"
+#. <space />
+#. <key key="landuse" value="meadow" />
+#. item "Land use/Vineyard" label "Edit Vineyard Landuse"
+#. <space />
+#. <key key="landuse" value="vineyard" />
+#. item "Land use/Allotments" label "Edit Allotments Landuse"
+#. <space />
+#. <key key="landuse" value="allotments" />
+#. item "Land use/Garden" label "Edit Garden"
+#. <key key="leisure" value="garden" />
+#. item "Land use/Grass" label "Edit Grass Landuse"
+#. <space />
+#. <key key="landuse" value="grass" />
+#. item "Land use/Village Green" label "Edit Village Green Landuse"
+#. <space />
+#. <key key="landuse" value="village_green" />
+#. item "Land use/Common" label "Edit Common"
+#. <key key="leisure" value="common" />
+#. item "Land use/Park" label "Edit Park"
+#. <key key="leisure" value="park" />
+#. item "Land use/Recreation Ground" label "Edit Recreation Ground Landuse"
+#. <space />
+#. <key key="landuse" value="recreation_ground" />
+#. item "Land use/Residential area" label "Edit Residential Landuse"
+#. <space />
+#. <key key="landuse" value="residential" />
+#. item "Land use/Graveyard" label "Edit Graveyard"
+#. <key key="amenity" value="grave_yard" />
+#. item "Land use/Cemetery" label "Edit Cemetery Landuse"
+#. <space />
+#. <key key="landuse" value="cemetery" />
+#. item "Land use/Retail" label "Edit Retail Landuse"
+#. <space />
+#. <key key="landuse" value="retail" />
+#. item "Land use/Commercial" label "Edit Commercial Landuse"
+#. <space />
+#. <key key="landuse" value="commercial" />
+#. item "Land use/Industrial" label "Edit Industrial Landuse"
+#. <space />
+#. <key key="landuse" value="industrial" />
+#. item "Land use/Railway land" label "Edit Railway Landuse"
+#. <space />
+#. <key key="landuse" value="railway" />
+#. item "Land use/Brownfield" label "Edit Brownfield Landuse"
+#. <space />
+#. <key key="landuse" value="brownfield" />
+#. item "Land use/Greenfield" label "Edit Greenfield Landuse"
+#. <space />
+#. <key key="landuse" value="greenfield" />
+#. item "Land use/Construction area" label "Edit Construction Landuse"
+#. <space />
+#. <key key="landuse" value="construction" />
+#. item "Land use/Landfill" label "Edit Landfill Landuse"
+#. <space />
+#. <key key="landuse" value="landfill" />
+#. item "Land use/Quarry" label "Edit Quarry Landuse"
+#. <space />
+#. <key key="landuse" value="quarry" />
+#. item "Land use/Military" label "Edit Military Landuse"
+#. <space />
+#. <key key="landuse" value="military" />
+#. item "Land use/Scree" label "Edit Scree"
+#. <key key="natural" value="scree" />
+#. item "Land use/Scrub" label "Edit Scrub"
+#. <key key="natural" value="scrub" />
+#. item "Land use/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Land use/Heath" label "Edit Heath"
+#. <key key="natural" value="heath" />
+#. item "Relations/Multipolygon" label "Edit a Multipolygon"
+#. <key key="type" value="multipolygon" />
+#. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107
-#: trans_presets.java:56 trans_presets.java:92 trans_presets.java:130
-#: trans_presets.java:165 trans_presets.java:185 trans_presets.java:203
-#: trans_presets.java:220 trans_presets.java:238 trans_presets.java:258
-#: trans_presets.java:291 trans_presets.java:336 trans_presets.java:356
-#: trans_presets.java:371 trans_presets.java:388 trans_presets.java:408
-#: trans_presets.java:428 trans_presets.java:447 trans_presets.java:465
-#: trans_presets.java:485 trans_presets.java:505 trans_presets.java:526
-#: trans_presets.java:547 trans_presets.java:568 trans_presets.java:589
-#: trans_presets.java:610 trans_presets.java:639 trans_presets.java:660
-#: trans_presets.java:673 trans_presets.java:686 trans_presets.java:699
-#: trans_presets.java:712 trans_presets.java:725 trans_presets.java:736
-#: trans_presets.java:745 trans_presets.java:792 trans_presets.java:810
-#: trans_presets.java:819 trans_presets.java:998 trans_presets.java:1034
-#: trans_presets.java:1042 trans_presets.java:1050 trans_presets.java:1058
-#: trans_presets.java:1068 trans_presets.java:1076 trans_presets.java:1081
-#: trans_presets.java:1088 trans_presets.java:1095 trans_presets.java:1100
-#: trans_presets.java:1108 trans_presets.java:1117 trans_presets.java:1123
-#: trans_presets.java:1129 trans_presets.java:1134 trans_presets.java:1140
-#: trans_presets.java:1146 trans_presets.java:1155 trans_presets.java:1164
-#: trans_presets.java:1171 trans_presets.java:1179 trans_presets.java:1192
-#: trans_presets.java:1198 trans_presets.java:1207 trans_presets.java:1213
-#: trans_presets.java:1219 trans_presets.java:1227 trans_presets.java:1282
-#: trans_presets.java:1329 trans_presets.java:1335 trans_presets.java:1341
-#: trans_presets.java:1346 trans_presets.java:1357 trans_presets.java:1365
-#: trans_presets.java:1374 trans_presets.java:1381 trans_presets.java:1387
-#: trans_presets.java:1395 trans_presets.java:1402 trans_presets.java:1411
-#: trans_presets.java:1419 trans_presets.java:1426 trans_presets.java:1437
-#: trans_presets.java:1447 trans_presets.java:1457 trans_presets.java:1477
-#: trans_presets.java:1489 trans_presets.java:1500 trans_presets.java:1516
-#: trans_presets.java:1523 trans_presets.java:1538 trans_presets.java:1545
-#: trans_presets.java:1550 trans_presets.java:1556 trans_presets.java:1562
-#: trans_presets.java:1567 trans_presets.java:1573 trans_presets.java:1579
-#: trans_presets.java:1587 trans_presets.java:1594 trans_presets.java:1601
-#: trans_presets.java:1607 trans_presets.java:1612 trans_presets.java:1618
-#: trans_presets.java:1625 trans_presets.java:1632 trans_presets.java:1638
-#: trans_presets.java:1645 trans_presets.java:1651 trans_presets.java:1657
-#: trans_presets.java:1663 trans_presets.java:1669 trans_presets.java:1675
-#: trans_presets.java:1685 trans_presets.java:1690 trans_presets.java:1697
-#: trans_presets.java:1702 trans_presets.java:1708 trans_presets.java:1714
-#: trans_presets.java:1719 trans_presets.java:1724 trans_presets.java:1731
-#: trans_presets.java:1737 trans_presets.java:1742 trans_presets.java:1750
-#: trans_presets.java:1759 trans_presets.java:1768 trans_presets.java:1777
-#: trans_presets.java:1786 trans_presets.java:1791 trans_presets.java:1798
-#: trans_presets.java:1804 trans_presets.java:1810 trans_presets.java:1816
-#: trans_presets.java:1822 trans_presets.java:1828 trans_presets.java:1834
-#: trans_presets.java:1840 trans_presets.java:1846 trans_presets.java:1852
-#: trans_presets.java:1858 trans_presets.java:1864 trans_presets.java:1870
-#: trans_presets.java:1876 trans_presets.java:1882 trans_presets.java:1889
-#: trans_presets.java:1898 trans_presets.java:1906 trans_presets.java:1912
-#: trans_presets.java:1918 trans_presets.java:1924 trans_presets.java:1930
-#: trans_presets.java:1936 trans_presets.java:1942 trans_presets.java:1948
-#: trans_presets.java:1954 trans_presets.java:1960 trans_presets.java:1966
-#: trans_presets.java:1972 trans_presets.java:1978 trans_presets.java:1984
-#: trans_presets.java:1990 trans_presets.java:1996 trans_presets.java:2002
-#: trans_presets.java:2015 trans_presets.java:2021 trans_presets.java:2027
-#: trans_presets.java:2034 trans_presets.java:2041 trans_presets.java:2049
-#: trans_presets.java:2056 trans_presets.java:2062 trans_presets.java:2068
-#: trans_presets.java:2074 trans_presets.java:2080 trans_presets.java:2086
-#: trans_presets.java:2094 trans_presets.java:2101 trans_presets.java:2107
-#: trans_presets.java:2114 trans_presets.java:2122 trans_presets.java:2153
-#: trans_presets.java:2158 trans_presets.java:2163 trans_presets.java:2168
-#: trans_presets.java:2174 trans_presets.java:2180 trans_presets.java:2186
-#: trans_presets.java:2194 trans_presets.java:2200 trans_presets.java:2206
-#: trans_presets.java:2212 trans_presets.java:2218 trans_presets.java:2228
-#: trans_presets.java:2321 trans_presets.java:2328 trans_presets.java:2342
-#: trans_presets.java:2348 trans_presets.java:2354 trans_presets.java:2375
-#: trans_presets.java:2381 trans_presets.java:2387 trans_presets.java:2392
-#: trans_presets.java:2397 trans_presets.java:2402 trans_presets.java:2407
-#: trans_presets.java:2412 trans_presets.java:2417 trans_presets.java:2423
-#: trans_presets.java:2429 trans_presets.java:2435 trans_presets.java:2440
-#: trans_presets.java:2445 trans_presets.java:2450 trans_presets.java:2455
-#: trans_presets.java:2460 trans_presets.java:2466 trans_presets.java:2472
-#: trans_presets.java:2478 trans_presets.java:2483 trans_presets.java:2488
-#: trans_presets.java:2497 trans_presets.java:2504 trans_presets.java:2518
-#: trans_presets.java:2523 trans_presets.java:2530 trans_presets.java:2536
-#: trans_presets.java:2554 trans_presets.java:2563 trans_presets.java:2569
-#: trans_presets.java:2575 trans_presets.java:2581 trans_presets.java:2587
-#: trans_presets.java:2593 trans_presets.java:2600 trans_presets.java:2607
-#: trans_presets.java:2613 trans_presets.java:2619 trans_presets.java:2626
-#: trans_presets.java:2633 trans_presets.java:2640 trans_presets.java:2646
-#: trans_presets.java:2653 trans_presets.java:2660 trans_presets.java:2669
-#: trans_presets.java:2675 trans_presets.java:2681 trans_presets.java:2687
-#: trans_presets.java:2693 trans_presets.java:2702 trans_presets.java:2712
-#: trans_presets.java:2721 trans_presets.java:2727 trans_presets.java:2735
-#: trans_presets.java:2741 trans_presets.java:2747 trans_presets.java:2753
-#: trans_presets.java:2759 trans_presets.java:2764 trans_presets.java:2770
-#: trans_presets.java:2777 trans_presets.java:2783 trans_presets.java:2788
-#: trans_presets.java:2795 trans_presets.java:2802 trans_presets.java:2808
-#: trans_presets.java:2817 trans_presets.java:2825 trans_presets.java:2831
-#: trans_presets.java:2837 trans_presets.java:2844 trans_presets.java:2851
-#: trans_presets.java:2857 trans_presets.java:2863 trans_presets.java:2869
-#: trans_presets.java:2875 trans_presets.java:2881 trans_presets.java:2887
-#: trans_presets.java:2892 trans_presets.java:2898 trans_presets.java:2904
-#: trans_presets.java:2916 trans_presets.java:2930 trans_presets.java:2944
+#: build/trans_presets.java:56 build/trans_presets.java:92
+#: build/trans_presets.java:130 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:203
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:258 build/trans_presets.java:291
+#: build/trans_presets.java:336 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:388
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:447 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:505
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:639
+#: build/trans_presets.java:660 build/trans_presets.java:673
+#: build/trans_presets.java:686 build/trans_presets.java:699
+#: build/trans_presets.java:712 build/trans_presets.java:725
+#: build/trans_presets.java:736 build/trans_presets.java:745
+#: build/trans_presets.java:792 build/trans_presets.java:807
+#: build/trans_presets.java:816 build/trans_presets.java:995
+#: build/trans_presets.java:1031 build/trans_presets.java:1039
+#: build/trans_presets.java:1047 build/trans_presets.java:1055
+#: build/trans_presets.java:1065 build/trans_presets.java:1073
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1092 build/trans_presets.java:1097
+#: build/trans_presets.java:1105 build/trans_presets.java:1114
+#: build/trans_presets.java:1120 build/trans_presets.java:1126
+#: build/trans_presets.java:1131 build/trans_presets.java:1137
+#: build/trans_presets.java:1143 build/trans_presets.java:1152
+#: build/trans_presets.java:1161 build/trans_presets.java:1168
+#: build/trans_presets.java:1176 build/trans_presets.java:1189
+#: build/trans_presets.java:1195 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1216
+#: build/trans_presets.java:1224 build/trans_presets.java:1279
+#: build/trans_presets.java:1326 build/trans_presets.java:1332
+#: build/trans_presets.java:1338 build/trans_presets.java:1343
+#: build/trans_presets.java:1354 build/trans_presets.java:1362
+#: build/trans_presets.java:1371 build/trans_presets.java:1378
+#: build/trans_presets.java:1384 build/trans_presets.java:1392
+#: build/trans_presets.java:1399 build/trans_presets.java:1408
+#: build/trans_presets.java:1416 build/trans_presets.java:1423
+#: build/trans_presets.java:1434 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1474
+#: build/trans_presets.java:1486 build/trans_presets.java:1497
+#: build/trans_presets.java:1513 build/trans_presets.java:1520
+#: build/trans_presets.java:1535 build/trans_presets.java:1542
+#: build/trans_presets.java:1547 build/trans_presets.java:1553
+#: build/trans_presets.java:1559 build/trans_presets.java:1564
+#: build/trans_presets.java:1570 build/trans_presets.java:1576
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
+#: build/trans_presets.java:1598 build/trans_presets.java:1604
+#: build/trans_presets.java:1609 build/trans_presets.java:1615
+#: build/trans_presets.java:1621 build/trans_presets.java:1628
+#: build/trans_presets.java:1636 build/trans_presets.java:1643
+#: build/trans_presets.java:1650 build/trans_presets.java:1656
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1679 build/trans_presets.java:1686
+#: build/trans_presets.java:1693 build/trans_presets.java:1699
+#: build/trans_presets.java:1705 build/trans_presets.java:1715
+#: build/trans_presets.java:1720 build/trans_presets.java:1727
+#: build/trans_presets.java:1732 build/trans_presets.java:1738
+#: build/trans_presets.java:1744 build/trans_presets.java:1749
+#: build/trans_presets.java:1754 build/trans_presets.java:1761
+#: build/trans_presets.java:1767 build/trans_presets.java:1772
+#: build/trans_presets.java:1780 build/trans_presets.java:1789
+#: build/trans_presets.java:1798 build/trans_presets.java:1807
+#: build/trans_presets.java:1816 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1846
+#: build/trans_presets.java:1852 build/trans_presets.java:1858
+#: build/trans_presets.java:1864 build/trans_presets.java:1870
+#: build/trans_presets.java:1876 build/trans_presets.java:1882
+#: build/trans_presets.java:1888 build/trans_presets.java:1894
+#: build/trans_presets.java:1900 build/trans_presets.java:1906
+#: build/trans_presets.java:1912 build/trans_presets.java:1919
+#: build/trans_presets.java:1928 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:1948
+#: build/trans_presets.java:1954 build/trans_presets.java:1960
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2045 build/trans_presets.java:2051
+#: build/trans_presets.java:2057 build/trans_presets.java:2064
+#: build/trans_presets.java:2071 build/trans_presets.java:2079
+#: build/trans_presets.java:2086 build/trans_presets.java:2092
+#: build/trans_presets.java:2098 build/trans_presets.java:2104
+#: build/trans_presets.java:2110 build/trans_presets.java:2116
+#: build/trans_presets.java:2124 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2144
+#: build/trans_presets.java:2152 build/trans_presets.java:2183
+#: build/trans_presets.java:2188 build/trans_presets.java:2193
+#: build/trans_presets.java:2198 build/trans_presets.java:2204
+#: build/trans_presets.java:2210 build/trans_presets.java:2216
+#: build/trans_presets.java:2224 build/trans_presets.java:2230
+#: build/trans_presets.java:2236 build/trans_presets.java:2242
+#: build/trans_presets.java:2248 build/trans_presets.java:2258
+#: build/trans_presets.java:2351 build/trans_presets.java:2358
+#: build/trans_presets.java:2372 build/trans_presets.java:2378
+#: build/trans_presets.java:2384 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2417
+#: build/trans_presets.java:2422 build/trans_presets.java:2427
+#: build/trans_presets.java:2432 build/trans_presets.java:2437
+#: build/trans_presets.java:2442 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2470
+#: build/trans_presets.java:2475 build/trans_presets.java:2480
+#: build/trans_presets.java:2485 build/trans_presets.java:2490
+#: build/trans_presets.java:2496 build/trans_presets.java:2502
+#: build/trans_presets.java:2508 build/trans_presets.java:2513
+#: build/trans_presets.java:2518 build/trans_presets.java:2527
+#: build/trans_presets.java:2534 build/trans_presets.java:2548
+#: build/trans_presets.java:2553 build/trans_presets.java:2560
+#: build/trans_presets.java:2566 build/trans_presets.java:2584
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2605 build/trans_presets.java:2611
+#: build/trans_presets.java:2617 build/trans_presets.java:2623
+#: build/trans_presets.java:2630 build/trans_presets.java:2637
+#: build/trans_presets.java:2643 build/trans_presets.java:2649
+#: build/trans_presets.java:2656 build/trans_presets.java:2663
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2699 build/trans_presets.java:2705
+#: build/trans_presets.java:2711 build/trans_presets.java:2717
+#: build/trans_presets.java:2723 build/trans_presets.java:2732
+#: build/trans_presets.java:2742 build/trans_presets.java:2751
+#: build/trans_presets.java:2757 build/trans_presets.java:2765
+#: build/trans_presets.java:2771 build/trans_presets.java:2777
+#: build/trans_presets.java:2783 build/trans_presets.java:2789
+#: build/trans_presets.java:2794 build/trans_presets.java:2800
+#: build/trans_presets.java:2807 build/trans_presets.java:2813
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2838
+#: build/trans_presets.java:2847 build/trans_presets.java:2855
+#: build/trans_presets.java:2861 build/trans_presets.java:2867
+#: build/trans_presets.java:2874 build/trans_presets.java:2881
+#: build/trans_presets.java:2887 build/trans_presets.java:2893
+#: build/trans_presets.java:2899 build/trans_presets.java:2905
+#: build/trans_presets.java:2911 build/trans_presets.java:2917
+#: build/trans_presets.java:2922 build/trans_presets.java:2928
+#: build/trans_presets.java:2934 build/trans_presets.java:2946
+#: build/trans_presets.java:2960 build/trans_presets.java:2974
 msgid "Name"
 msgstr "Название"
@@ -2147,5 +5082,5 @@
 #, java-format
 msgid "Layer: {0}"
-msgstr ""
+msgstr "Слой: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
@@ -2174,90 +5109,251 @@
 msgstr "Цвета"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
-msgid "The base URL for the OSM server (REST API)"
-msgstr "Основной адрес сервера OSM (REST API)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
-msgid "Login name (email) to the OSM account."
-msgstr "Имя пользователя (e-mail) учётной записи OSM"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+msgid "Force lines if no segments imported."
+msgstr "Отображать линии, даже если не импортировано сегментов."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+msgid "Draw large GPS points."
+msgstr "Отображать крупные точки GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
+msgid "Velocity (red = slow, green = fast)"
+msgstr "Скорость (красный = медленно, зелёный = быстро)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+msgid "Dilution of Position (red = high, green = low, if available)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+msgid "Single Color (can be customized for named layers)"
+msgstr ""
+
+#. item "Aerialway/Station" text "Name"
+#. <separator/>
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: build/trans_presets.java:1347
+msgid "Car"
+msgstr "Авто"
+
+#. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Kissing Gate" check "Foot"
+#. item "Barriers/Hampshire Gate" check "Foot"
+#. item "Barriers/Bollard" check "Foot"
+#. item "Barriers/Drawbridge" check "Foot"
+#. item "Barriers/Cattle Grid" check "Foot"
+#. item "Barriers/Spikes" check "Foot"
+#. item "Barriers/Gate" check "Foot"
+#. item "Barriers/Lift Gate" check "Foot"
+#. item "Barriers/Sally Port" check "Foot"
+#. item "Barriers/Bump Gate" check "Foot"
+#. item "Barriers/Border Control" check "Foot"
+#. item "Barriers/Entrance" check "Foot"
+#. item "Car/Sharing" text "Operator"
+#. item "Public Transport/Subway Entrance" check "Wheelchair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: build/trans_presets.java:309 build/trans_presets.java:635
+#: build/trans_presets.java:830 build/trans_presets.java:839
+#: build/trans_presets.java:848 build/trans_presets.java:861
+#: build/trans_presets.java:872 build/trans_presets.java:888
+#: build/trans_presets.java:899 build/trans_presets.java:922
+#: build/trans_presets.java:934 build/trans_presets.java:946
+#: build/trans_presets.java:958 build/trans_presets.java:1006
+#: build/trans_presets.java:1019 build/trans_presets.java:1403
+#: build/trans_presets.java:1476
+msgid "Bicycle"
+msgstr "Вело"
+
+#. item "Barriers/Stile" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Kissing Gate" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Bollard" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Drawbridge" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Cattle Grid" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Spikes" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Gate" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Lift Gate" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Sally Port" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Bump Gate" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Border Control" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Entrance" label "Allowed traffic:"
+#. <space />
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: build/trans_presets.java:310 build/trans_presets.java:637
+#: build/trans_presets.java:829 build/trans_presets.java:838
+#: build/trans_presets.java:847 build/trans_presets.java:860
+#: build/trans_presets.java:871 build/trans_presets.java:887
+#: build/trans_presets.java:898 build/trans_presets.java:921
+#: build/trans_presets.java:933 build/trans_presets.java:945
+#: build/trans_presets.java:957 build/trans_presets.java:1005
+#: build/trans_presets.java:1018
+msgid "Foot"
+msgstr "Пешком"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw Direction Arrows"
+msgstr "Отображать стрелки направления"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Fast drawing (looks uglier)"
+msgstr "Быстрая отрисовка (выглядит хуже)"
+
+#. only interesting directions
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180
+msgid "Only interesting direction hints (e.g. with oneway tag)."
+msgstr ""
+"Показывать только полезные указатели направления (например, для "
+"односторонних дорог)."
+
+#. only on the head of a way
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:186
+msgid "Only on the head of a way."
+msgstr "Только в начале пути"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Draw segment order numbers"
+msgstr "Отображать порядковые номера сегментов"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw boundaries of downloaded data"
+msgstr "Отображать границы скачанных данных"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+msgid "Draw virtual nodes in select mode"
+msgstr "Отображать виртуальные точки в режиме выделения"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+msgid "Draw inactive layers in other color"
+msgstr "Отображать неактивные слои другим цветом"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+msgid "Smooth map graphics (antialiasing)"
+msgstr "Сглаженные линии (антиалиасинг)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
 msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Пароль учётной записи OSM. Оставьте пустым, чтобы не сохранять пароль."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
-msgid "Base Server URL"
-msgstr "Основной адрес сервера"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
-msgid "OSM username (email)"
-msgstr "Имя пользователя OSM (e-mail)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid "OSM password"
-msgstr "OSM пароль"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+"If your gps device draws too few lines, select this to draw lines along your "
+"way."
+msgstr ""
+"Если ваш GPS модуль сохраняет точки слишком редко, включите эту опцию, чтобы "
+"соединить точки линиями."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:71
 msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences "
-"file.<br>The password is transfered in plain text to the server, encoded in "
-"the URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
-"<html>Внимание! Пароль хранится в открытом виде в файле настроек.<br> Пароль "
-"передаётся по сети в открытом виде, как параметр запроса.<br><b>Не "
-"используйте ценный пароль.</b></html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
-msgid "Sort presets menu"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr "Использовать настройки по умолчанию"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr "Источник предустановок тегов"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:156
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:491
-msgid "Please select the row to edit."
-msgstr "Пожалуйста, выберите ряд для редактирования."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
-msgid "Please select the row to delete."
-msgstr "Пожалуйста, выберите ряд для удаления."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
+"Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
+msgstr ""
+"Максимальное расстояние (в метрах), соединяемое линиями. Установите -1, "
+"чтобы отображать все линии."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
+msgid "Maximum length (meters)"
+msgstr "Максимальная длина (в метрах)"
+
+#. forceRawGpsLines
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:77
 msgid ""
-"The sources (URL or filename) of tagging preset definition files. See "
-"http://josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-"Источник (URL или имя файла) файла с предустановками тегов. См. "
-"http://josm.openstreetmap.de/wiki/TaggingPresets для большей информации."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
-msgstr "Добавить новый источник предустановки тегов в список."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:519
-msgid "Delete the selected source from the list."
-msgstr "Удалить источник из списка."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
-msgid "Tagging Presets"
-msgstr "Предустановки тегов"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr "Источники предустановок тегов"
+"Force drawing of lines if the imported data contain no line information."
+msgstr "Отображать линии, даже если не импортировано информации о линиях."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+msgid "Draw direction arrows for lines, connecting GPS points."
+msgstr "Отображать стрелки на линиях, соединяющих точки GPS."
+
+#. drawGpsArrowsFast
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the direction arrows using table lookups instead of complex math."
+msgstr ""
+"Отображать стрелки направления, используя таблицы, вместо математических "
+"вычислений."
+
+#. drawGpsArrowsMinDist
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:101
+msgid ""
+"Don't draw arrows if they are not at least this distance away from the last "
+"one."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+msgid "Minimum distance (pixels)"
+msgstr "Минимальное расстояние (в пикселях)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:109
+msgid "Draw larger dots for the GPS points."
+msgstr "Отображать точки GPS более жирно"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+msgid ""
+"All points and track segments will have the same color. Can be customized in "
+"Layer Manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+msgid "Colors points and track segments by velocity."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:138
+msgid ""
+"Colors points and track segments by dilution of position (HDOP). Your "
+"capture device needs to logs that information."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+msgid "Allows to tune the track coloring for different average speeds."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+msgid "Track and Point Coloring"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+msgid "GPS Points"
+msgstr "Точки GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+msgid "Draw direction hints for way segments."
+msgstr "Показывать направление на сегментах путей."
+
+#. segment order number
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
+msgid "Draw the order numbers of all segments within their way."
+msgstr "Показывать порядковые номера на всех сегментах пути."
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:197
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr "Применить сглаживание карты."
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "Отображать границы области, скачанной с сервера."
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:207
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr "Отображать виртуальные точки в режиме выбора, для удобства правки."
+
+#. background layers in inactive color
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+msgid "Draw the inactive data layers in a different color."
+msgstr "Отображать неактивные слои данных другим цветом."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+msgid "OSM Data"
+msgstr "Данные OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
@@ -2271,10 +5367,41 @@
 "~)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
-#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:141
-msgid "Plugins"
-msgstr "Модули"
+#. Show splash screen on startup
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+msgid "Show splash screen at startup"
+msgstr "Показывать заставку при запуске"
+
+#. Show ID in selection
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+msgid "Show object ID in selection lists"
+msgstr "Показывать ID объектов в списке выбора"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+msgid "Draw rubber-band helper line"
+msgstr "Рисовать «резиновую» вспомогательную линию"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+msgid "Modeless working (Potlatch style)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+msgid "Do not require to switch modes (potlatch style workflow)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+msgid "Look and Feel"
+msgstr "Оформление"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+msgid "Default (Auto determined)"
+msgstr "По умолчанию (Автоопределение)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+msgid "Language"
+msgstr "Язык"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
@@ -2286,4 +5413,5 @@
 msgstr "Скачать список"
 
+#. tabPane.addTab(tr("Manage"),  manager = new ManagePanel(this));
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:80
@@ -2311,177 +5439,5 @@
 msgstr "Настроить сайты с модулями"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
-msgid "Default (Auto determined)"
-msgstr "По умолчанию (Автоопределение)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
-msgid "Language"
-msgstr "Язык"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
-msgid "Show splash screen at startup"
-msgstr "Показывать заставку при запуске"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
-msgid "Show object ID in selection lists"
-msgstr "Показывать ID объектов в списке выбора"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
-msgid "Draw rubber-band helper line"
-msgstr "Рисовать «резиновую» вспомогательную линию"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
-msgid "Modeless working (Potlatch style)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
-msgid "Do not require to switch modes (potlatch style workflow)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
-msgid "Look and Feel"
-msgstr "Оформление"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
-msgid "Enable proxy server"
-msgstr "Использовать прокси-сервер"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
-msgid "Anonymous"
-msgstr "Анонимный"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
-msgid "Proxy Settings"
-msgstr "Параметры прокси-сервера"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
-msgid "Proxy server host"
-msgstr "Адрес"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
-msgid "Proxy server port"
-msgstr "Порт"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
-msgid "Proxy server username"
-msgstr "Имя пользователя"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
-msgid "Proxy server password"
-msgstr "Пароль"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Display the Audio menu."
-msgstr "Показать меню Аудио."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:30
-msgid "Label audio (and image and web) markers."
-msgstr "Подписывать маркеры аудио, картинок и веба."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:31
-msgid "Display live audio trace."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Create non-audio markers when reading GPX."
-msgstr "Создать не звуковые маркеры при обработке GPX данных"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Explicit waypoints with valid timestamps."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Explicit waypoints with time estimated from track position."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:37
-msgid "Named trackpoints."
-msgstr "Именованые точки пути."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
-msgid "Start of track (will always do this if no other markers available)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:55
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:66
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:77
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:91
-msgid "When importing audio, make markers from..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:101
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:112
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:134
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:138
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-"Показывает, на сколько секунд вперёд или назад нужно перейти при нажатии "
-"соответствующей кнопки"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:139
-msgid "Forward/back time (seconds)"
-msgstr "Время перемотки (секунд)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:143
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr ""
-"Показывает, во сколько раз увеличивается скорость при быстром проигрывании"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:144
-msgid "Fast forward multiplier"
-msgstr "Множитель быстрого проигрывания"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:148
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:149
-msgid "Lead-in time (seconds)"
-msgstr "Продолжительность вступления (в секундах)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:153
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:154
-msgid "Voice recorder calibration"
-msgstr "Калибровка звукозаписи"
-
+#. some common tabs
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
 msgid "Display Settings"
@@ -2522,199 +5478,139 @@
 msgstr "Необходимо перезапустить JOSM, чтобы изменения вступили в силу."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
-msgid "Draw lines between raw gps points."
-msgstr "Отображать линии между точками трэков GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
-msgid "Force lines if no segments imported."
-msgstr "Отображать линии, даже если не импортировано сегментов."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
-msgid "Draw large GPS points."
-msgstr "Отображать крупные точки GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
-msgid "Velocity (red = slow, green = fast)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
-msgid "Dilution of Position (red = high, green = low, if available)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-msgid "Single Color (can be customized for named layers)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: trans_presets.java:1350
-msgid "Car"
-msgstr "Авто"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: trans_presets.java:309 trans_presets.java:635 trans_presets.java:833
-#: trans_presets.java:842 trans_presets.java:851 trans_presets.java:864
-#: trans_presets.java:875 trans_presets.java:891 trans_presets.java:902
-#: trans_presets.java:925 trans_presets.java:937 trans_presets.java:949
-#: trans_presets.java:961 trans_presets.java:1009 trans_presets.java:1022
-#: trans_presets.java:1406 trans_presets.java:1479
-msgid "Bicycle"
-msgstr "Вело"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: trans_presets.java:310 trans_presets.java:637 trans_presets.java:832
-#: trans_presets.java:841 trans_presets.java:850 trans_presets.java:863
-#: trans_presets.java:874 trans_presets.java:890 trans_presets.java:901
-#: trans_presets.java:924 trans_presets.java:936 trans_presets.java:948
-#: trans_presets.java:960 trans_presets.java:1008 trans_presets.java:1021
-msgid "Foot"
-msgstr "Пешком"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
-msgid "Draw Direction Arrows"
-msgstr "Отображать стрелки направления"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
-msgid "Fast drawing (looks uglier)"
-msgstr "Быстрая отрисовка (выглядит хуже)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180
-msgid "Only interesting direction hints (e.g. with oneway tag)."
-msgstr ""
-"Показывать только полезные указатели направления (например, для "
-"односторонних дорог)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:186
-msgid "Only on the head of a way."
-msgstr "Только в начале пути"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-msgid "Draw segment order numbers"
-msgstr "Отображать порядковые номера сегментов"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
-msgid "Draw boundaries of downloaded data"
-msgstr "Отображать границы скачанных данных"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
-msgid "Draw virtual nodes in select mode"
-msgstr "Отображать виртуальные точки в режиме выделения"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-msgid "Draw inactive layers in other color"
-msgstr "Отображать неактивные слои другим цветом"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-msgid "Smooth map graphics (antialiasing)"
-msgstr "Сглаженные линии (антиалиасинг)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
+msgid "Map Projection"
+msgstr "Картографическая проекция"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
+msgid "Projection method"
+msgstr "Тип проекции"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
+msgid "Display coordinates as"
+msgstr "Отображать координаты как"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+msgid "Enable proxy server"
+msgstr "Использовать прокси-сервер"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+msgid "Anonymous"
+msgstr "Анонимный"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+msgid "Proxy Settings"
+msgstr "Параметры прокси-сервера"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+msgid "Proxy server host"
+msgstr "Адрес"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+msgid "Proxy server port"
+msgstr "Порт"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+msgid "Proxy server username"
+msgstr "Имя пользователя"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+msgid "Proxy server password"
+msgstr "Пароль"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+msgid "The base URL for the OSM server (REST API)"
+msgstr "Основной адрес сервера OSM (REST API)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+msgid "Login name (email) to the OSM account."
+msgstr "Имя пользователя (e-mail) учётной записи OSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid ""
-"If your gps device draws too few lines, select this to draw lines along your "
-"way."
-msgstr ""
-"Если ваш GPS модуль сохраняет точки слишком редко, включите эту опцию, чтобы "
-"соединить точки линиями."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:71
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr "Пароль учётной записи OSM. Оставьте пустым, чтобы не сохранять пароль."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+msgid "Base Server URL"
+msgstr "Основной адрес сервера"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+msgid "OSM username (email)"
+msgstr "Имя пользователя OSM (e-mail)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+msgid "OSM password"
+msgstr "OSM пароль"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid ""
-"Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
-msgstr ""
-"Максимальное расстояние (в метрах), соединяемое линиями. Установите -1, "
-"чтобы отображать все линии."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
-msgid "Maximum length (meters)"
-msgstr "Максимальная длина (в метрах)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:77
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transfered in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
+"<html>Внимание! Пароль хранится в открытом виде в файле настроек.<br> Пароль "
+"передаётся по сети в открытом виде, как параметр запроса.<br><b>Не "
+"используйте ценный пароль.</b></html>"
+
+#. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
+#. icon licence: GPL
+#. icon designer: Paolino, http://www.paolinoland.it/
+#. icon original filename: keyboard.png
+#. icon original size: 128x128
+#. modifications: icon was cropped, then resized
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+msgid "Shortcut Preferences"
+msgstr "Настройки клавиш"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+msgid "Changing keyboard shortcuts manually."
+msgstr "Изменить сочетания клавиш вручную"
+
+#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+msgid "Action"
+msgstr "Действие"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+msgid "Shortcut"
+msgstr "Горячая клвиша"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
+msgid "Sort presets menu"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
+msgid "Enable built-in defaults"
+msgstr "Использовать настройки по умолчанию"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
+msgid "Tagging preset source"
+msgstr "Источник предустановок тегов"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
 msgid ""
-"Force drawing of lines if the imported data contain no line information."
-msgstr "Отображать линии, даже если не импортировано информации о линиях."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
-msgid "Draw direction arrows for lines, connecting GPS points."
-msgstr "Отображать стрелки на линиях, соединяющих точки GPS."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
-msgid ""
-"Draw the direction arrows using table lookups instead of complex math."
-msgstr ""
-"Отображать стрелки направления, используя таблицы, вместо математических "
-"вычислений."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:101
-msgid ""
-"Don't draw arrows if they are not at least this distance away from the last "
-"one."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
-msgid "Minimum distance (pixels)"
-msgstr "Минимальное расстояние (в пикселях)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:109
-msgid "Draw larger dots for the GPS points."
-msgstr "Отображать точки GPS более жирно"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
-msgid ""
-"All points and track segments will have the same color. Can be customized in "
-"Layer Manager."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
-msgid "Colors points and track segments by velocity."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:138
-msgid ""
-"Colors points and track segments by dilution of position (HDOP). Your "
-"capture device needs to logs that information."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
-msgid "Allows to tune the track coloring for different average speeds."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
-msgid "Track and Point Coloring"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
-msgid "GPS Points"
-msgstr "Точки GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
-msgid "Draw direction hints for way segments."
-msgstr "Показывать направление на сегментах путей."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
-msgid "Draw the order numbers of all segments within their way."
-msgstr "Показывать порядковые номера на всех сегментах пути."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:197
-msgid ""
-"Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr "Применить сглаживание карты."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
-msgid "Draw the boundaries of data loaded from the server."
-msgstr "Отображать границы области, скачанной с сервера."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:207
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr "Отображать виртуальные точки в режиме выбора, для удобства правки."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
-msgid "Draw the inactive data layers in a different color."
-msgstr "Отображать неактивные слои данных другим цветом."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
-msgid "OSM Data"
-msgstr "Данные OSM"
+"The sources (URL or filename) of tagging preset definition files. See http://"
+"josm.openstreetmap.de/wiki/TaggingPresets for help."
+msgstr ""
+"Источник (URL или имя файла) файла с предустановками тегов. См. http://josm."
+"openstreetmap.de/wiki/TaggingPresets для большей информации."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
+msgid "Add a new tagging preset source to the list."
+msgstr "Добавить новый источник предустановки тегов в список."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:557
+msgid "Delete the selected source from the list."
+msgstr "Удалить источник из списка."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+msgid "Tagging Presets"
+msgstr "Предустановки тегов"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
+msgid "Tagging preset sources"
+msgstr "Источники предустановок тегов"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:130
@@ -2738,62 +5634,4 @@
 msgid "Customize the elements on the toolbar."
 msgstr "Настроить элементы панели инструментов."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
-msgid "Map Projection"
-msgstr "Картографическая проекция"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
-msgid "Projection method"
-msgstr "Тип проекции"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr "Отображать координаты как"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
-msgid "Shortcut Preferences"
-msgstr "Настройки клавиш"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
-msgid "Changing keyboard shortcuts manually."
-msgstr "Изменить сочетания клавиш вручную"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
-msgid "Action"
-msgstr "Действие"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
-msgid "Shortcut"
-msgstr "Горячая клвиша"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:38
-msgid "Advanced Preferences"
-msgstr "Дополнительные параметры"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:39
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr "Установка параметров напрямую. Пользоваться с осторожностью!"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:55
-msgid "Current value is default."
-msgstr "Текущее значение - по умолчанию"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:57
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr "Текущее значение - ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:60
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr "Значение по умолчанию неизвестно (настройка ещё не использовалась)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
-msgid "Enter a new key/value pair"
-msgstr "Введите новый ключ и значение"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:159
-#, java-format
-msgid "New value for {0}"
-msgstr "Новое значение для {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:52
@@ -2822,6 +5660,6 @@
 "a menu entry of button for the first time. So some of your changes may "
 "become active even without restart --- but also without collistion handling. "
-"This is another reason to <b>restart</b> JOSM after making any changes "
-"here.</p>"
+"This is another reason to <b>restart</b> JOSM after making any changes here."
+"</p>"
 msgstr ""
 "<p>Кроме того, горячие клавиши активируются, если назначаются для какого-"
@@ -2838,9 +5676,8 @@
 "key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also "
 "there will be 'keys' listed that correspond to a shortcut on your keyboard "
-"(e.g. ':'/Colon). Please also do not use them, use the base key "
-"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) "
-"instead. Not doing so may result in conflicts, as there is no way for JOSM "
-"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US "
-"keyboard...</p>"
+"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/"
+"Semicolon on US keyboards, '.'/Period on German keyboards, ...) instead. Not "
+"doing so may result in conflicts, as there is no way for JOSM to know that "
+"Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...</p>"
 msgstr ""
 "<p>Вы можете заметить, что в списке выбора клавиш на следующей вкладке есть "
@@ -2880,8 +5717,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183
 msgid ""
-"<p>The pseudo-modifier 'disabled' will disable the shortcut when "
-"encountered.</p>"
+"<p>The pseudo-modifier 'disabled' will disable the shortcut when encountered."
+"</p>"
 msgstr "<p>Псевдо-модификатор 'отключено' отключает горячую клавишу.</p>"
 
+#. scroll up
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:186
 msgid "Read First"
@@ -2949,138 +5787,292 @@
 msgstr "Группы модификаторов"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:236
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:250
-msgid "layer not in list."
-msgstr "слоя нет в списке."
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
-#, java-format
-msgid "Unable to find translation for the locale {0}. Reverting to {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
-msgid "usage"
-msgstr "использование"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
-msgid "options"
-msgstr "опции"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
-msgid "Show this help"
-msgstr "Показать эту справку"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
-msgid "Standard unix geometry argument"
-msgstr "Стандартный параметр геометрии unix"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
-msgid "Download the bounding box"
-msgstr "Скачать область в пределах рамки"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
-msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
-msgstr "Скачать область по ссылке (с параметрами lat=x&lon=y&zoom=z)"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
-msgid "Open file (as raw gps, if .gpx)"
-msgstr "Открыть файл (как данные GPS, если .gpx)"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
-msgid "Download the bounding box as raw gps"
-msgstr "Скачать область в пределах рамки, как данные GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
-msgid "Select with the given search"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
-msgid "Don't launch in fullscreen mode"
-msgstr "Не запускать в полноэкранном режиме"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-msgid "Reset the preferences to default"
-msgstr "Восстановить параметры по умолчанию"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-msgid "Set the language."
-msgstr "Установить язык."
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
-msgid "examples"
-msgstr "примеры"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:380
+msgid "More information about this feature"
+msgstr "Ещё информации о этой возможности"
+
+#. space
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:390
+msgid "Optional Attributes:"
+msgstr "Дополнительные атрибуты:"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434
+#, java-format
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "Использовать шаблон ''{0}'' из группы ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:435
+#, java-format
+msgid "Use preset ''{0}''"
+msgstr "Использовать шаблон ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467
+msgid "closedway"
+msgstr "замкнутая"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472
+#, java-format
+msgid "Unknown type: {0}"
+msgstr "Неизвестный тип: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:549
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
+#, java-format
+msgid "Could not read tagging preset source: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552
+#, java-format
+msgid "Error parsing {0}: "
+msgstr "Ошибка при разборе {0}: "
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:569
+#, java-format
+msgid "Elements of type {0} are supported."
+msgstr "Элемент типа {0} не поддерживается."
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
+#: ../plugins/terracer/src/terracer/TerracerAction.java:108
+#, java-format
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Изменить {0} объект"
+msgstr[1] "Изменить {0} объекта"
+msgstr[2] "Изменить {0} объектов"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598
+#: ../plugins/terracer/src/terracer/TerracerAction.java:110
+msgid "Nothing selected!"
+msgstr "Ничего не выбрано!"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+msgid "Selection unsuitable!"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
+msgid "Apply Preset"
+msgstr "Применить шаблон"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673
+msgid "Change Properties"
+msgstr "Изменить параметры"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
+#, java-format
+msgid "Preset group ''{0}''"
+msgstr "Группа настроек ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:94
+#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:39
+msgid "Contacting OSM Server..."
+msgstr "Подключение к серверу OSM..."
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50
+#, java-format
+msgid "Downloading points {0} to {1}..."
+msgstr "Загрузка точек с {0} до {1}..."
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:32
+#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:50
+msgid "Downloading OSM data..."
+msgstr "Скачивание данных OSM..."
+
+#. SAXException does not chain correctly
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:266
+msgid "NullPointerException, possibly some missing tags."
+msgstr "Ошибка! Возможно отсутствуют тэги."
+
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83
+msgid "Preparing data..."
+msgstr "Подготовка данных..."
+
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:287
+msgid "Parse error: invalid document structure for gpx document"
+msgstr "Ошибка разбора: неправильная структура документа gpx"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+msgid "Incorrect password or username."
+msgstr "Неправильный пароль или имя пользователя."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+msgid "Warning: The password is transferred unencrypted."
+msgstr "Внимание: Пароль будет передан в незашифрованном виде."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+msgid "Save user and password (unencrypted)"
+msgstr "Сохранить имя пользователя и пароль (не зашифровано)"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:93
+msgid "Enter Password"
+msgstr "Введите пароль"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+msgid "Login"
+msgstr "Идентификатор пользователя"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:132
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
+msgid "Aborting..."
+msgstr "Прерывание..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38
+msgid "Error during parse."
+msgstr "Ошибка при разборе."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:167
+msgid "Unknown version"
+msgstr "Неизвестная версия"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226
+msgid "Found <nd> element in non-way."
+msgstr "Найден элемент <nd> вне пути."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
+msgid "<nd> has zero ref"
+msgstr "у <nd> нет ссылок ref"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+msgid "Found <member> element in non-relation."
+msgstr "Найден тэг <member> вне отношения."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
+msgid "Incomplete <member> specification with ref=0"
+msgstr "Неполная спецификация <member> с ref=0"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295
+msgid "Illegal object with id=0"
+msgstr "Недопустимый объект с id=0"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#, java-format
+msgid "Missing required attribute \"{0}\"."
+msgstr "Отсутствует необходимый атрибут \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378
+#, java-format
+msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
+msgid "Prepare OSM data..."
+msgstr "Подготовка данных..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:522
+msgid "Ill-formed node id"
+msgstr "Неверный номер точки"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:27
+msgid "Contacting Server..."
+msgstr "Соединение с сервером..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:62
 msgid ""
-"Parameters are read in the order they are specified, so make sure you load\n"
-"some data before --selection"
-msgstr ""
-"Параметры читаются в том порядке, в котором указаны, поэтому\n"
-"убедитесь, что загружаете данные перед --selection"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
-msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-msgstr "Вместо --download=<bbox> можно указать osm://<bbox>\n"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
-msgid "Activating updated plugins"
-msgstr "Включение обновлённых модулей"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
-msgid "Loading early plugins"
-msgstr "Загрузка ранних модулей"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-msgid "Setting defaults"
-msgstr "Настройки по умолчанию"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
-msgid "Loading plugins"
-msgstr "Загрузка модулей"
-
-#: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:224
-#, java-format
-msgid "{0} object has conflicts:"
-msgid_plural "{0} objects have conflicts:"
-msgstr[0] "{0} объект имеет конфликты."
-msgstr[1] "{0} объекта имеет конфликты."
-msgstr[2] "{0} объектов имеет конфликты."
-
-#: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:227
-msgid "my version:"
-msgstr "моя версия:"
-
-#: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:233
-msgid "their version:"
-msgstr "их версия:"
-
-#: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:239
-msgid "resolved version:"
-msgstr "Разрешённая версия:"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:87
-msgid "Error while parsing"
-msgstr "Ошибка разбора"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:90
-msgid "File not found"
-msgstr "Файл не найден"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:154
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:162
-#: trans_presets.java:308 trans_presets.java:309 trans_presets.java:310
-#: trans_presets.java:311 trans_presets.java:312 trans_presets.java:313
-#: trans_presets.java:314 trans_presets.java:315 trans_presets.java:316
-#: trans_presets.java:317 trans_presets.java:318 trans_presets.java:512
-#: trans_presets.java:513 trans_presets.java:514 trans_presets.java:533
-#: trans_presets.java:534 trans_presets.java:535 trans_presets.java:554
-#: trans_presets.java:555 trans_presets.java:556 trans_presets.java:575
-#: trans_presets.java:576 trans_presets.java:577 trans_presets.java:596
-#: trans_presets.java:597 trans_presets.java:598 trans_presets.java:617
-#: trans_presets.java:618 trans_presets.java:619 trans_presets.java:754
-#: trans_presets.java:769 trans_presets.java:1313 trans_presets.java:1368
-msgid "unknown"
-msgstr "неизвестный"
+"Couldn't connect to the osm server. Please check your internet connection."
+msgstr ""
+"Не удается соединиться с сервером OSM. Пожалуйста, проверьте Ваше интернет-"
+"соединение."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:69
+msgid ""
+"Server returned internal error. Try a reduced area or retry after waiting "
+"some time."
+msgstr ""
+"Сервер сообщил о внутренней ошибке. Попробуйте уменьшить область, или "
+"повторите попытку позже."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Опишите изменения для закачиваемых данных:"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
+msgid "Commit comment"
+msgstr "Комментарий правки"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
+#, java-format
+msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
+msgstr "{0}% ({1}/{2}), {3} осталось. Загрузка {4}: {5} (id: {6})"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:114
+#, java-format
+msgid "An error occurred: {0}"
+msgstr "Произошла ошибка: {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190
+msgid "Opening changeset..."
+msgstr "Открывается список правок..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224
+msgid "Server does not support changesets"
+msgstr "Сервер не поддерживает управление версиями"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607
+msgid "Unknown host"
+msgstr "Неизвестный хост"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282
+msgid "Preparing..."
+msgstr "Подготовка..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292
+msgid "Uploading..."
+msgstr "Закачка..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375
+msgid "Closing changeset..."
+msgstr "Закрывается список правок..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650
+msgid "Transfer aborted due to error (will wait for 5 seconds):"
+msgstr "Передача прервана из-за ошибки (повторная попытка через 5 с):"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
+msgid "Update Plugins"
+msgstr "Обновить модули"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:51
+#, java-format
+msgid ""
+"There were problems with the following plugins:\n"
+"\n"
+" {0}"
+msgstr ""
+"Со следующими модулями возникли проблемы:\n"
+"\n"
+" {0}"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:53
+#, java-format
+msgid "{0} Plugin successfully updated. Please restart JOSM."
+msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
+msgstr[0] "{0} модуль успешно обновлён. Пожалуйста, перезапустите JOSM."
+msgstr[1] "{0} модуля успешно обновлено. Пожалуйста, перезапустите JOSM."
+msgstr[2] "{0} модулей успешно обновлено. Пожалуйста, перезапустите JOSM."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:138
+#, java-format
+msgid "Could not download plugin: {0} from {1}"
+msgstr "Невозможно скачать модуль: {0} из {1} доступных"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:145
+#, java-format
+msgid ""
+"The plugin {0} seems to be broken or could not be downloaded automatically."
+msgstr "Модуль {0} поврежден, либо не скачался автоматически"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18
+#, java-format
+msgid "An error occurred in plugin {0}"
+msgstr "В модуле {0} произошла ошибка"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65
@@ -3178,4 +6170,9 @@
 "Невозможно удалить модуль. Сообщите разработчикам JOSM об этой проблеме."
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305
+#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
+msgid "Information"
+msgstr "Информация"
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:181
@@ -3183,43 +6180,26 @@
 msgstr "описание отсутствует"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18
-#, java-format
-msgid "An error occurred in plugin {0}"
-msgstr "В модуле {0} произошла ошибка"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
-msgid "Update Plugins"
-msgstr "Обновить модули"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:51
-#, java-format
-msgid ""
-"There were problems with the following plugins:\n"
-"\n"
-" {0}"
-msgstr ""
-"Со следующими модулями возникли проблемы:\n"
-"\n"
-" {0}"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:53
-#, java-format
-msgid "{0} Plugin successfully updated. Please restart JOSM."
-msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-msgstr[0] "{0} модуль успешно обновлён. Пожалуйста, перезапустите JOSM."
-msgstr[1] "{0} модуля успешно обновлено. Пожалуйста, перезапустите JOSM."
-msgstr[2] "{0} модулей успешно обновлено. Пожалуйста, перезапустите JOSM."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:138
-#, java-format
-msgid "Could not download plugin: {0} from {1}"
-msgstr "Невозможно скачать модуль: {0} из {1} доступных"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:145
-#, java-format
-msgid ""
-"The plugin {0} seems to be broken or could not be downloaded automatically."
-msgstr "Модуль {0} поврежден, либо не скачался автоматически"
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:108
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:154
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:162
+#: build/trans_presets.java:308 build/trans_presets.java:309
+#: build/trans_presets.java:310 build/trans_presets.java:311
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:512
+#: build/trans_presets.java:513 build/trans_presets.java:514
+#: build/trans_presets.java:533 build/trans_presets.java:534
+#: build/trans_presets.java:535 build/trans_presets.java:554
+#: build/trans_presets.java:555 build/trans_presets.java:556
+#: build/trans_presets.java:575 build/trans_presets.java:576
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:597 build/trans_presets.java:598
+#: build/trans_presets.java:617 build/trans_presets.java:618
+#: build/trans_presets.java:619 build/trans_presets.java:754
+#: build/trans_presets.java:769 build/trans_presets.java:1310
+#: build/trans_presets.java:1365
+msgid "unknown"
+msgstr "неизвестный"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
@@ -3267,5 +6247,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107
 msgid "Download Plugins"
-msgstr ""
+msgstr "Скачать модули"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:168
@@ -3297,5 +6277,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212
 msgid "Delete and Download"
-msgstr ""
+msgstr "Удалить и скачать"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217
@@ -3310,2148 +6290,935 @@
 msgstr "Ошибка чтения файла с описанием модуля: {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
-msgstr "Удалить Участника Отношения"
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135
-msgid "Rotate"
-msgstr "Вращать"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
-msgid "Sequence"
-msgstr "Последовательность"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122
-msgid "Move"
-msgstr "Переместить"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "Изменить"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
-#, java-format
-msgid "Remove \"{0}\" for {1} ''{2}''"
-msgstr "Удалить \"{0}\" для {1} ''{2}''"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
-#, java-format
-msgid "Set {0}={1} for {2} ''{3}''"
-msgstr "Установить {0}={1} для {2} ''{3}''"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
-msgid "object"
-msgid_plural "objects"
-msgstr[0] "объект"
-msgstr[1] "объекта"
-msgstr[2] "объектов"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#, java-format
-msgid "Remove \"{0}\" for {1} {2}"
-msgstr "Удалить \"{0}\" для {1} {2}"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#, java-format
-msgid "Set {0}={1} for {2} {3}"
-msgstr "Установить {0}={1} для {2} {3}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
-#, java-format
-msgid "Delete {1} {0}"
-msgstr "Удалить {1} {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
-#, java-format
-msgid "Delete {0} {1}"
-msgstr "Удалить {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152
-msgid "Conflicting relation"
-msgstr "Конфликтующее отношение"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#, java-format
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:289
+msgid "This is after the end of the recording"
+msgstr "Это позже конца записи"
+
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:329
+msgid "Error playing sound"
+msgstr "Ошибка при воспроизведении звука"
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+msgid "Do nothing"
+msgstr "Ничего не делать"
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+msgid "Report Bug"
+msgstr "Сообщить об ошибке"
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid ""
-"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-"Delete from relation?"
-msgstr ""
-"Выделенный объект \"{0}\" используется отношением \"{1}\" в роли \"{2}\".\n"
-"Удалить из отношения?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
-#, java-format
+"An unexpected exception occurred.\n"
+"\n"
+"This is always a coding error. If you are running the latest\n"
+"version of JOSM, please consider being kind and file a bug report."
+msgstr ""
+"Произошла неожиданная ошибка.\n"
+"\n"
+"Это всегда говорит об ошибке в коде программы. Если Вы пользуетесь\n"
+"последней версией JOSM, будьте добры, отправьте отчёт об ошибке."
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+msgid "Unexpected Exception"
+msgstr "Неожиданная ошибка"
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67
+#, java-format
+msgid "Please report a ticket at {0}"
+msgstr "Пожалуйста, создайте отчёт об ошибке по адресу {0}"
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68
+msgid "Include your steps to get to the error (as detailed as possible)!"
+msgstr ""
+"Укажите последовательность деййствий, которая вызвала ошибку (как можно "
+"подробнее!)"
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
 msgid ""
-"Selection \"{0}\" is used by relation \"{1}\".\n"
-"Delete from relation?"
-msgstr ""
-"Выделенный объект \"{0}\" используется отношением \"{1}\".\n"
-"Удалить из отношения?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:330
-msgid "Split way segment"
-msgstr "Разделить сегмент линии"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:349
+"Try updating to the newest version of JOSM and all plugins before reporting "
+"a bug."
+msgstr ""
+"Попытайтесь обновиться до новейшей версии модуля перед созданием отчёта об "
+"ошибке."
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+msgid "Be sure to include the following information:"
+msgstr "Прикрепите следующую информацию к отчёту:"
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(Текст уже скопирован в буфер обмена)"
+
+#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32
+msgid "Do not show again"
+msgstr "Больше не показывать"
+
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440
+#, java-format
 msgid ""
-"You are about to delete nodes outside of the area you have "
-"downloaded.<br>This can cause problems because other objects (that you don't "
-"see) might use them.<br>Do you really want to delete?"
-msgstr ""
-"Вы собираетесь удалить точки, выходящие за скачанную зону.<br>Это может "
-"вызвать проблемы, потому что другие объекты (которых не видно) могут "
-"использовать их.<br> Вы действительно хотите удалить их?"
-
-#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78
-#, java-format
-msgid "Resolve {0} conflicts in {1} objects"
-msgstr "Разрешить {0} конфликтов в {1} объектах"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
-msgid "deleted"
-msgstr "удалён"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "true"
-msgstr "истина"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "false"
-msgstr "ложь"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
-msgid "position"
-msgstr "положение"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
-msgid "different"
-msgstr "различный"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:305
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Ошибка в файле конфигурации на строках {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:315
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Не удается прочитать каталог с настройками: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:333
-#, java-format
-msgid "Preferences file had errors. Making backup of old one to {0}."
-msgstr "Файл настроек поврежден. Восстанавливаем из старой копии в {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
-msgid "Decimal Degrees"
-msgstr "Десятичные градусы"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Degrees Minutes Seconds"
-msgstr "Градусы, минуты, секунды"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "S"
-msgstr "Ю"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "N"
-msgstr "С"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "W"
-msgstr "З"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "E"
-msgstr "В"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
+"Setting the keyboard shortcut ''{0}'' for the action ''{1}'' ({2}) failed\n"
+"because the shortcut is already taken by the action ''{3}'' ({4}).\n"
+"\n"
+msgstr ""
+"Назначение комбинации клавиш ''{0}'' на действие ''{1}'' ({2}) невозможно,\n"
+"так как это сочетание уже используется действием ''{3}'' ({4}).\n"
+"\n"
+
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445
 msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 46.1° and 57° only.\n"
-"Use another projection system if you are not using\n"
-"a French WMS server.\n"
-"Do not upload any data after this message."
-msgstr ""
-"Проекция \"{0}\" разработана только\n"
-"для широт между 46.1° и 57°.\n"
-"Используйте другую проекцию, если не пользуетесь\n"
-"французским сервером WMS. Не загружайте \n"
-"никаких данных на сервер после этого сообщения."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+"This action will have no shortcut.\n"
+"\n"
+msgstr ""
+"На это действие не будет назначено сочетания клавиш\n"
+"\n"
+
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447
+#, java-format
 msgid ""
-"IMPORTANT : data positioned far away from\n"
-"the current Lambert zone limits.\n"
-"Do not upload any data after this message.\n"
-"Undo your last action, save your work\n"
-"and start a new layer on the new zone."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
-msgid "Lambert Zone (France)"
-msgstr "Зоны Ламберта (Франция)"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr "EPSG:4326"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
-msgid "Lambert Zone (Estonia)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
-msgid "Mercator"
-msgstr "Проекция Меркатора"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Параметры сохранены на {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Невозможно загрузить параметры. Причина: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-msgid "Could not load preferences from server."
-msgstr "Невозможно скачать параметры с сервера."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:235
-msgid "Area style way is not closed."
-msgstr "Путь, обозначающий границу области, не закрыт."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:429
-#, java-format
-msgid "multipolygon way ''{0}'' is not closed."
-msgstr "многополигональная линия ''{0}'' не замкнута"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:530
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:777
-msgid "Empty member in relation."
-msgstr "В отношении имеется пустой член."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:532
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:779
-#, java-format
-msgid "Deleted member ''{0}'' in relation."
-msgstr "В отношении «{0}» имеется член, который был удален."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:545
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:790
-#, java-format
-msgid "Way ''{0}'' with less than two points."
-msgstr "Путь «{0}» имеет меньше двух точек."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:550
-msgid "More than one \"from\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:556
-msgid "More than one \"to\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:575
-msgid "More than one \"via\" found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:567
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:580
-#, java-format
-msgid "Unknown role ''{0}''."
-msgstr "Неизвестная роль «{0}»."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
-#, java-format
-msgid "Unknown member type for ''{0}''."
-msgstr "Неизвестный тип членства для «{0}»."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
-msgid "No \"from\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
-msgid "No \"to\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
-msgid "No \"via\" node or way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
-msgid "The \"from\" way doesn't start or end at a \"via\" node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:609
-msgid "The \"to\" way doesn't start or end at a \"via\" node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
-msgid "The \"from\" way doesn't start or end at the \"via\" way."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
-msgid "The \"to\" way doesn't start or end at the \"via\" way."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:743
-#, java-format
-msgid "Style for restriction {0} not found."
-msgstr "Стиль для ограничения {0} не найден."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:799
-#, java-format
-msgid "No useful role ''{0}'' for Way ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:810
-#, java-format
-msgid "Non-Way ''{0}'' in multipolygon."
-msgstr "не-линия ''{0}'' в мультиполигональном отношении"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:859
-#, java-format
-msgid "No outer way for multipolygon ''{0}''."
-msgstr "Для мультиполигона «{0}» отсутствует внешний путь."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:939
-#, java-format
-msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr "Перекрёсток между линиями ''{0}'' и ''{1}''."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
-#, java-format
-msgid "Inner way ''{0}'' is outside."
-msgstr "Внутренний путь «{0}» находится снаружи."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:999
-#, java-format
-msgid "Style for inner way ''{0}'' equals multipolygon."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1024
-#, java-format
-msgid "Style for outer way ''{0}'' mismatches."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207
-msgid "untagged"
-msgstr "без тэга"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1208
-msgid "text"
-msgstr "текст"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95
-msgid "inactive"
-msgstr "неактивный"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:206
-msgid "selected"
-msgstr "выбранные"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100
-msgid "untagged way"
-msgstr "линия без тэгов"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101
-msgid "incomplete way"
-msgstr "незаконченная линия"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103
-msgid "highlight"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79
-#, java-format
-msgid " [id: {0}]"
-msgstr " [id: {0}]"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:51
-#, java-format
-msgid "Error: {0}"
-msgstr "Ошибка: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:51
-#, java-format
-msgid "Warning: {0}"
-msgstr "Предупреждение: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:113
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83
-msgid "incomplete"
-msgstr "неполный"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:119
-msgid "highway"
-msgstr "дорога"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:120
-#: trans_presets.java:2943
-msgid "railway"
-msgstr "железная дорога"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:121
-msgid "waterway"
-msgstr "водоёмы"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
-msgid "landuse"
-msgstr "землепользование"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101
-#, java-format
-msgid "{0} member"
-msgid_plural "{0} members"
-msgstr[0] "{0} участник"
-msgstr[1] "{0} участника"
-msgstr[2] "{0} участников"
-
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23
-msgid "Duplicate"
-msgstr "Дублировать"
-
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22
-msgid "Duplicate selection by copy and immediate paste."
-msgstr "Создать копию выделения копированием и вставкой."
-
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../plugins/livegps/livegps/LiveGpsPlugin.java:54
-#, java-format
-msgid "Edit: {0}"
-msgstr "Править: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
-msgid "JOSM Online Help"
-msgstr "Online-справка по JOSM"
-
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:104
-msgid "Open in Browser"
-msgstr "Открыть в браузере"
-
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
-msgid "Can only edit help pages from JOSM Online Help"
-msgstr "Возможно только редактирование справочных страниц JOSM Online Help"
-
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:176
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:195
-#, java-format
-msgid "Error while loading page {0}"
-msgstr "Ошибка при загрузке страницы {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
-msgid "Zoom Out"
-msgstr "Уменьшить масштаб"
-
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#, java-format
-msgid "View: {0}"
-msgstr "Вид: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
-msgid "Delete selected objects."
-msgstr "Удалить выделенные объекты."
-
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63
-msgid "Rename layer"
-msgstr "Переименовать слой"
-
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
-msgid "Also rename the file"
-msgstr "Переименовать файл"
-
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87
-#, java-format
-msgid "Could not rename the file \"{0}\"."
-msgstr "Невозможно переименовать файл \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:28
-msgid "History of Element"
-msgstr "История элемента"
-
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:26
-msgid "Display history information about OSM ways or nodes."
-msgstr "Открыть в браузере историю изменений выделенного объекта."
-
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:60
+"Using the shortcut ''{0}'' instead.\n"
+"\n"
+msgstr ""
+"Вместо этого, назначается сочетание ''{0}''\n"
+"\n"
+
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449
+msgid "(Hint: You can edit the shortcuts in the preferences.)"
+msgstr "(Подсказка: Горячие клавиши можно назначить в настройках программы)"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71
+msgid "Upload Trace"
+msgstr ""
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+msgid "Upload Traces"
+msgstr ""
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102
+msgid "Public"
+msgstr "Публичный"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103
+msgid "Selected makes your trace public in openstreetmap.org"
+msgstr ""
+
+#. item "Relations/Route" text "Symbol description"
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
+#: build/trans_presets.java:2977
+msgid "Description"
+msgstr "Описание"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
+msgid "Tags"
+msgstr ""
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:153
+#, java-format
+msgid "Selected track: {0}"
+msgstr ""
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:176
+msgid "Connecting..."
+msgstr "Подключение..."
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:199
+msgid "Upload cancelled"
+msgstr ""
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:209
+msgid "Error while uploading"
+msgstr ""
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260
+msgid "GPX upload was successful"
+msgstr ""
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261
+msgid "Upload failed. Server returned the following message: "
+msgstr ""
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303
+#, java-format
+msgid "Uploading GPX track: {0}% ({1} of {2})"
+msgstr ""
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360
+msgid "No GPX layer selected. Cannot upload a trace."
+msgstr ""
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341
+msgid "No username provided."
+msgstr ""
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344
+msgid "No password provided."
+msgstr ""
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376
+msgid "Uploading GPX Track"
+msgstr ""
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
+msgid "AgPifoJ - Geotagged pictures"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
+msgid "Display geotagged photos"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:70
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
+msgid "Previous"
+msgstr "Предыдущее"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78
+msgid "Remove photo from layer"
+msgstr "Удалить фото из слоя"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:86
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
+msgid "Next"
+msgstr "Следующее"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94
+msgid "Center view"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:102
+msgid "Zoom best fit and 1:1"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:166
+#, java-format
 msgid ""
-"Please select at least one node, way or relation. Only already uploaded "
-"elements have a history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:123
-msgid "Align Nodes in Line"
-msgstr "Выстроить точки линией"
-
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
-msgid "Move the selected nodes in to a line."
-msgstr ""
-"Переместить выделенные точки на прямую, проходящую через две крайние точки."
-
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/TerracerAction.java:47
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:113
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
-#, java-format
-msgid "Tool: {0}"
-msgstr "Инструмент: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58
-msgid "Please select at least three nodes."
-msgstr "Выделите не менее трёх точек."
-
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:124
-msgid "Distribute Nodes"
-msgstr "Распределить точки"
-
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
-msgid "Distribute the selected nodes to equal distances along a line."
-msgstr "Расположить точки на равных расстояниях вдоль линии."
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:107
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:172
-msgid "UNKNOWN"
-msgstr "НЕИЗВЕСТНО"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:111
-msgid "About"
-msgstr "О программе"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:111
-msgid "Display the about screen."
-msgstr "Отобразить информацию о программе."
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:127
-#, java-format
-msgid "Last change at {0}"
-msgstr "Последние изменения: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:129
-#, java-format
-msgid "Java Version {0}"
-msgstr "Версия Java: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
-msgid "Homepage"
-msgstr "Домашняя страница"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
-msgid "Bug Reports"
-msgstr "Отчёты об ошибках"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
-msgid "News about JOSM"
-msgstr "Новости о JOSM"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
-msgid "Readme"
-msgstr "Для прочтения"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
-msgid "Revision"
-msgstr "Версия"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
-msgid "Contribution"
-msgstr "Авторы"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
-msgid "About JOSM..."
-msgstr "О программе"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "File could not be found."
-msgstr "Файл не найден"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-msgid "Combine Way"
-msgstr "Объединить линию"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-msgid "Combine several ways into one."
-msgstr "Объединить несколько линий в одну."
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:67
-msgid "Please select at least two ways to combine."
-msgstr "Выделите не менее двух линий для объединения."
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112
-msgid "Combine ways with different memberships?"
-msgstr "Объединить линии, входящие в разные отношения?"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113
+"\n"
+"Altitude: {0} m"
+msgstr ""
+"\n"
+"Высота: {0} м"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169
+#, java-format
 msgid ""
-"The selected ways have differing relation memberships.  Do you still want to "
-"combine them?"
-msgstr ""
-"У выделенных линий различается участие в отношениях. Всё равно хотите их "
-"объединить?"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
-msgid "Combine Anyway"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141
-msgid "Change directions?"
-msgstr "Изменить направления?"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142
+"\n"
+"{0} km/h"
+msgstr ""
+"\n"
+"{0} км/ч"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+msgid "Extracting GPS locations from EXIF"
+msgstr "Извлечение GPS координат из EXIF"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+msgid "Starting directory scan"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+msgid "One of the selected files was null !!!"
+msgstr "Один из выбранных файлов пуст!"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+msgid "Read photos..."
+msgstr "Загрузка фото..."
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#, java-format
+msgid "Unable to get canonical path for directory {0}\n"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#, java-format
+msgid "Scanning directory {0}"
+msgstr "Скнирование каталога {0}"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#, java-format
+msgid "Found null file in directory {0}\n"
+msgstr "Найден пустой файл в каталоге {0}\n"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#, java-format
+msgid "Error while getting files from directory {0}\n"
+msgstr "Ошибка чтения файлов в каталоге {0}\n"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:260
+msgid "Correlate to GPX"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#, java-format
+msgid "{0} were found to be gps tagged."
+msgstr "{0} изображений имело тэги GPS"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
+msgid "Open images with AgPifoJ..."
+msgstr "Открыть изображение через AgPifoJ..."
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:49
+msgid "Load set of images as a new layer."
+msgstr "Загрузить набор изображений на новый слой."
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131
+msgid "GPX Files (*.gpx *.gpx.gz)"
+msgstr "Файлы GPX (*.gpx *.gpx.gz)"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151
+#, java-format
+msgid "File {0} is loaded yet under the name \"{1}\""
+msgstr "Файл {0} загружен под именем \"{1}\""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210
 msgid ""
-"The ways can not be combined in their current directions.  Do you want to "
-"reverse some of them?"
-msgstr ""
-"Линии с их текущими направлениями не объединить. Обратить некоторые линии?"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
-msgid "Reverse and Combine"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:123
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:315
-msgid "Enter values for all conflicts."
-msgstr "Введите значения для всех конфликтов."
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317
-msgid "Solve Conflicts"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231
-#, java-format
-msgid "Combine {0} ways"
-msgstr "Объединить {0} линии"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:256
-msgid "All the ways were empty"
-msgstr "Все линии были пустыми"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:285
+"<html>Take a photo of your GPS receiver while it displays the time."
+"<br>Display that photo here.<br>And then, simply capture the time you read "
+"on the photo and select a timezone<hr></html>"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228
+msgid "Photo time (from exif):"
+msgstr "Время фотоснимка (из EXIF):"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243
+msgid "Gps time (read from the above photo): "
+msgstr "Время GPS (прочтите на фото вверху): "
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255
+msgid " [dd/mm/yyyy hh:mm:ss]"
+msgstr " [дд/мм/гггг чч:мм:сс]"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263
+msgid "I'm in the timezone of: "
+msgstr "Я нахожусь в часовом поясе: "
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362
+msgid "No date"
+msgstr "Без даты"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335
+msgid "Open an other photo"
+msgstr "Открыть другое фото"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374
+msgid "Synchronize time from a photo of the GPS receiver"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385
 msgid ""
-"Could not combine ways (They could not be merged into a single string of "
-"nodes)"
-msgstr ""
-"Не удаётся объединить линии: они не могут быть представлены одной "
-"последовательностью точек."
-
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
-msgid "Preferences..."
-msgstr "Настройки..."
-
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
-msgid "Open a preferences page for global settings."
-msgstr "Изменить настройки программы"
-
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:45
-msgid "Preferences"
-msgstr "Настройки"
-
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
-msgid "OSM Server Files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
-msgid "GPX Files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28
-msgid "NMEA-0183 Files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43
+"Error while parsing the date.\n"
+"Please use the requested format"
+msgstr ""
+"Ошибка при разборе даты.\n"
+"Пожалуйста, используйте запрашиваемый формат"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387
+msgid "Invalid date"
+msgstr "Недопустимая дата"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430
+msgid "<No GPX track loaded yet>"
+msgstr "<Не загружены треки GPX>"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436
+msgid "GPX track: "
+msgstr "Трек GPX: "
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441
+msgid "Open another GPX trace"
+msgstr "Открыть другой трек GPX"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457
+msgid "Timezone: "
+msgstr "Часовой пояс: "
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479
+msgid "Offset:"
+msgstr "Смещение:"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491
+msgid "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
+msgstr ""
+"<html>Я могу сфотографировать экран GPS приёмника.<br>Это поможет?</html>"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508
+msgid "Update position for: "
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517
+msgid "All images"
+msgstr "Все изображения"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527
+msgid "Images with no exif position"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537
+msgid "Not yet tagged images"
+msgstr "Картинки без ярлыков"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557
+msgid "Correlate images with GPX track"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
+msgid "Correlate"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
+msgid "Auto-Guess"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569
+msgid "You should select a GPX track"
+msgstr "Необходимо выбрать трек GPX"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570
+msgid "No selected GPX track"
+msgstr "Не выбрано трека GPX"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582
+#, java-format
 msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"Внимание: GPL несовместима с лицензией OSM. Не загружайте треков, "
-"лицензированных под GPL"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-msgid "Export to GPX..."
-msgstr "Экспорт в GPX..."
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
-msgid "Export the data to GPX file."
-msgstr "Экспортировать данные в GPX файл"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55
-msgid "Nothing to export. Get some data first."
-msgstr "Нет данных для экспорта. Создайте данные."
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79
-msgid "gps track description"
-msgstr "описание трека GPS"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85
-msgid "Add author information"
-msgstr "Добавить информацию об авторе"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88
-msgid "Real name"
-msgstr "Настоящее имя"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Email"
-msgstr "Электронная почта"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
-msgid "Copyright (URL)"
-msgstr "Авторские права (ссылка)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100
-msgid "Predefined"
-msgstr "Набор"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102
-msgid "Copyright year"
-msgstr "Авторские права (год)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:110
-msgid "Keywords"
-msgstr "Ключевые слова"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:115
-msgid "Export options"
-msgstr "Опции экспорта"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-msgid "Export and Save"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583
+msgid "Invalid timezone"
+msgstr "Недопустимый часовой пояс"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595
 #, java-format
 msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-"Ошибка при экспорте {0}:\n"
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:197
-msgid "Choose a predefined license"
-msgstr "Выберите лицензию из набора"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-msgid "Save As..."
-msgstr "Сохранить как..."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
-msgid "Save the current data to a new file."
-msgstr "Сохранить текущие данные в новый файл."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#, java-format
-msgid "File: {0}"
-msgstr "Файл: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
-msgid "Split Way"
-msgstr "Разделить линию"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-msgid "Split a way at the selected node."
-msgstr "Разделить линию в выбранной точке."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
-msgid "The current selection cannot be used for splitting."
-msgstr "Текущее выделение невозможно разделить."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
-msgid "The selected node is not in the middle of any way."
-msgid_plural "The selected nodes are not in the middle of any way."
-msgstr[0] "Выбранная точка не является частью пути."
-msgstr[1] "Выбранные точки не являются частью пути."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596
+msgid "Invalid offset"
+msgstr "Недопустимое смещение"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639
+#, java-format
+msgid "Found {0} matches of {1} in GPX track {2}"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640
+msgid "GPX Track loaded"
+msgstr "Трек GPX загружен"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675
+msgid "The selected photos don't contain time information."
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676
+msgid "Photos don't contain time information"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713
 msgid ""
-"There is more than one way using the node you selected. Please select the "
-"way also."
-msgid_plural ""
-"There is more than one way using the nodes you selected. Please select the "
-"way also."
+"The selected GPX track doesn't contain timestamps. Please select another one."
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714
+msgid "GPX Track has no time information"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759
+#, java-format
+msgid "Timezone: {0}"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760
+#, java-format
+msgid "Minutes: {0}"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761
+#, java-format
+msgid "Seconds: {0}"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#, java-format
+msgid "Matched {0} of {1} photos to GPX track."
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+#, java-format
+msgid "(Time difference of {0} days)"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#, java-format
+msgid "Offset between track and photos: {0}m {1}s"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+msgid ""
+"An error occured while trying to match the photos to the GPX track. You can "
+"adjust the sliders to manually match the photos."
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+msgid "Matching photos to track failed"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+msgid "Adjust timezone and offset"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+msgid "Default Values"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:428
+msgid "No image"
+msgstr "Изображений нет"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:438
+#, java-format
+msgid "Loading {0}"
+msgstr "Загрузка {0}"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:440
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:467
+#, java-format
+msgid "Error on file {0}"
+msgstr "Ошибка в файле {0}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+msgid "Error loading file"
+msgstr "Ошибка при загрузке файла"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:16
+msgid "Lambert Zone 1 cache file (.1)"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17
+msgid "Lambert Zone 2 cache file (.2)"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18
+msgid "Lambert Zone 3 cache file (.3)"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19
+msgid "Lambert Zone 4 cache file (.4)"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165
+msgid "CadastreGrabber: Illegal url."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:65
+#, java-format
+msgid ""
+"Town/city {0} not found or not available in WMS.\n"
+"Please check its availibility on www.cadastre.gouv.fr"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:283
+msgid "Choose from..."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:292
+msgid "Select commune"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:306
+msgid "Select Tableau d'Assemblage"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:128
+msgid "Cadastre"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:139
+msgid "Auto sourcing"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164
+msgid "Invalid projection"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
+#, java-format
+msgid "Change the projection to {0} first."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:169
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the JOSM projection to Lambert and restart"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28
+msgid "Replace original background by JOSM background color."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+msgid "Reverse grey colors (for black backgrounds)."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+msgid "Set background transparent."
+msgstr "Установить прозрачный фон."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+msgid "Draw boundaries of downloaded data."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47
+msgid "Enable automatic caching."
+msgstr "Включить автоматическое кеширование."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50
+msgid "Max. cache size (in MB)"
+msgstr "Макс. размер кеша (МБ)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:55
+msgid ""
+"A special handler of the french cadastre wms at www.cadastre.gouv."
+"fr<BR><BR>Please read the Terms and Conditions of Use here (in french): "
+"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
+"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
+"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
+"by this plugin."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
+msgid "French cadastre WMS"
+msgstr "WMS французского кадастра"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65
+msgid "Source"
+msgstr "Источник"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161
+msgid ""
+"Replace the original white background by the backgound color defined in JOSM "
+"preferences."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87
+msgid "Allows multiple layers stacking"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102
+msgid "Draw a rectangle around downloaded data from WMS server."
+msgstr ""
+
+#. the downloaded images multiplier
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106
+msgid "Image grab multiplier:"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:125
+msgid "Grab smaller images (higher quality but use more memory)"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
+msgid "Fixed size (from 25 to 1000 meters)"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167
+msgid "Oldest files are automatically deleted when this size is exceeded"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78
+msgid "Auto-tag source added:"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:83
+msgid "Add \"source=...\" to elements?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:43
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:47
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20
+#, java-format
+msgid "Downloading {0}"
+msgstr "Загружается {0}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:51
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:55
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28
+msgid "Contacting WMS Server..."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157
+msgid "Create buildings"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215
+msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61
+msgid "Extract SVG ViewBox..."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65
+msgid "Extract best fitting boundary..."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126
+msgid "Create boundary"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:20
+msgid "Extract commune boundary"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
+msgid "Only on vectorized layers"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+msgid "Extract building footprints"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+msgid "Download Image from french Cadastre WMS"
+msgstr "Загрузить изображение с французского Cadastre WMS"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#, java-format
+msgid "Cadastre: {0}"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
+msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33
+msgid "Zone"
+msgstr "Зона"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44
+msgid "Lambert zone"
+msgstr "Зона Ламберта"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:19
+msgid "Load location from cache (only if cache is enabled)"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
+msgid "Change location"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
+msgid "Set a new location for the next request"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:38
+msgid "Open a layer first (GPX, OSM, cache)"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+msgid "Add a new layer"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52
+msgid "Location"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:70
+msgid "Add new layer"
+msgstr "Добавить новый слой"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+msgid "Reset cookie"
+msgstr "Сбросить куки"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+msgid "Get a new cookie (session timeout)"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58
+#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136
+#, java-format
+msgid "Simplify Way (remove {0} node)"
+msgid_plural "Simplify Way (remove {0} nodes)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
-msgid "The selected nodes do not share the same way."
-msgstr "Выбранные точки не являются частью одной линии."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "Выбранная линия не содержит выбранной точки"
-msgstr[1] "Выбранная линия не содержит выбранных точек"
-msgstr[2] "Выбранная линия не содержит выбранных точек"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229
-msgid "You must select two or more nodes to split a circular way."
-msgstr "Чтобы разделить замкнутую линию, выберите две или более точки."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
+msgid "Adjust WMS"
+msgstr "Подстроить WMS"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35
+msgid "Adjust the position of the WMS layer"
+msgstr "Подстроить положение слоя WMS"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19
+#: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:18
+#, java-format
+msgid "Download WMS tile from {0}"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:43
 msgid ""
-"The way cannot be split at the selected nodes. (Hint: Select nodes in the "
-"middle of the way.)"
-msgstr ""
-"Линию невозможно разделить в выделенных точках. (Выберите точки в середине "
-"линии)"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:149
+msgid "Blank Layer"
+msgstr "Пустой слой"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+msgid "Is not vectorized."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185
+#, java-format
+msgid "Raster center: {0}"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
+msgid "Is vectorized."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188
+#, java-format
+msgid "Commune bbox: {0}"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+msgid "Save WMS layer to file"
+msgstr "Сохранить слой WMS в файл"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+msgid "Load WMS layer from file"
+msgstr "Загрузить слой WMS из файла"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#, java-format
+msgid "Unsupported WMS file version; found {0}, expected {1}"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+msgid "File Format Error"
+msgstr "Ошибка формата файла"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:526
+#, java-format
 msgid ""
-"A role based relation membership was copied to all new ways.\n"
-"You should verify this and correct it when necessary."
-msgstr ""
-"Участие в отношениях было применено ко всем новым линиям.\n"
-"Проверьте, и при необходимости внесите корректировки."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:296
-#, java-format
-msgid "Split way {0} into {1} parts"
-msgstr "Разделить линию {0} на {1} частей"
-
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-msgid "data"
-msgstr "данные"
-
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-msgid "layer"
-msgstr "слой"
-
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-msgid "selection"
-msgstr "выделение"
-
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-msgid "download"
-msgstr "скачать"
-
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#, java-format
-msgid "Zoom to {0}"
-msgstr "Показать {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
-#, java-format
-msgid "Zoom the view to {0}."
-msgstr "Изменить масштаб чтобы показать {0}."
-
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
-msgid "Nothing selected to zoom to."
-msgstr "Ничего не выделено для показа."
-
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
-msgid "No conflicts to zoom to"
-msgstr "Нет конфликтов чтобы их показать."
-
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
-msgid "Create a new map."
-msgstr "Создать новую карту."
-
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22
-msgid "unnamed"
-msgstr "безымянный"
-
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
-msgid "Reverse Ways"
-msgstr "Изменить направление линии"
-
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-msgid "Reverse the direction of all selected ways."
-msgstr "Изменить направление линии на противоположное."
-
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56
-msgid "Please select at least one way."
-msgstr "Пожалуйста, выберите как минимум одну линию."
-
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
-msgid "Reverse ways"
-msgstr "Изменить направление линии"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
-msgid "Upload to OSM..."
-msgstr "Загрузить на OSM..."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
-msgid "Upload all changes to the OSM server."
-msgstr "Загрузить все изменения на OSM"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:78
-msgid "Objects to add:"
-msgstr "Новые объекты:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
-msgid "Objects to modify:"
-msgstr "Изменённые объекты:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
-msgid "Objects to delete:"
-msgstr "Удаляемые объекты:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
-msgid "Upload these changes?"
-msgstr "Загрузить эти изменения?"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
-msgid "Upload Changes"
-msgstr "Загрузить изменения"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-msgid "Nothing to upload. Get some data first."
-msgstr "Нечего загружать. Сначала создайте данные."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
-msgid "There are unresolved conflicts. You have to resolve these first."
-msgstr "Присутствуют неразрешённые конфликты. Для начала, разрешите их"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
-msgid "No changes to upload."
-msgstr "Нет изменений для загрузки."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
-msgid "Uploading data"
-msgstr "Загрузка данных"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:112
-msgid "Paste"
-msgstr "Вставить"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-msgid "Paste contents of paste buffer."
-msgstr "Вставить содержимое буфера."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42
-msgid "Open..."
-msgstr "Открыть..."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41
-msgid "Open a file."
-msgstr "Открыть файл."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:68
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170
-#, java-format
-msgid "Error while parsing {0}"
-msgstr "Ошибка парсинга {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:71
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174
-#, java-format
-msgid "Could not read \"{0}\""
-msgstr "Невозможно прочитать \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108
-#, java-format
-msgid "Unknown file extension: {0}"
-msgstr "Неизвестное расширение файла: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:122
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:160
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:88
-#, java-format
-msgid "Markers from {0}"
-msgstr "Маркеры из {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:134
-msgid "Coordinates imported: "
-msgstr "Координаты импортированы: "
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135
-msgid "Malformed sentences: "
-msgstr "Неправильно составленные предложения: "
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136
-msgid "Checksum errors: "
-msgstr "Ошибки контрольных сумм: "
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:138
-msgid "Unknown sentences: "
-msgstr "Неизвестные предложения: "
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139
-msgid "Zero coordinates: "
-msgstr "Пустые координаты: "
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:143
-msgid "NMEA import success"
-msgstr "Импорт NMEA успешно завершён"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:147
-msgid "NMEA import faliure!"
-msgstr "Сбой при импорте NMEA!"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
-msgid "Save"
-msgstr "Сохранить"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26
-msgid "Save the current data."
-msgstr "Сохранить текущие данные."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33
-msgid "Load Selection"
-msgstr "Загрузить выделенное"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:40
-#, java-format
-msgid "Contact {0}..."
-msgstr "Связаться с {0}..."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
-msgid "Downloading..."
-msgstr "Загрузка..."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:57
-#, java-format
-msgid "Could not read from URL: \"{0}\""
-msgstr "Ошибка соединения с адресом: \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:60
-#, java-format
-msgid "Parsing error in URL: \"{0}\""
-msgstr "Ошибка разбора ссылки: \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:46
-#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66
-msgid "No data loaded."
-msgstr "Никаких данных не загружено"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56
-msgid "Please enter a search string."
-msgstr "Пожалуйста, введите строку для поиска."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:60
-msgid "replace selection"
-msgstr "заменить выделение"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61
-msgid "add to selection"
-msgstr "добавить к выделению"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62
-msgid "remove from selection"
-msgstr "убрать из выделения"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:68
-msgid "case sensitive"
-msgstr "регистрозависимый"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
-msgid "regular expression"
-msgstr "регулярное выражение"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
-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:83
-msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-msgstr "<b>\"Baker Street\"</b> - 'Baker Street' в любом ключе или названии."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84
-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:85
-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:86
-msgid "<b>foot:</b> - key=foot set to any value."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87
-msgid "<u>Special targets:</u>"
-msgstr "<u>Специальные цели:</u>"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88
-msgid ""
-"<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
-msgstr ""
-"<b>type:</b> - тип объекта (<b>node</b>, <b>way</b>, <b>relation</b>)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89
-msgid "<b>user:</b>... - all objects changed by user"
-msgstr "<b>user:</b>... - все объекты, измененные заданным пользователем"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90
-msgid "<b>id:</b>... - object with given ID"
-msgstr "<b>id:</b>... - объект с заданным ID"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
-msgid "<b>nodes:</b>... - object with given number of nodes"
-msgstr "<b>nodes:</b>... - объект с заданным количеством узлов"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - все измененные объекты"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - все выбранные объекты"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - все незаконченные объекты"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
-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:97
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-msgstr ""
-"Используйте <b>\"</b> чтобы заключить в кавычки операторы (например, если "
-"ключ содержит двоеточие)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Используйте <b>(</b> и <b>)</b> для группировки выражений"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
-msgid "Start Search"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:171
-#, java-format
-msgid "No match found for ''{0}''"
-msgstr "Не найдено совпадений для ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:173
-#, java-format
-msgid "Nothing added to selection by searching for ''{0}''"
-msgstr "Ничего не добавлено к выделению в результате поиска ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
-#, java-format
-msgid "Nothing removed from selection by searching for ''{0}''"
-msgstr "Ничего не удалено из выделения в результате поиска ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
-#, java-format
-msgid "Found {0} matches"
-msgstr "Найдено {0} совпадений"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
-msgid "CI"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
-msgid "CS"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
-msgid "RX"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:28
-#, java-format
-msgid ""
-"The regex \"{0}\" had a parse error at offset {1}, full error:\n"
-"\n"
-"{2}"
-msgstr ""
-"Ошибка в регулярном выражении \"{0}\" на позиции {1}, полный текст ошибки:\n"
-"\n"
-"{2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:360
-msgid "Missing arguments for or."
-msgstr "Отсутствуют параметры для \"ИЛИ\""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:371
-msgid "Missing argument for not."
-msgstr "Отсутствуют параметры для \"НЕ\""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382
-msgid "Expected closing parenthesis."
-msgstr "Отсутствует закрывающая скобка"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-msgid "Join Node to Way"
-msgstr "Включить точку в линию"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
-msgid "Join a node into the nearest way segments"
-msgstr "Включить точку в состав ближайшей линии."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66
-msgid "Join Node and Line"
-msgstr "Включить точку в линию"
-
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245
-msgid "Align Nodes in Circle"
-msgstr "Выстроить точки окружностью"
-
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-msgid "Move the selected nodes into a circle."
-msgstr "Переместить выделенные точки так, чтобы они сформировали окружность."
-
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:93
-msgid "Some of the nodes are (almost) in the line"
-msgstr "Некоторые точки - (почти) на одной линии"
-
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180
-msgid "Please select at least four nodes."
-msgstr "Выделите не менее четырёх точек."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:73
-msgid ""
-"Internal Error: cannot check conditions for no layer. Please report this as "
-"a bug."
-msgstr ""
-"Внутренняя ошибка: невозможно проверить условия без слоя. Пожалуйста, "
-"создайте отчёт об ошибке."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:77
-msgid "No document open so nothing to save."
-msgstr "Нет открытых документов. Нечего сохранять."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
-msgid "Empty document"
-msgstr "Пустой документ"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
-msgid "The document contains no data."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
-msgid "Save anyway"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
-msgid ""
-"There are unresolved conflicts. Conflicts will not be saved and handled as "
-"if you rejected all. Continue?"
-msgstr ""
-"Имеются неразрешенные конфликты. Конфликтующие объекты не будут сохранены и "
-"будут обработаны, как будто вы отменили их все. Продолжить?"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
-msgid "Reject Conflicts and Save"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
-msgid "Save GPX file"
-msgstr "Сохранить файл GPX"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
-msgid "Save OSM file"
-msgstr "Сохранить файл OSM"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
-msgid "Could not back up file."
-msgstr "Невозможно создать резервную копию."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:165
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
-msgid "Unknown file extension."
-msgstr "Неизвестное расширение файла."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:171
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-msgid "An error occurred while saving."
-msgstr "При сохранении возникла ошибка."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:181
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
-msgid "An error occurred while restoring backup file."
-msgstr "При восстановлении из резервной копии возникла ошибка."
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
-msgid "Show Status Report"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
-msgid ""
-"Show status report with useful information that can be attached to bugs"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
-#, java-format
-msgid "Help: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
-msgid "Status Report"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93
-msgid "Copy to clipboard and close"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206
-msgid "Close"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-msgid "Redo"
-msgstr "Вернуть"
-
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
-msgid "Redo the last undone action."
-msgstr "Вернуть последнее отменённое действие."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45
-msgid "Delete Mode"
-msgstr "Режим удаления"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47
-msgid "Delete nodes or ways."
-msgstr "Удалить точки или линии."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
-#, java-format
-msgid "Mode: {0}"
-msgstr "Режим: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131
-msgid ""
-"Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
-"when deleting a way. Ctrl: delete referring objects."
-msgstr ""
-"Щёлкните для удаления. Shift: удалить сегмент. Alt: не удалять "
-"неиспользуемые точки при удалении линии. Ctrl: удалить линию, но оставить "
-"точки."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
-msgid ""
-"Drag play head and release near track to play audio from there; "
-"SHIFT+release to synchronize audio at that point."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-msgid "Extrude"
-msgstr "Выдавливание"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
-msgid "Create areas"
-msgstr "Создание областей"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248
-msgid "Extrude Way"
-msgstr "Выдавливание линии"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
-msgid "Release the mouse button to select the objects in the rectangle."
-msgstr "Отпустите кнопку мыши, чтобы выделить объекты в прямоугольнике."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263
-msgid "Draw a rectangle of the desired size, then release the mouse button."
-msgstr "Нарисуйте прямоугольник желаемых размеров, и отпустите кнопку мыши."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471
-msgid "Release the mouse button to stop rotating."
-msgstr "Отпустите кнопку мыши, чтобы прекратить вращение."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267
-msgid "Drag a way segment to make a rectangle."
-msgstr "Перемещайте сегмент линии, чтобы образовать прямоугольник"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
-msgid "Draw"
-msgstr "Рисовать"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90
-msgid "Draw nodes"
-msgstr "Рисовать точки"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
-msgid "Mode: Draw Focus"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:334
-msgid "Cannot add a node outside of the world."
-msgstr "Точка не может быть добавлена за пределами мира."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:486
-msgid "Add node"
-msgstr "Добавить точку"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:488
-msgid "Add node into way"
-msgstr "Вставить точку в линию"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493
-msgid "Connect existing way to node"
-msgstr "Присоединить линию к точке"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
-msgid "Add a new node to an existing way"
-msgstr "Добавить точку к линии"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
-msgid "Add node into way and connect"
-msgstr "Добавить точку к линии и объединить"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:876
-msgid "Create new node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:880
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888
-#, java-format
-msgid "Insert new node into way."
-msgid_plural "Insert new node into {0} ways."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:909
-msgid "Select node under cursor."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897
-msgid "Start new way from last node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899
-msgid "Continue way from last node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:911
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:921
-msgid "Finish drawing."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-msgid "Select, move and rotate objects"
-msgstr "Выбирать, двигать и вращать объекты"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
-#, java-format
-msgid "Add and move a virtual new node to way"
-msgid_plural "Add and move a virtual new node to {0} ways"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-msgid "Cannot move objects outside of the world."
-msgstr "Невозможно переместить объекты за пределы мира."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
-msgid ""
-"Release the mouse button to stop moving. Ctrl to merge with nearest node."
-msgstr ""
-"Отпустите кнопку мыши, чтобы прекратить перемещение. Нажмите Ctrl для "
-"объединения с ближайшей точкой."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473
-msgid ""
-"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
-"Ctrl to rotate selected; or change selection"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
-msgid "Zoom"
-msgstr "Масштаб"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
-msgid "Zoom and move map"
-msgstr "Изменять масштаб и двигать карту"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
-msgid ""
-"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
-"move zoom with right button"
-msgstr ""
-"Меняйте масштаб колесом мыши, или клавишами  Ctrl+. и Ctrl+,; перемещайте "
-"карту, нажав правую кнопку мыши, или Ctrl+вверх/вниз/влево/вправо"
-
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
-#: trans_surveyor.java:68
-msgid "Exit"
-msgstr "Выход"
-
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
-msgid "Exit the application."
-msgstr "Выйти из программы"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
-msgid "Merge Nodes"
-msgstr "Объединить точки"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-msgid "Merge nodes into the oldest one."
-msgstr "Объединить точки в одну (более старую)"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:73
-msgid "Please select at least two nodes to merge."
-msgstr "Пожалуйста, выберите как минимум две точки для объединения."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:148
-msgid "Merge nodes with different memberships?"
-msgstr "Объединить точки из разных отношений?"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:149
-msgid ""
-"The selected nodes have differing relation memberships.  Do you still want "
-"to merge them?"
-msgstr ""
-"Выделенные точки участвуют в различных отношениях. Всё равно хотите "
-"объединить?"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
-msgid "Merge Anyway"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
-msgstr ""
-"Не удаётся объединить точки: пришлось бы удалить линию, которая еще "
-"используется."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:277
-#, java-format
-msgid "Merge {0} nodes"
-msgstr "Объединить {0} точек"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
-msgid "Orthogonalize Shape"
-msgstr "Сделать углы прямыми"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41
-msgid "Move nodes so all angles are 90 or 270 degree"
-msgstr ""
-"Выстроить точки таким образом, чтобы углы между линиями были 90 или 270 "
-"градусов"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58
-msgid "Only two nodes allowed"
-msgstr "Возможно выбрать только две точки"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66
-msgid "Selection must consist only of ways."
-msgstr "Возможно выбирать только линии."
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73
-msgid "Please select one or more closed ways of at least four nodes."
-msgstr ""
-"Пожалуйста, выберите один или более путей, состоящих из как минимум четырех "
-"точек."
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88
-msgid "Please select ways with almost right angles to orthogonalize."
-msgstr ""
-"Пожалуйста, выберите контуры, у которых углы почти прямые, для применения "
-"функции."
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95
-msgid ""
-"<html>You are using the EPSG:4326 projection which might lead<br>to "
-"undesirable results when doing rectangular alignments.<br>Change your "
-"projection to get rid of this warning.<br>Do you want to continue?"
-msgstr ""
-"<html>Используется проекция EPSG:4326, что может привести<br>к нежелательным "
-"результатам при выравнивании углов.<br>Измените проекцию, чтобы это "
-"предупреждение больше не появлялось.<br>Всё равно продолжить?"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
-msgid "Only one node selected"
-msgstr "Выбрана только одна точка"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243
-msgid "Orthogonalize"
-msgstr "Сделать углы прямыми"
-
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-msgid "Toggle GPX Lines"
-msgstr "Показать/скрыть линии GPX"
-
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
-#, java-format
-msgid "Toggles the global setting ''{0}''."
-msgstr "Включает/выключает глобальную установку: «{0}»."
-
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-msgid "Zoom In"
-msgstr "Увеличить масштаб"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-msgid "Unselect All"
-msgstr "Снять выделение"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
-msgid "Unselect all objects."
-msgstr "Снять выделение со всех объектов."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23
-msgid "Unselect All (Focus)"
-msgstr "Снять выделение со всего (Фокус)"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34
-msgid "Unselect All (Escape)"
-msgstr "Снять выделение со всего (Escape)"
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
-msgid "Create Circle"
-msgstr "Создать окружность"
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-msgid "Create a circle from three selected nodes."
-msgstr "Создать окружность по трём выделенным точкам"
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101
-msgid ""
-"Please select exactly three nodes or one way with exactly three nodes."
-msgstr ""
-"Пожалуйста, выберите ровно три точки, или линию, состоящую ровно из трёх "
-"точек."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
-msgid "Those nodes are not in a circle."
-msgstr "Точки не расположены по кругу"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:70
-msgid "Update Data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
-msgid "Updates the current data layer from the server (re-downloads data)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:71
-#, java-format
-msgid ""
-"This action will require {0} individual download requests. Do you wish to "
-"continue?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-msgid "Open Location..."
-msgstr "Открыть адрес..."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
-msgid "Open an URL."
-msgstr "Открыть ссылку."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38
-msgid "Separate Layer"
-msgstr "На отдельный слой"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41
-msgid "Enter URL to download:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46
-msgid "Download Location"
-msgstr "Путь загрузки"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-msgid "Download URL"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53
-msgid "Add Node..."
-msgstr "Добавить точку..."
-
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
-msgid "Add a node by entering latitude and longitude."
-msgstr "Добавить точку, указав её широту и долготу"
-
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37
-msgid "Enter the coordinates for the new node."
-msgstr "Введите координаты новой точки"
-
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38
-msgid "Use decimal degrees."
-msgstr "Использовать десятичные градусы"
-
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39
-msgid "Negative values denote Western/Southern hemisphere."
-msgstr "Отрицательные значения обозначают западное/южное полушарие"
-
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
-#: ../plugins/livegps/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
-#: ../plugins/grid/src/grid/GridLayer.java:193
-msgid "Latitude"
-msgstr "Широта"
-
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
-#: ../plugins/livegps/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96
-#: ../plugins/grid/src/grid/GridLayer.java:195
-msgid "Longitude"
-msgstr "Долгота"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
-msgid "up"
-msgstr "вверх"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
-#, java-format
-msgid "Move objects {0}"
-msgstr "Переместить объекты {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
-msgid "down"
-msgstr "вниз"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
-msgid "left"
-msgstr "влево"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
-msgid "right"
-msgstr "вправо"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
-#, java-format
-msgid "Move {0}"
-msgstr "Переместить {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
-#, java-format
-msgid "Moves Objects {0}"
-msgstr "Перемещает объекты {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379
-msgid "Overwrite"
-msgstr "Перезаписать"
-
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379
-msgid "File exists. Overwrite?"
-msgstr "Файл уже существует. Перезаписать?"
-
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35
-msgid "Copy"
-msgstr "Копировать"
-
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:34
-msgid "Copy selected objects to paste buffer."
-msgstr "Копировать выделенные объекты в буфер обмена."
-
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:125
-msgid "Please select something to copy."
-msgstr "Выделите что-нибудь для копирования."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
-msgid "UnGlue Ways"
-msgstr "Разъединить линии"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
-msgid "Duplicate nodes that are used by multiple ways."
-msgstr "Дублировать точки, используемые несколькими линиями."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80
-msgid "This node is not glued to anything else."
-msgstr "Данная точка не связана с чем-либо еще."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100
-msgid "None of these nodes are glued to anything else."
-msgstr "Ни одна из этих точек не притянута к другим."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
-msgid "None of this way's nodes are glued to anything else."
-msgstr "Ни одна из этих линий не притянута к другим."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
-msgid "The current selection cannot be used for unglueing."
-msgstr "Выделенные объекты невозможно разъединить"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
-msgid "Select either:"
-msgstr "Выберите один из вариантов:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
-msgid "* One tagged node, or"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
-msgid "* One node that is used by more than one way, or"
-msgstr "* Одна точка, используемая несколькими линиями, либо"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
-msgid ""
-"* One node that is used by more than one way and one of those ways, or"
-msgstr ""
-"* Одна точка, используемая несколькими линиями и одной из этих линий, либо"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
-msgid ""
-"* One way that has one or more nodes that are used by more than one way, or"
-msgstr "* Одна линия, имеющая точки, используемые несколькими линиями, либо"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
-msgid ""
-"* One way and one or more of its nodes that are used by more than one way."
-msgstr ""
-"* Одна линия, и одна или несколько её точек, которые используются "
-"несколькими линиями."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid ""
-"Note: If a way is selected, this way will get fresh copies of the unglued\n"
-"nodes and the new nodes will be selected. Otherwise, all ways will get "
-"their\n"
-"own copy and all nodes will be selected."
-msgstr ""
-"Прим.: Если выбрана линия, она получит дубликаты узлов, \n"
-"и они будут выбраны. В противном случае, все линии получат\n"
-"дубликаты точек, и все точки будут выбраны"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:160
-msgid "Unglued Node"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:373
-#, java-format
-msgid "Dupe into {0} nodes"
-msgstr "Дублировать в {0} точек"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:397
-#, java-format
-msgid "Dupe {0} nodes into {1} nodes"
-msgstr "Дублировать {0} точек в {1} точек"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
-msgid "Back"
-msgstr "Назад"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
-msgid "Jump back."
-msgstr "Перемотать назад."
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
-#, java-format
-msgid "Audio: {0}"
-msgstr "Звук: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
-msgid "Previous Marker"
-msgstr "Предыдущий маркер"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
-msgid "Play previous marker."
-msgstr "Воспроизвести предыдущий маркер"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
-msgid "Slower"
-msgstr "Медленнее"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12
-msgid "Slower Forward"
-msgstr "Играть медленнее."
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
-msgid "Next Marker"
-msgstr "Следующий маркер"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
-msgid "Play next marker."
-msgstr "Воспроизвести следующий маркер"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
-msgid "Forward"
-msgstr "Вперёд"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
-msgid "Jump forward"
-msgstr "Перемотать вперёд"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
-msgid "Play/Pause"
-msgstr "Воспроизвести/пауза"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
-msgid "Play/pause audio."
-msgstr "Воспроизвести/пауза"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
-msgid "Faster"
-msgstr "Быстрее"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12
-msgid "Faster Forward"
-msgstr "Играть быстрее."
-
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
-msgid "Select All"
-msgstr "Выбрать всё"
-
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-msgid ""
-"Select all undeleted objects in the data layer. This selects incomplete "
-"objects too."
-msgstr ""
-"Выделить все восстановленные объекты слоя данных. Также будут выделены "
-"незаконченные объекты."
-
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-msgid "Undo"
-msgstr "Отмена"
-
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
-msgid "Undo the last action."
-msgstr "Отменить последнее действие."
-
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30
-msgid "No Shortcut"
-msgstr "Нет ярлыка"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:39
-msgid "Downloading data"
-msgstr "Загрузка данных"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
-msgid "No data imported."
-msgstr "Данные не импортированы"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:58
-msgid "Data Layer"
-msgstr "Слой данных"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:70
-msgid "OpenStreetMap data"
-msgstr "Данные OpenStreetMap"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:28
-msgid "Downloading GPS data"
-msgstr "Скачивание данных GPS"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:41
-msgid "Downloaded GPX Data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:69
-msgid "Raw GPS data"
-msgstr "Данные GPS"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:58
-msgid "Paste Tags"
-msgstr "Вставить тэги"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28
-msgid "Apply tags of contents of paste buffer to all selected items."
-msgstr "Применить тэги из буфера ко всем выделенным объектам."
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-msgid "Download from OSM..."
-msgstr "Скачать с OSM..."
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
-msgid "Download map data from the OSM server."
-msgstr "Скачать картографические данные с сервера OSM."
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
-msgid "Download"
-msgstr "Скачать"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69
-msgid "Please select at least one task to download"
-msgstr "Выберите хотя бы один тип данных для загрузки."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Старый ключ"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Старое значение"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Новый ключ"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-msgid "New value"
-msgstr "Новое значение"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:39
-msgid "Apply selected changes"
-msgstr "Применить выбранные изменения"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
-msgid "Don't apply changes"
-msgstr "Не применять изменения"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82
-msgid "Please select which property changes you want to apply."
-msgstr "Пожалуйста, выберите, какие параметры нужно изменить."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:95
-msgid "Properties of "
-msgstr "Параметры "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119
-msgid "Roles in relations referring to"
-msgstr "Роли в отношениях, относящихся к"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135
-msgid "Automatic tag correction"
-msgstr "Автоматически исправлять тэги"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:136
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-"При изменении направления линии, предлагается исправить следующие параметры "
-"для поддержания целостности данных"
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Применить?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
-msgid "Relation"
-msgstr "Отношение"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
-msgid "Old role"
-msgstr "Старая роль"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
-msgid "New role"
-msgstr "Новая роль"
-
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527
+msgid "Cache Format Error"
+msgstr "Ошибка формата кеша"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542
+#, java-format
+msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+msgstr "Зона Ламберта {0} в кеше несовместима с текущей зоной Ламберта {1}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:544
+msgid "Cache Lambert Zone Error"
+msgstr ""
+
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+msgid "Use"
+msgstr "Использовать"
+
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+msgid "Please select a scheme to use."
+msgstr "Выберите тему для использования."
+
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+msgid "Color Scheme"
+msgstr "Цветовая схема"
+
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+msgid "Please select the scheme to delete."
+msgstr "Выберите тему для удаления."
+
+#. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+msgid "Use the selected scheme from the list."
+msgstr "Использовать выбранную тему из списка."
+
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+msgid "Use the current colors as a new color scheme."
+msgstr "Использовать текущие цвета как новую цветовую тему."
+
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+msgid "Delete the selected scheme from the list."
+msgstr "Удалить выбранную тему из списка."
+
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+msgid "Color Schemes"
+msgstr "Цветовые схемы"
+
+#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:21
-#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
 msgid "Duplicate Way"
 msgstr "Дубликат линии"
@@ -5473,7 +7240,597 @@
 msgstr "Создать копию линии"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementMode.java:47
-msgid "Can not draw outside of the world."
-msgstr "Действие невыполнимо за пределами мира."
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
+msgid "Position only"
+msgstr "Только положение"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:82
+msgid "Position, Time, Date, Speed"
+msgstr "Положение, время, дата, скорость"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:83
+msgid "Position, Time, Date, Speed, Altitude"
+msgstr "Положение, время, дата, скорость, высота"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:85
+msgid "A By Time"
+msgstr ""
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:86
+msgid "A By Distance"
+msgstr ""
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:87
+msgid "B By Time"
+msgstr ""
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:88
+msgid "B By Distance"
+msgstr ""
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:89
+msgid "C By Time"
+msgstr ""
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:90
+msgid "C By Distance"
+msgstr ""
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:137
+msgid "Data Logging Format"
+msgstr ""
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:151
+msgid "Disable data logging if speed falls below"
+msgstr ""
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:177
+msgid "Disable data logging if distance falls below"
+msgstr ""
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:307
+msgid "Unknown logFormat"
+msgstr ""
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:86
+msgid "Port:"
+msgstr "Порт:"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+msgid "Refresh"
+msgstr "Обновить"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:100
+msgid "refresh the port list"
+msgstr "обновить список портов"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:108
+msgid "Configure"
+msgstr "Настройка"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:116
+msgid "Configure Device"
+msgstr "Конфигурация устройства"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:125
+msgid "Connection Error."
+msgstr "Ошибка соединения."
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:130
+msgid "configure the connected DG100"
+msgstr ""
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:139
+msgid "delete data after import"
+msgstr "удалить данные после импорта"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48
+msgid "Importing data from device."
+msgstr "Импортирование данных с устройства."
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54
+msgid "Importing data from DG100..."
+msgstr "Импортирование данных с DG100..."
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68
+msgid "Error deleting data."
+msgstr "Ошибка удаления данных."
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74
+#, java-format
+msgid "imported data from {0}"
+msgstr "Импортированы данные с {0}"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77
+msgid "No data found on device."
+msgstr "На устройстве не найдено данных."
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82
+msgid "Connection failed."
+msgstr "Ошибка подключения."
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
+msgstr ""
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113
+msgid "Globalsat Import"
+msgstr "Импорт с Globalsat"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgstr "Импортировать данные с Globalsat Datalogger DG100 на слой GPX."
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119
+msgid "Import"
+msgstr "Импортировать"
+
+#: ../plugins/grid/src/grid/GridLayer.java:192
+msgid "Grid origin location"
+msgstr ""
+
+#: ../plugins/grid/src/grid/GridLayer.java:197
+msgid "Grid rotation"
+msgstr "Вращение сетки"
+
+#: ../plugins/grid/src/grid/GridLayer.java:199
+msgid "World"
+msgstr "Мир"
+
+#: ../plugins/grid/src/grid/GridLayer.java:200
+msgid "Grid layout"
+msgstr "Разметка сетки"
+
+#: ../plugins/grid/src/grid/GridLayer.java:222
+msgid "Grid layer:"
+msgstr "Слой сетки"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:56
+msgid "Normal"
+msgstr "Нормальный"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:57
+msgid "Rotate 90"
+msgstr "Повернуть на 90°"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:59
+msgid "Rotate 180"
+msgstr "Повернуть на 180°"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:61
+msgid "Rotate 270"
+msgstr "Повернуть на 270°"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:108
+msgid "Previous image"
+msgstr "Предыдущее изображение"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
+msgid "Next image"
+msgstr "Следующее изображение"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:144
+msgid "Rotate left"
+msgstr "Повернуть влево"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:146
+msgid "Rotate image left"
+msgstr "Вращать изображение влево"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:163
+msgid "Rotate right"
+msgstr "Повернуть вправо"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:165
+msgid "Rotate image right"
+msgstr "Вращать изображение вправо"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:187
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
+msgid "WayPoint Image"
+msgstr "Картинка ключевой точки"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:189
+msgid "Display non-geotagged photos"
+msgstr ""
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:74
+msgid "Imported Images"
+msgstr "Импортированные изображения"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:37
+msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
+msgstr "Файлы изображений (*.jpg, *.jpeg, *.png, *.gif)"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
+msgid "Open images with ImageWayPoint"
+msgstr "Открыть изображения в ImageWayPoint"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81
+msgid "Direction index '{0}' not found"
+msgstr "Индекс направления '{0}' не найден"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108
+msgid "The starting location was not within the bbox"
+msgstr "Начальное положение за границами рамки."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113
+msgid "Looking for shoreline..."
+msgstr "Поиск береговой линии..."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145
+#, java-format
+msgid "{0} nodes so far..."
+msgstr "найдено {0} точек..."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+msgid "Lake Walker."
+msgstr ""
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17
+msgid "Lake Walker"
+msgstr "Трасировщик озер"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119
+#, java-format
+msgid "Error creating cache directory: {0}"
+msgstr "Ошибка создания директории кэша: {0}"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152
+msgid "Tracing"
+msgstr "Трассировка"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154
+msgid "checking cache..."
+msgstr "проверка кэша..."
+
+#. *
+#. * Run the nodelist through a vertex reduction algorithm
+#.
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190
+msgid "Running vertex reduction..."
+msgstr "Упрощение геометрии..."
+
+#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain.");
+#. *
+#. * And then through douglas-peucker approximation
+#.
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200
+msgid "Running Douglas-Peucker approximation..."
+msgstr "Аппроксимация Douglas-Peucker..."
+
+#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain.");
+#. *
+#. * And then through a duplicate node remover
+#.
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210
+msgid "Removing duplicate nodes..."
+msgstr "Удаление повторяющихся точек..."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112
+msgid "Lakewalker trace"
+msgstr ""
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+msgid "east"
+msgstr "восток"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+msgid "northeast"
+msgstr "северо-восток"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+msgid "north"
+msgstr "север"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+msgid "northwest"
+msgstr "северо-запад"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+msgid "west"
+msgstr "запад"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+msgid "southwest"
+msgstr "юго-запад"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+msgid "south"
+msgstr "юг"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+msgid "southeast"
+msgstr "юго-восток"
+
+#. color highway_track
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--waterway tags -->
+#.
+#. <rule>
+#. <condition k="waterway" v="river"/>
+#. color riverbank
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="canal"/>
+#. color stream
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="drain"/>
+#. color marsh
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="water"/>
+#. <icon src="misc/no_icon.png"/>
+#. color water
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="coastline"/>
+#. <icon src="misc/no_icon.png"/>
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: build/trans_style.java:827 build/trans_style.java:844
+#: build/trans_style.java:860 build/trans_style.java:3076
+#: build/trans_style.java:3084
+msgid "water"
+msgstr "вода"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+msgid "coastline"
+msgstr "береговая линия"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+msgid "land"
+msgstr "земля"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+msgid "none"
+msgstr ""
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+msgid "Maximum number of segments per way"
+msgstr "Максимальное количество сегментов в линии"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+msgid "Maximum number of nodes in initial trace"
+msgstr ""
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+msgid "Maximum gray value to count as water (0-255)"
+msgstr "Самый светлый оттенок серого, который считать водой (0-255)"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+msgid "Line simplification accuracy (degrees)"
+msgstr "Точность упрощения линий (в градусах)"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+msgid "Resolution of Landsat tiles (pixels per degree)"
+msgstr "Разрешение изображений (точек на градус)"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+msgid "Size of Landsat tiles (pixels)"
+msgstr "Размер изображений (точек)"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+msgid "Shift all traces to east (degrees)"
+msgstr ""
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+msgid "Shift all traces to north (degrees)"
+msgstr ""
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+msgid "Direction to search for land"
+msgstr ""
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+msgid "Tag ways as"
+msgstr ""
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+msgid "WMS Layer"
+msgstr "Слой WMS"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+msgid "Maximum cache size (MB)"
+msgstr "Размер кэша (MB)"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+msgid "Maximum cache age (days)"
+msgstr "Хранить кэш (дней)"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+msgid "Source text"
+msgstr "Исходный текст"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgstr ""
+"Максимальное количество сегментов в создаваемых линиях. По умолчанию - 250."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
+msgstr ""
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
+msgstr ""
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in degrees."
+"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+msgstr ""
+"Точность алгоритма упрощения линий Douglas-Peucker, измеряемая в градусах."
+"<br>Меньшие значения дают больше точек, большие — более точные линии. По "
+"умолчанию 0.0003."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgstr ""
+"Разрешение спутниковых снимков, в точках на градус. По умолчанию - 4000."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgstr "Размер квадрата landsat, измеряемый в пикселях. По умолчанию 2000."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+msgid "Offset all points in East direction (degrees). Default 0."
+msgstr ""
+"Сдвинуть все точки в восточном направлении (в градусах). По умолчанию 0."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+msgid "Offset all points in North direction (degrees). Default 0."
+msgstr ""
+"Сдвинуть все точки в северном направлении (в градусах). По умолчанию 0."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+msgid "Direction to search for land. Default east."
+msgstr "Направление поиска земли. По умолчанию — восток."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgstr ""
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgstr "Какой слой WMS использовать для трасировки. По умолчанию IR1."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr "Макс. размер каждого каталога с кэшем, байт (по умолчанию 300 МБ)."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr "Макс. возраст файлов в кэше (по умолчанию 100 дней)."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+msgid "Data source text. Default is Landsat."
+msgstr ""
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+msgid "A plugin to trace water bodies on Landsat imagery."
+msgstr "Модуль для трасировки водоемов по изображениям Landsat."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+msgid "Lakewalker Plugin Preferences"
+msgstr "Настройки модуля Lakewalker"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45
+msgid "Downloading image tile..."
+msgstr "Скачивается квадрат изображения..."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148
+msgid "Could not acquire image"
+msgstr "Невозможно получить изображение"
+
+#: ../plugins/livegps/src/LiveGpsAcquirer.java:128
+#: ../plugins/livegps/src/LiveGpsAcquirer.java:144
+msgid "Connecting"
+msgstr "Подключение"
+
+#: ../plugins/livegps/src/LiveGpsAcquirer.java:204
+msgid "Connected"
+msgstr "Подключено"
+
+#. not connected:
+#: ../plugins/livegps/src/LiveGpsAcquirer.java:216
+#: ../plugins/livegps/src/LiveGpsAcquirer.java:232
+msgid "Not connected"
+msgstr "Не подключено"
+
+#: ../plugins/livegps/src/LiveGpsAcquirer.java:225
+msgid "Connection Failed"
+msgstr "Ошибка при подключении"
+
+#: ../plugins/livegps/src/LiveGpsDialog.java:45
+#: ../plugins/livegps/src/LiveGpsDialog.java:46
+msgid "Live GPS"
+msgstr ""
+
+#: ../plugins/livegps/src/LiveGpsDialog.java:45
+msgid "Show GPS data."
+msgstr "Показать данные GPS."
+
+#: ../plugins/livegps/src/LiveGpsDialog.java:50
+msgid "Status"
+msgstr "Состояние"
+
+#: ../plugins/livegps/src/LiveGpsDialog.java:52
+msgid "Way Info"
+msgstr "Информация о линии"
+
+#: ../plugins/livegps/src/LiveGpsDialog.java:58
+msgid "Speed"
+msgstr "Скорость"
+
+#: ../plugins/livegps/src/LiveGpsDialog.java:60
+msgid "Course"
+msgstr "Курс"
+
+#: ../plugins/livegps/src/LiveGpsLayer.java:25
+msgid "LiveGPS layer"
+msgstr "Слой LiveGPS"
+
+#: ../plugins/livegps/src/LiveGpsPlugin.java:41
+#: ../plugins/livegps/src/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/LiveGpsPlugin.java:68
+msgid "Capture GPS Track"
+msgstr "Захват пути GPS"
+
+#: ../plugins/livegps/src/LiveGpsPlugin.java:41
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgstr ""
+"Связаться с сервером gpsd и показать текущее положение на слое LiveGPS."
+
+#: ../plugins/livegps/src/LiveGpsPlugin.java:53
+#: ../plugins/livegps/src/LiveGpsPlugin.java:54
+msgid "Center Once"
+msgstr ""
+
+#: ../plugins/livegps/src/LiveGpsPlugin.java:53
+msgid "Center the LiveGPS layer to current position."
+msgstr ""
+
+#: ../plugins/livegps/src/LiveGpsPlugin.java:67
+msgid "Auto-Center"
+msgstr "Авто-центровка"
+
+#: ../plugins/livegps/src/LiveGpsPlugin.java:67
+msgid "Continuously center the LiveGPS layer to current position."
+msgstr ""
+
+#: ../plugins/livegps/src/LiveGpsPlugin.java:82
+msgid "LiveGPS"
+msgstr ""
 
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:68
@@ -5514,12 +7871,4 @@
 msgstr "Угол между двумя выбранными точками"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20
-msgid "measurement mode"
-msgstr "Режим измерения"
-
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36
-msgid "Measurements"
-msgstr "Измерения"
-
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:68
 msgid "Layer to make measurements"
@@ -5535,28 +7884,133 @@
 msgstr "Очистить существующий путь"
 
+#. TODO: register a listener and show menu entry only if gps layers are available
+#. no gps layer
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:341
 msgid "No GPX data layer found."
 msgstr "Не найдено слоя данных GPX"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:53
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#, java-format
-msgid "Error parsing {0}: {1}"
-msgstr "Ошибка разбора {0}: {1}"
-
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-msgid "Tagging Preset Tester"
-msgstr ""
-
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementMode.java:47
+msgid "Can not draw outside of the world."
+msgstr "Действие невыполнимо за пределами мира."
+
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20
+msgid "measurement mode"
+msgstr "Режим измерения"
+
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36
+msgid "Measurements"
+msgstr "Измерения"
+
+#: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorAction.java:28
+msgid "Navigate"
+msgstr "Навигация"
+
+#: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
+msgid "Navigator"
+msgstr "Навигатор"
+
+#: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
+msgid "Set start/end for routing. Middle mouse button to reset."
+msgstr ""
+
+#: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:40
+#: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:44
+msgid "Navigation"
+msgstr "Навигация"
+
+#: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:47
+msgid "Reset Graph"
+msgstr "Обнулить граф"
+
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
+msgid "OpenLayers"
+msgstr "ОткрытыеСлои"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52
+msgid "OpenStreetBugs download loop"
+msgstr "Цикл скачивания из OpenStreetBugs"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:101
+msgid "Displays OpenStreetBugs issues"
+msgstr "Отображает проблемы из OpenStreetBugs"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51
 msgid ""
-"Open the tagging preset test tool for previewing tagging preset dialogs."
-msgstr ""
-
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
-msgid "You have to specify tagging preset sources in the preferences first."
-msgstr ""
+"<html>The selected data contains data from OpenStreetBugs.<br>You cannot "
+"upload this data. Maybe you have selected the wrong layer?"
+msgstr ""
+"<html>Выбранная область содержат данные из OpenStreetBugs.<br>Невозможно "
+"загрузить эти данные. Возможно, выбран неверный слой."
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+msgid "Warning"
+msgstr "Предупреждение"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
+msgid "Couldn't create new bug. Result: {0}"
+msgstr "Невозможно создать баг. Результат: {0}"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
+msgid "Header contains several values and cannot be mapped to a single string"
+msgstr ""
+"Заголовок содержит несколько значений, и не может быть представлен одной "
+"строкой."
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+msgid "Open OpenStreetBugs"
+msgstr "Открытые OpenStreetBugs"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+msgid "Open the OpenStreetBugs window and activate the automatic download"
+msgstr "Открыть окно OpenStreetBugs, и включить автоматическое скачивание"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+msgid ""
+"The visible area is either too small or too big to download data from "
+"OpenStreetBugs"
+msgstr ""
+"Видимая область слишком мала/велика для скачивания данных из OpenStreetBugs"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:46
+msgid "Add a comment"
+msgstr "Добавить комментарий"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:51
+msgid "Enter your comment"
+msgstr "Введите Ваш комментарий"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:47
+msgid "Mark as done"
+msgstr "Отметить \"сделано\""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:53
+msgid "Really mark this issue as ''done''?"
+msgstr "Вы действительно желаете отметить проблему, как решённую?"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:54
+msgid "Really close?"
+msgstr "Действительно закрыть?"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:60
+msgid "New issue"
+msgstr "Новая проблема"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:97
+msgid "Describe the problem precisely"
+msgstr "Опишите проблему как можно подробнее"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:98
+msgid "Create issue"
+msgstr "Указать новую проблему"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+msgid "Please enter a user name"
+msgstr "Пожалуйста, введите имя пользователя"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+msgid "Unknown issue state"
+msgstr "Неизвестный статус проблемы"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:44
@@ -5573,123 +8027,78 @@
 msgstr "Не открыта область - невозможно определить границы!"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:101
-msgid "Displays OpenStreetBugs issues"
-msgstr "Отображает проблемы из OpenStreetBugs"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:43
+msgid "Osmarender"
+msgstr "Osmarender"
+
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:90
 msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-"Заголовок содержит несколько значений, и не может быть представлен одной "
-"строкой."
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
-msgid "Couldn't create new bug. Result: {0}"
-msgstr "Невозможно создать баг. Результат: {0}"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:47
-msgid "Mark as done"
-msgstr "Отметить \"сделано\""
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:53
-msgid "Really mark this issue as ''done''?"
-msgstr "Вы действительно желаете отметить проблему, как решённую?"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:54
-msgid "Really close?"
-msgstr "Действительно закрыть?"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:60
-msgid "New issue"
-msgstr "Новая проблема"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:97
-msgid "Describe the problem precisely"
-msgstr "Опишите проблему как можно подробнее"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:98
-msgid "Create issue"
-msgstr "Указать новую проблему"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:46
-msgid "Add a comment"
-msgstr "Добавить комментарий"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:51
-msgid "Enter your comment"
-msgstr "Введите Ваш комментарий"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
-msgid "Please enter a user name"
-msgstr "Пожалуйста, введите имя пользователя"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
-msgid "Unknown issue state"
-msgstr "Неизвестный статус проблемы"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-msgid "Open OpenStreetBugs"
-msgstr "Открытые OpenStreetBugs"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-msgid "Open the OpenStreetBugs window and activate the automatic download"
-msgstr "Открыть окно OpenStreetBugs, и включить автоматическое скачивание"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-msgid "Refresh"
-msgstr "Обновить"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
-msgid ""
-"The visible area is either too small or too big to download data from "
-"OpenStreetBugs"
-msgstr ""
-"Видимая область слишком мала/велика для скачивания данных из OpenStreetBugs"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-msgid "Warning"
-msgstr "Предупреждение"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51
-msgid ""
-"<html>The selected data contains data from OpenStreetBugs.<br>You cannot "
-"upload this data. Maybe you have selected the wrong layer?"
-msgstr ""
-"<html>Выбранная область содержат данные из OpenStreetBugs.<br>Невозможно "
-"загрузить эти данные. Возможно, выбран неверный слой."
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52
-msgid "OpenStreetBugs download loop"
-msgstr "Цикл скачивания из OpenStreetBugs"
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:112
-msgid "Remote Control has been asked to load data from the API."
-msgstr ""
-"модуль дистанционного управления получил запрос на загрузку данных из API."
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:113
-#, java-format
-msgid "Request details: {0}"
-msgstr "Подробности запроса: {0}"
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:113
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211
-msgid "Do you want to allow this?"
-msgstr "Разрешить действие?"
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:212
-msgid "Confirm Remote Control action"
-msgstr "Подтверждение действия дистанционного управления"
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:209
-msgid "Remote Control has been asked to import data from the following URL:"
-msgstr ""
-"Модуль дистанционного управления получил запрос на импортирование данных по "
-"следующей ссылке:"
+"Firefox not found. Please set firefox executable in the Map Settings page of "
+"the preferences."
+msgstr ""
+"Firefox не найден. Пожалуйста, укажите исполняемый файл Firefox на странице "
+"Настройки карты в окне настроек."
+
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:121
+msgid "osmarender options"
+msgstr ""
+
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:122
+msgid "Firefox executable"
+msgstr "исполняемый файл Firefox"
+
+#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:89
+msgid "Add Site"
+msgstr "Добавить сайт"
+
+#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:92
+msgid "Update Site URL"
+msgstr "Обновить сайты"
+
+#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103
+msgid "Invalid URL"
+msgstr "Недопустимая дата"
+
+#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:109
+msgid "Delete Site(s)"
+msgstr "Удалить сайт(ы)"
+
+#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:113
+msgid "Please select the site to delete."
+msgstr "Пожалуйста удалите сайт для удаления."
+
+#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:123
+msgid "Check Site(s)"
+msgstr "Проверить сайт(ы)"
+
+#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:127
+msgid "Please select the site(s) to check for updates."
+msgstr "Пожалуйста, отметьте сайт(ы) для обновления"
+
+#. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
+#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:151
+msgid "Add a new plugin site."
+msgstr "Добавть новый сайт модулей."
+
+#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:152
+msgid "Delete the selected site(s) from the list."
+msgstr "Удалить выбранный сайт(ы) из списка"
+
+#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:153
+msgid "Check the selected site(s) for new plugins or updates."
+msgstr ""
+
+#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:155
+msgid "Update Sites"
+msgstr "Обновить сайты"
+
+#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:108
+msgid "Version"
+msgstr "Версия"
+
+#. <FIXXME date="23.06.2007" author="cdaller">
+#. TODO i18n!
+#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:59
+msgid "Install"
+msgstr "Установить"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24
@@ -5735,23 +8144,186 @@
 msgstr "Разрешённые действия"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:43
-#: ../plugins/terracer/src/terracer/TerracerAction.java:47
-msgid "Terrace a building"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:45
-msgid "Creates individual buildings from a long building."
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:72
-msgid "How many buildings are in the terrace?"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:91
-msgid "Select a single, closed way of four nodes."
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:155
-msgid "Terrace"
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:112
+msgid "Remote Control has been asked to load data from the API."
+msgstr ""
+"модуль дистанционного управления получил запрос на загрузку данных из API."
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:113
+#, java-format
+msgid "Request details: {0}"
+msgstr "Подробности запроса: {0}"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:113
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211
+msgid "Do you want to allow this?"
+msgstr "Разрешить действие?"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:212
+msgid "Confirm Remote Control action"
+msgstr "Подтверждение действия дистанционного управления"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:209
+msgid "Remote Control has been asked to import data from the following URL:"
+msgstr ""
+"Модуль дистанционного управления получил запрос на импортирование данных по "
+"следующей ссылке:"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:61
+msgid "Slippy Map"
+msgstr "Интерактивная карта"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:67
+msgid "Load Tile"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:78
+msgid "Show Tile Status"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:89
+msgid "Request Update"
+msgstr "Запросить обновление"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:100
+msgid "Load All Tiles"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:110
+msgid "Increase zoom"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:119
+msgid "Decrease zoom"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:379
+msgid "image not loaded"
+msgstr "изображение не загружено"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+msgid "autozoom"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+msgid "autoload tiles"
+msgstr ""
+
+#. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+msgid "SlippyMap"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+msgid "Settings for the SlippyMap plugin."
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
+msgid "Tile Sources"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:50
+msgid "Auto zoom: "
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+msgid "Autoload Tiles: "
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:60
+msgid "Max zoom lvl: "
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+msgid "Fade background: "
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:76
+msgid "error loading metadata"
+msgstr "ошибка загрузки метаданных"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:90
+#, java-format
+msgid "requested: {0}"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:94
+msgid "error requesting update"
+msgstr "ошибка при запросе обновления"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
+msgid "AutoSave LiveData"
+msgstr ""
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
+msgid "Save captured data to file every minute."
+msgstr ""
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#, java-format
+msgid "Error while exporting {0}: {1}"
+msgstr "Ошибка при экспорте {0}: {1}"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:51
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:179
+msgid "Way: "
+msgstr ""
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
+msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
+msgstr ""
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:48
+msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!"
+msgstr "Модулю Surveyor необходим модуль LiveGps, но он не был обнаружен!"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
+msgid "Surveyor..."
+msgstr ""
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
+msgid "Open surveyor tool."
+msgstr ""
+
+#. surveyorFrame.setTitle((String)getValue(AbstractAction.NAME));
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:110
+msgid "Surveyor"
+msgstr ""
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
+#, java-format
+msgid "Could not read surveyor definition: {0}"
+msgstr ""
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:53
+#, java-format
+msgid "Error parsing {0}: {1}"
+msgstr "Ошибка разбора {0}: {1}"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
+msgid "start"
+msgstr "старт"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
+msgid "end"
+msgstr "конец"
+
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+msgid "Tagging Preset Tester"
+msgstr ""
+
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+msgid ""
+"Open the tagging preset test tool for previewing tagging preset dialogs."
+msgstr ""
+
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+msgid "You have to specify tagging preset sources in the preferences first."
 msgstr ""
 
@@ -5765,1714 +8337,105 @@
 msgstr "Импортировать файл TCX как трек GPS"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81
-msgid "Direction index '{0}' not found"
-msgstr "Индекс направления '{0}' не найден"
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108
-msgid "The starting location was not within the bbox"
-msgstr "Начальное положение за границами рамки."
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113
-msgid "Looking for shoreline..."
-msgstr "Поиск береговой линии..."
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145
-#, java-format
-msgid "{0} nodes so far..."
-msgstr "найдено {0} точек..."
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
-msgid "Lake Walker."
-msgstr ""
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17
-msgid "Lake Walker"
-msgstr "Трасировщик озер"
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119
-#, java-format
-msgid "Error creating cache directory: {0}"
-msgstr "Ошибка создания директории кэша: {0}"
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152
-msgid "Tracing"
-msgstr "Трассировка"
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154
-msgid "checking cache..."
-msgstr "проверка кэша..."
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190
-msgid "Running vertex reduction..."
-msgstr "Упрощение геометрии..."
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200
-msgid "Running Douglas-Peucker approximation..."
-msgstr "Аппроксимация Douglas-Peucker..."
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210
-msgid "Removing duplicate nodes..."
-msgstr "Удаление повторяющихся точек..."
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112
-msgid "Lakewalker trace"
-msgstr ""
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45
-msgid "Downloading image tile..."
-msgstr "Скачивается квадрат изображения..."
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148
-msgid "Could not acquire image"
-msgstr "Невозможно получить изображение"
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
-msgid "east"
-msgstr "восток"
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
-msgid "northeast"
-msgstr "северо-восток"
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
-msgid "north"
-msgstr "север"
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
-msgid "northwest"
-msgstr "северо-запад"
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
-msgid "west"
-msgstr "запад"
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
-msgid "southwest"
-msgstr "юго-запад"
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
-msgid "south"
-msgstr "юг"
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
-msgid "southeast"
-msgstr "юго-восток"
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: trans_style.java:827 trans_style.java:844 trans_style.java:860
-#: trans_style.java:2996 trans_style.java:3004
-msgid "water"
-msgstr "вода"
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-msgid "coastline"
-msgstr "береговая линия"
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-msgid "land"
-msgstr "земля"
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-msgid "none"
-msgstr ""
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
-msgid "Maximum number of segments per way"
-msgstr "Максимальное количество сегментов в линии"
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
-msgid "Maximum number of nodes in initial trace"
-msgstr ""
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
-msgid "Maximum gray value to count as water (0-255)"
-msgstr "Самый светлый оттенок серого, который считать водой (0-255)"
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
-msgid "Line simplification accuracy (degrees)"
-msgstr "Точность упрощения линий (в градусах)"
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
-msgid "Resolution of Landsat tiles (pixels per degree)"
-msgstr "Разрешение изображений (точек на градус)"
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
-msgid "Size of Landsat tiles (pixels)"
-msgstr "Размер изображений (точек)"
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
-msgid "Shift all traces to east (degrees)"
-msgstr ""
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
-msgid "Shift all traces to north (degrees)"
-msgstr ""
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
-msgid "Direction to search for land"
-msgstr ""
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
-msgid "Tag ways as"
-msgstr ""
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
-msgid "WMS Layer"
-msgstr "Слой WMS"
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
-msgid "Maximum cache size (MB)"
-msgstr "Размер кэша (MB)"
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
-msgid "Maximum cache age (days)"
-msgstr "Хранить кэш (дней)"
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
-msgid "Source text"
-msgstr "Исходный текст"
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
-msgstr ""
-"Максимальное количество сегментов в создаваемых линиях. По умолчанию - 250."
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
-msgstr ""
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
-msgstr ""
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
-msgstr ""
-"Точность алгоритма упрощения линий Douglas-Peucker, измеряемая в "
-"градусах.<br>Меньшие значения дают больше точек, большие — более точные "
-"линии. По умолчанию 0.0003."
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
-msgstr ""
-"Разрешение спутниковых снимков, в точках на градус. По умолчанию - 4000."
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
-msgid "Size of one landsat tile, measured in pixels. Default 2000."
-msgstr "Размер квадрата landsat, измеряемый в пикселях. По умолчанию 2000."
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
-msgid "Offset all points in East direction (degrees). Default 0."
-msgstr ""
-"Сдвинуть все точки в восточном направлении (в градусах). По умолчанию 0."
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
-msgid "Offset all points in North direction (degrees). Default 0."
-msgstr ""
-"Сдвинуть все точки в северном направлении (в градусах). По умолчанию 0."
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
-msgid "Direction to search for land. Default east."
-msgstr "Направление поиска земли. По умолчанию — восток."
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
-msgid "Tag ways as water, coastline, land or nothing. Default is water."
-msgstr ""
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
-msgid "Which WMS layer to use for tracing against. Default is IR1."
-msgstr "Какой слой WMS использовать для трасировки. По умолчанию IR1."
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
-msgid "Maximum size of each cache directory in bytes. Default is 300MB"
-msgstr "Макс. размер каждого каталога с кэшем, байт (по умолчанию 300 МБ)."
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
-msgid "Maximum age of each cached file in days. Default is 100"
-msgstr "Макс. возраст файлов в кэше (по умолчанию 100 дней)."
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
-msgid "Data source text. Default is Landsat."
-msgstr ""
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
-msgid "A plugin to trace water bodies on Landsat imagery."
-msgstr "Модуль для трасировки водоемов по изображениям Landsat."
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
-msgid "Lakewalker Plugin Preferences"
-msgstr "Настройки модуля Lakewalker"
-
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:56
-msgid "Normal"
-msgstr "Нормальный"
-
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:57
-msgid "Rotate 90"
-msgstr "Повернуть на 90°"
-
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:59
-msgid "Rotate 180"
-msgstr "Повернуть на 180°"
-
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:61
-msgid "Rotate 270"
-msgstr "Повернуть на 270°"
-
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:74
-msgid "Imported Images"
-msgstr "Импортированные изображения"
-
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:37
-msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
-msgstr "Файлы изображений (*.jpg, *.jpeg, *.png, *.gif)"
-
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
-msgid "Open images with ImageWayPoint"
-msgstr "Открыть изображения в ImageWayPoint"
-
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:49
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
-msgid "Load set of images as a new layer."
-msgstr "Загрузить набор изображений на новый слой."
-
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:70
-msgid "Previous"
-msgstr "Предыдущее"
-
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:108
-msgid "Previous image"
-msgstr "Предыдущее изображение"
-
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:86
-msgid "Next"
-msgstr "Следующее"
-
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
-msgid "Next image"
-msgstr "Следующее изображение"
-
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:144
-msgid "Rotate left"
-msgstr "Повернуть влево"
-
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:146
-msgid "Rotate image left"
-msgstr "Вращать изображение влево"
-
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:163
-msgid "Rotate right"
-msgstr "Повернуть вправо"
-
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:165
-msgid "Rotate image right"
-msgstr "Вращать изображение вправо"
-
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:187
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
-msgid "WayPoint Image"
-msgstr "Картинка ключевой точки"
-
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:189
-msgid "Display non-geotagged photos"
-msgstr ""
-
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
-msgid "OpenLayers"
-msgstr "ОткрытыеСлои"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
-msgid "Validation"
-msgstr "Проверка"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-msgid "Performs the data validation"
-msgstr "Произвести проверку данных"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91
-msgid "Validation errors"
-msgstr "Ошибки при проверке"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73
-msgid "Open the validation window."
-msgstr "Открыть окно проверки"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80
-msgid "Zoom to problem"
-msgstr "Показать проблему"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100
-msgid "Validate"
-msgstr "Проверить"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101
-msgid "Validate either current selection or complete dataset."
-msgstr "Проверить выделенное, либо все загруженные данные"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102
-msgid "Fix"
-msgstr "Исправить"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102
-msgid "Fix the selected errors."
-msgstr "Исправить выбранные ошибки."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106
-msgid "Ignore"
-msgstr "Игнорировать"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:107
-msgid "Ignore the selected errors next time."
-msgstr "Игнорировать выбранные ошибки в будущем."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192
-msgid "Whole group"
-msgstr "Всю группу"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192
-msgid "Single elements"
-msgstr "Отдельные элементы"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192
-msgid "Nothing"
-msgstr "Ничего"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:193
-msgid "Ignore whole group or individual elements?"
-msgstr "Игнорировать всю группу, или отдельные элементы?"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:194
-msgid "Ignoring elements"
-msgstr "Игнорировать элементы"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163
-msgid "Grid"
-msgstr "Сетка"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
-#, java-format
-msgid ""
-"Error initializing test {0}:\n"
-" {1}"
-msgstr ""
-"Ошибка при инициализации теста {0}:\n"
-" {1}"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75
-#, java-format
-msgid "{0}, ..."
-msgstr "{0}, ..."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:13
-msgid "Errors"
-msgstr "Ошибки"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:13
-msgid "validation error"
-msgstr "ошибка при проверке"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:15
-msgid "Warnings"
-msgstr "Предупреждения"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:15
-msgid "validation warning"
-msgstr "предупреждение при проверке"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:17
-msgid "Other"
-msgstr "Другие"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:17
-msgid "validation other"
-msgstr "другое при проверке"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:68
-msgid "Use ignore list."
-msgstr "Использовать список игнорирования"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:69
-msgid "Use the ignore list to suppress warnings."
-msgstr "Использовать список игнорирования для подавления предупреждений"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
-msgid "Use error layer."
-msgstr "Использовать слой ошибок"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
-msgid "Use the error layer to display problematic elements."
-msgstr "Использовать слой ошибок для отображения проблемных областей"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
-msgid "On demand"
-msgstr "По требованию"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:79
-msgid "On upload"
-msgstr "При загрузке"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:90
-msgid ""
-"An OSM data validator that checks for common errors made by users and editor "
-"programs."
-msgstr ""
-"Модуль проверки данных OSM на предмет ошибок, часто вносимых пользователями "
-"и программами."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:91
-msgid "Data validator"
-msgstr "Проверка данных"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:89
-msgid "No validation errors"
-msgstr "Проверка не выявила ошибок"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:56
-msgid "Untagged, empty and one node ways."
-msgstr "Линии без тегов, пустые, из одной точки"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:57
-msgid "This test checks for untagged, empty and one node ways."
-msgstr "Данный тест ищет линии без тегов, пустые, и линии из одной точки"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
-msgid "Unnamed ways"
-msgstr "Безымянные линии"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
-msgid "Untagged ways"
-msgstr "Линии без тегов"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
-msgid "Empty ways"
-msgstr "Пустые линии"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
-msgid "One node ways"
-msgstr "Линии из одной точки"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:33
-msgid "Self-intersecting ways"
-msgstr "Линии, пересекающие сами себя"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:22
-msgid ""
-"This test checks for ways that contain some of their nodes more than once."
-msgstr "Этот тест ищет линии, содержащие одну точку несколько раз."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
-msgid "Crossing ways."
-msgstr "Пересекающиеся линии."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
-msgid ""
-"This test checks if two roads, railways or waterways crosses in the same "
-"layer, but are not connected by a node."
-msgstr ""
-"Данный тест проверяет, если две линии (дороги, железные дороги, водоёмы) "
-"пересекаются на одном слое, но не имеют общей точки."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:116
-msgid "Crossing ways"
-msgstr "Пересекающиеся линии"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21
-msgid "Duplicated way nodes."
-msgstr "Повторяющиеся точки"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22
-msgid "Checks for ways with identical consecutive nodes."
-msgstr "Ищет линии с различными точками, имеющими одинаковые координаты"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35
-msgid "Duplicated way nodes"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:67
-#, java-format
-msgid "Replace \"{0}\" by \"{1}\" for"
-msgstr "Заменить \"{0}\" на \"{1}\" для"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
-msgid "Coastlines."
-msgstr "Береговые линии"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
-msgid "This test checks that coastlines are correct."
-msgstr "Этот тест проверяет павильность береговых линий."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
-msgid "Unordered coastline"
-msgstr "Неупорядоченная береговая линия"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
-msgid "Unclosed Ways."
-msgstr "Незамкнутые линии"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
-msgid "This tests if ways which should be circular are closed."
-msgstr "Этот тест ищет разомкнутые линии, которые должны быть замкнутыми."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
-#, java-format
-msgid "natural type {0}"
-msgstr "естественного типа {0}"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
-#, java-format
-msgid "landuse type {0}"
-msgstr "землепользование типа {0}"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
-#, java-format
-msgid "amenities type {0}"
-msgstr "удобства типа {0}"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
-#, java-format
-msgid "sport type {0}"
-msgstr "спорт типа {0}"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
-#, java-format
-msgid "tourism type {0}"
-msgstr "туризм типа {0}"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
-#, java-format
-msgid "shop type {0}"
-msgstr "тип магазина: {0}"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
-#, java-format
-msgid "leisure type {0}"
-msgstr "отдых типа {0}"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
-#, java-format
-msgid "waterway type {0}"
-msgstr "тип водоёма: {0}"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: trans_style.java:3716 trans_style.java:3723 trans_style.java:3730
-#: trans_style.java:3737 trans_style.java:3744
-msgid "building"
-msgstr "здание"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: trans_style.java:3751
-msgid "area"
-msgstr "область"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
-msgid "Unclosed way"
-msgstr "Незамкнутая линия"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
-msgid "Overlapping ways."
-msgstr "Совпадающие линии."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
-msgid ""
-"This test checks that a connection between two nodes is not used by more "
-"than one way."
-msgstr ""
-"Этот тест проверяет, чтобы участок, соединяющий две точки, использовался "
-"только одной линией."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
-msgid "Overlapping areas"
-msgstr "Накладывающиеся области"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
-msgid "Overlapping highways (with area)"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
-msgid "Overlapping railways (with area)"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
-msgid "Overlapping ways (with area)"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
-msgid "Overlapping highways"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
-msgid "Overlapping railways"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
-msgid "Overlapping ways"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
-msgid "Wrongly Ordered Ways."
-msgstr "Неверно упорядоченные линии"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
-msgid "This test checks the direction of water, land and coastline ways."
-msgstr "Этот тест проверяет направление береговых линий."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
-msgid "Reversed coastline: land not on left side"
-msgstr "Неверное направление береговой линии: земля не слева"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:69
-msgid "Reversed water: land not on left side"
-msgstr "Неверное направление границы водоёма: земля не слева"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:74
-msgid "Reversed land: land not on left side"
-msgstr "Неверное направление линии суши: земля не слева"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:43
-msgid "Unconnected ways."
-msgstr "Несоединённые линии"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
-msgid "This test checks if a way has an endpoint very near to another way."
-msgstr ""
-"Этот тест ищет линии, край которых расположен очень близко к другой линии."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:76
-msgid "Way end node near other highway"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:102
-msgid "Way end node near other way"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:123
-msgid "Way node near other way"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:141
-msgid "Connected way end node near other way"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
-msgid "Similarly named ways"
-msgstr "Похожие названия линий"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
-msgid ""
-"This test checks for ways with similar names that may have been misspelled."
-msgstr ""
-"Этот тест ищет линии с похожими названиями. Возможно, это вызвано опечатками."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
-msgid "Nodes with same name"
-msgstr "Точки с одинаковыми названиями"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
-msgid "This test finds nodes that have the same name (might be duplicates)."
-msgstr ""
-"Этот тест ищет точки с одинаковыми названиями (возможно, это дубликаты)"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88
-msgid "Untagged and unconnected nodes"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35
-msgid "This test checks for untagged nodes that are not part of any way."
-msgstr ""
-"Этот тест ищет точки, не имеющие тегов, и не являющиеся частью линий."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:140
-msgid "Properties checker :"
-msgstr "Проверка параметров:"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
-msgid "This plugin checks for errors in property keys and values."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:217
-#, java-format
-msgid "Invalid tagchecker line - {0}: {1}"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:230
-#, java-format
-msgid "Invalid spellcheck line: {0}"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:241
-#, java-format
-msgid ""
-"Could not access data file(s):\n"
-"{0}"
-msgstr ""
-"Нет доступа к файлу(ам) данных:\n"
-"{0}"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:313
-msgid "Illegal tag/value combinations"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:326
-msgid "Painting problem"
-msgstr "Проблемы отображения"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:335
-#, java-format
-msgid "Key ''{0}'' invalid."
-msgstr "Неправильный ключ {0}."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:340
-msgid "Tags with empty values"
-msgstr "Пустые значения тегов"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:346
-msgid "Invalid property key"
-msgstr "Неверный ключ свойств"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:352
-msgid "Invalid white space in property key"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:358
-msgid "Property values start or end with white space"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:364
-msgid "Property values contain HTML entity"
-msgstr "Значения содержат HTML разметку"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:373
-#, java-format
-msgid "Key ''{0}'' not in presets."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:374
-msgid "Presets do not contain property key"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:380
-#, java-format
-msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
-msgid "Presets do not contain property value"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:391
-msgid "FIXMES"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:437
-msgid "Check property keys."
-msgstr "Проверьте ключи свойств."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:438
-msgid "Validate that property keys are valid checking against list of words."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:445
-msgid "Use complex property checker."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:446
-msgid "Validate property values and tags using complex rules."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:465
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:495
-msgid "TagChecker source"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:516
-msgid ""
-"The sources (URL or filename) of spell check (see "
-"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking "
-"data files."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:517
-msgid "Add a new source to the list."
-msgstr "Добавить в список новый источник."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:518
-msgid "Edit the selected source."
-msgstr "Править выбранный источник."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
-msgid "Data sources"
-msgstr "Источники данных"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:541
-msgid "Check property values."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-msgid "Validate that property values are valid checking against presets."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549
-msgid "Check for FIXMES."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550
-msgid "Looks for nodes or ways with FIXME in any property value."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:557
-msgid "Check for paint notes."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:558
-msgid "Check if map painting found data errors."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:565
-msgid "Use default data file."
-msgstr "Использовать файл данных по умолчанию."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:566
-msgid "Use the default data file (recommended)."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
-msgid "Use default spellcheck file."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:570
-msgid "Use the default spellcheck file (recommended)."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
-msgid "Fix properties"
-msgstr "Исправить параметры"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:772
-msgid "Could not find element type"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:789
-msgid "Could not find warning level"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:798
-#, java-format
-msgid "Illegal expression ''{0}''"
-msgstr "Недопустимое выражение ''{0}''"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:802
-#, java-format
-msgid "Illegal regular expression ''{0}''"
-msgstr "Недопустимое регулярное выражение ''{0}''"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50
-msgid "Duplicated nodes"
-msgstr "Дублированные узлы"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33
-msgid "This test checks that there are no nodes at the very same location."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:108
-msgid "Data with errors. Upload anyway?"
-msgstr "Данные содержат ошибки. Всё равно продолжить?"
-
-#: ../plugins/livegps/livegps/LiveGpsLayer.java:25
-msgid "LiveGPS layer"
-msgstr "Слой LiveGPS"
-
-#: ../plugins/livegps/livegps/LiveGpsPlugin.java:41
-#: ../plugins/livegps/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/livegps/LiveGpsPlugin.java:68
-msgid "Capture GPS Track"
-msgstr "Захват пути GPS"
-
-#: ../plugins/livegps/livegps/LiveGpsPlugin.java:41
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
-msgstr ""
-"Связаться с сервером gpsd и показать текущее положение на слое LiveGPS."
-
-#: ../plugins/livegps/livegps/LiveGpsPlugin.java:53
-#: ../plugins/livegps/livegps/LiveGpsPlugin.java:54
-msgid "Center Once"
-msgstr ""
-
-#: ../plugins/livegps/livegps/LiveGpsPlugin.java:53
-msgid "Center the LiveGPS layer to current position."
-msgstr ""
-
-#: ../plugins/livegps/livegps/LiveGpsPlugin.java:67
-msgid "Auto-Center"
-msgstr "Авто-центровка"
-
-#: ../plugins/livegps/livegps/LiveGpsPlugin.java:67
-msgid "Continuously center the LiveGPS layer to current position."
-msgstr ""
-
-#: ../plugins/livegps/livegps/LiveGpsPlugin.java:82
-msgid "LiveGPS"
-msgstr ""
-
-#: ../plugins/livegps/livegps/LiveGpsAcquirer.java:128
-#: ../plugins/livegps/livegps/LiveGpsAcquirer.java:144
-msgid "Connecting"
-msgstr "Подключение"
-
-#: ../plugins/livegps/livegps/LiveGpsAcquirer.java:204
-msgid "Connected"
-msgstr "Подключено"
-
-#: ../plugins/livegps/livegps/LiveGpsAcquirer.java:216
-#: ../plugins/livegps/livegps/LiveGpsAcquirer.java:232
-msgid "Not connected"
-msgstr "Не подключено"
-
-#: ../plugins/livegps/livegps/LiveGpsAcquirer.java:225
-msgid "Connection Failed"
-msgstr "Ошибка при подключении"
-
-#: ../plugins/livegps/livegps/LiveGpsDialog.java:45
-#: ../plugins/livegps/livegps/LiveGpsDialog.java:46
-msgid "Live GPS"
-msgstr ""
-
-#: ../plugins/livegps/livegps/LiveGpsDialog.java:45
-msgid "Show GPS data."
-msgstr "Показать данные GPS."
-
-#: ../plugins/livegps/livegps/LiveGpsDialog.java:50
-msgid "Status"
-msgstr "Состояние"
-
-#: ../plugins/livegps/livegps/LiveGpsDialog.java:52
-msgid "Way Info"
-msgstr "Информация о линии"
-
-#: ../plugins/livegps/livegps/LiveGpsDialog.java:58
-msgid "Speed"
-msgstr "Скорость"
-
-#: ../plugins/livegps/livegps/LiveGpsDialog.java:60
-msgid "Course"
-msgstr "Курс"
-
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-msgid "Surveyor..."
-msgstr ""
-
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
-msgid "Open surveyor tool."
-msgstr ""
-
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:110
-msgid "Surveyor"
-msgstr ""
-
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
-#, java-format
-msgid "Could not read surveyor definition: {0}"
-msgstr ""
-
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-msgid "start"
-msgstr "старт"
-
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-msgid "end"
-msgstr "конец"
-
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
-msgid "AutoSave LiveData"
-msgstr ""
-
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
-msgid "Save captured data to file every minute."
-msgstr ""
-
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:51
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:179
-msgid "Way: "
-msgstr ""
-
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
-msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
-msgstr ""
-
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
-#, java-format
-msgid "Error while exporting {0}: {1}"
-msgstr "Ошибка при экспорте {0}: {1}"
-
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:48
-msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!"
-msgstr "Модулю Surveyor необходим модуль LiveGps, но он не был обнаружен!"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:60
-msgid "Slippy Map"
-msgstr "Интерактивная карта"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:66
-msgid "Load Tile"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:79
-msgid "Show Tile Status"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
-msgid "Request Update"
-msgstr "Запросить обновление"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:105
-msgid "Load All Tiles"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:116
-msgid "Increase zoom"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:126
-msgid "Decrease zoom"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:405
-msgid "image not loaded"
-msgstr "изображение не загружено"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:76
-msgid "error loading metadata"
-msgstr "ошибка загрузки метаданных"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:90
-#, java-format
-msgid "requested: {0}"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:94
-msgid "error requesting update"
-msgstr "ошибка при запросе обновления"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
-msgid "autozoom"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
-msgid "autoload tiles"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
-msgid "SlippyMap"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
-msgid "Settings for the SlippyMap plugin."
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
-msgid "Tile Sources"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:50
-msgid "Auto zoom: "
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
-msgid "Autoload Tiles: "
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:60
-msgid "Max zoom lvl: "
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
-msgid "Fade background: "
-msgstr ""
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
-msgid "Position only"
-msgstr "Только положение"
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:82
-msgid "Position, Time, Date, Speed"
-msgstr "Положение, время, дата, скорость"
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:83
-msgid "Position, Time, Date, Speed, Altitude"
-msgstr "Положение, время, дата, скорость, высота"
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:85
-msgid "A By Time"
-msgstr ""
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:86
-msgid "A By Distance"
-msgstr ""
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:87
-msgid "B By Time"
-msgstr ""
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:88
-msgid "B By Distance"
-msgstr ""
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:89
-msgid "C By Time"
-msgstr ""
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:90
-msgid "C By Distance"
-msgstr ""
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:137
-msgid "Data Logging Format"
-msgstr ""
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:151
-msgid "Disable data logging if speed falls below"
-msgstr ""
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:177
-msgid "Disable data logging if distance falls below"
-msgstr ""
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:307
-msgid "Unknown logFormat"
-msgstr ""
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:86
-msgid "Port:"
-msgstr "Порт:"
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:100
-msgid "refresh the port list"
-msgstr "обновить список портов"
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:108
-msgid "Configure"
-msgstr "Настройка"
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:116
-msgid "Configure Device"
-msgstr "Конфигурация устройства"
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:125
-msgid "Connection Error."
-msgstr "Ошибка соединения."
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:130
-msgid "configure the connected DG100"
-msgstr ""
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:139
-msgid "delete data after import"
-msgstr "удалить данные после импорта"
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48
-msgid "Importing data from device."
-msgstr "Импортирование данных с устройства."
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54
-msgid "Importing data from DG100..."
-msgstr "Импортирование данных с DG100..."
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68
-msgid "Error deleting data."
-msgstr "Ошибка удаления данных."
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74
-#, java-format
-msgid "imported data from {0}"
-msgstr "Импортированы данные с {0}"
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77
-msgid "No data found on device."
-msgstr "На устройстве не найдено данных."
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82
-msgid "Connection failed."
-msgstr "Ошибка подключения."
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
-msgstr ""
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113
-msgid "Globalsat Import"
-msgstr "Импорт с Globalsat"
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112
-msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
-msgstr "Импортировать данные с Globalsat Datalogger DG100 на слой GPX."
-
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119
-msgid "Import"
-msgstr "Импортировать"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
-msgid "Change location"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
-msgid "Set a new location for the next request"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:38
-msgid "Open a layer first (GPX, OSM, cache)"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
-msgid "Add a new layer"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52
-msgid "Location"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
-msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:70
-msgid "Add new layer"
-msgstr "Добавить новый слой"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:43
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:47
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20
-#, java-format
-msgid "Downloading {0}"
-msgstr "Загружается {0}"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:51
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:55
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28
-msgid "Contacting WMS Server..."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157
-msgid "Create buildings"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165
-msgid "CadastreGrabber: Illegal url."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264
-msgid ""
-"To avoid cadastre WMS overload,\n"
-"building import size is limited to 1 km2 max."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215
-msgid "Please, enable auto-sourcing and check cadastre millesime."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78
-msgid "Auto-tag source added:"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:83
-msgid "Add \"source=...\" to elements?"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
-msgid "Download Image from french Cadastre WMS"
-msgstr "Загрузить изображение с французского Cadastre WMS"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
-#, java-format
-msgid "Cadastre: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:128
-msgid "Cadastre"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:139
-msgid "Auto sourcing"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164
-msgid "Invalid projection"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
-#, java-format
-msgid "Change the projection to {0} first."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:169
-msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the JOSM projection to Lambert and restart"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
-msgid "Extract building footprints"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
-msgid "Only on vectorized layers"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:20
-msgid "Extract commune boundary"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:16
-msgid "Lambert Zone 1 cache file (.1)"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17
-msgid "Lambert Zone 2 cache file (.2)"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18
-msgid "Lambert Zone 3 cache file (.3)"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19
-msgid "Lambert Zone 4 cache file (.4)"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:65
-#, java-format
-msgid ""
-"Town/city {0} not found or not available in WMS.\n"
-"Please check its availibility on www.cadastre.gouv.fr"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:283
-msgid "Choose from..."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:292
-msgid "Select commune"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:306
-msgid "Select Tableau d'Assemblage"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
-msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33
-msgid "Zone"
-msgstr "Зона"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44
-msgid "Lambert zone"
-msgstr "Зона Ламберта"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19
-#: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:18
-#, java-format
-msgid "Download WMS tile from {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:43
-msgid ""
-"More than one WMS layer present\n"
-"Select one of them first, then retry"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:19
-msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136
-#, java-format
-msgid "Simplify Way (remove {0} node)"
-msgid_plural "Simplify Way (remove {0} nodes)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61
-msgid "Extract SVG ViewBox..."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65
-msgid "Extract best fitting boundary..."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126
-msgid "Create boundary"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:149
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
-msgid "Blank Layer"
-msgstr "Пустой слой"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182
-#, java-format
-msgid "WMS layer ({0}), {1} tile(s) loaded"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
-msgid "Is not vectorized."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185
-#, java-format
-msgid "Raster center: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
-msgid "Is vectorized."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188
-#, java-format
-msgid "Commune bbox: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
-msgid "Save WMS layer to file"
-msgstr "Сохранить слой WMS в файл"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
-msgid "Load WMS layer from file"
-msgstr "Загрузить слой WMS из файла"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
-#, java-format
-msgid "Unsupported WMS file version; found {0}, expected {1}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
-msgid "File Format Error"
-msgstr "Ошибка формата файла"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
-msgid "Error loading file"
-msgstr "Ошибка при загрузке файла"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:526
-#, java-format
-msgid ""
-"Unsupported cache file version; found {0}, expected {1}\n"
-"Create a new one."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527
-msgid "Cache Format Error"
-msgstr "Ошибка формата кеша"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542
-#, java-format
-msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
-msgstr "Зона Ламберта {0} в кеше несовместима с текущей зоной Ламберта {1}"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:544
-msgid "Cache Lambert Zone Error"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28
-msgid "Replace original background by JOSM background color."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
-msgid "Reverse grey colors (for black backgrounds)."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
-msgid "Set background transparent."
-msgstr "Установить прозрачный фон."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
-msgid "Draw boundaries of downloaded data."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47
-msgid "Enable automatic caching."
-msgstr "Включить автоматическое кеширование."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50
-msgid "Max. cache size (in MB)"
-msgstr "Макс. размер кеша (МБ)"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:55
-msgid ""
-"A special handler of the french cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in french): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
-msgid "French cadastre WMS"
-msgstr "WMS французского кадастра"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64
-msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65
-msgid "Source"
-msgstr "Источник"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161
-msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87
-msgid "Allows multiple layers stacking"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92
-msgid "Set WMS layers transparency. Right is opaque, left is transparent."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102
-msgid "Draw a rectangle around downloaded data from WMS server."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106
-msgid "Image grab multiplier:"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:125
-msgid "Grab smaller images (higher quality but use more memory)"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129
-msgid "Fixed size square (default is 100m)"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
-msgid "Fixed size (from 25 to 1000 meters)"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167
-msgid "Oldest files are automatically deleted when this size is exceeded"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
-msgid "Adjust WMS"
-msgstr "Подстроить WMS"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35
-msgid "Adjust the position of the WMS layer"
-msgstr "Подстроить положение слоя WMS"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
-msgid "Reset cookie"
-msgstr "Сбросить куки"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
-msgid "Get a new cookie (session timeout)"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
-msgid "Jump To Position"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
-msgid "Opens a dialog that allows to jump to a specific location"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:65
-msgid "Enter Lat/Lon to jump to position."
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:67
-msgid "You can also paste an URL from www.openstreetmap.org"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:99
-msgid "Zoom (in metres)"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
-msgid "URL"
-msgstr "URL"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105
-msgid "Jump there"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
-msgid "Jump to Position"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:124
-msgid "Could not parse Latitude, Longitude or Zoom. Please check."
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:124
-msgid "Unable to parse Lon/Lat"
-msgstr ""
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
+#, fuzzy
+msgid "Reverse a terrace"
+msgstr "Изменить направление линии"
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
+msgid "Reverses house numbers on a terrace."
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
+#, fuzzy
+msgid "Reverse a Terrace"
+msgstr "Изменить направление линии"
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:113
+#, fuzzy
+msgid "Reverse Terrace"
+msgstr "Изменить направление линии"
+
+#: ../plugins/terracer/src/terracer/TerracerAction.java:78
+#: ../plugins/terracer/src/terracer/TerracerAction.java:82
+msgid "Terrace a building"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/TerracerAction.java:80
+msgid "Creates individual buildings from a long building."
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/TerracerAction.java:140
+#, fuzzy
+msgid "Select a single, closed way of at least four nodes."
+msgstr ""
+"Пожалуйста, выберите один или более путей, состоящих из как минимум четырех "
+"точек."
+
+#: ../plugins/terracer/src/terracer/TerracerAction.java:209
+msgid "Terrace"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/TerracerAction.java:402
+#: ../plugins/terracer/src/terracer/TerracerAction.java:420
+#: ../plugins/terracer/src/terracer/TerracerAction.java:484
+#, fuzzy
+msgid "All"
+msgstr "все"
+
+#: ../plugins/terracer/src/terracer/TerracerAction.java:403
+#: ../plugins/terracer/src/terracer/TerracerAction.java:427
+#, fuzzy
+msgid "Even"
+msgstr "чётные"
+
+#: ../plugins/terracer/src/terracer/TerracerAction.java:404
+#, fuzzy
+msgid "Odd"
+msgstr "Добавить"
+
+#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:68
+msgid "User"
+msgstr "Пользователь"
+
+#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:74
+#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:75
+msgid "Show Author Panel"
+msgstr ""
+
+#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:95
+msgid "Open User Page"
+msgstr "Открыть страницу пользователя"
+
+#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:96
+msgid "Open User Page in browser"
+msgstr "Открыть страницу пользователя в браузере"
+
+#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:109
+msgid "Select User's Data"
+msgstr ""
+
+#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:110
+msgid "Replaces Selection with Users data"
+msgstr ""
+
+#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:145
+msgid "Please select some data"
+msgstr "Пожалуйста, выберите данные"
+
+#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:149
+msgid "Please choose a user using the author panel"
+msgstr "Пожалуйста, выберите пользователя в панели авторов"
+
+#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:162
+msgid "Sorry, doesn't work with anonymous users"
+msgstr "Извините, для анонимных пользователей это недоступно"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:113
 msgid "Join overlapping Areas"
-msgstr ""
+msgstr "Объединить накладывающиеся области"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:113
 msgid "Joins areas that overlap each other"
-msgstr ""
+msgstr "Объединить области, накладывающиеся друг на друга"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
@@ -7523,4 +8486,44 @@
 msgstr ""
 
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
+msgid "Jump To Position"
+msgstr ""
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
+msgid "Opens a dialog that allows to jump to a specific location"
+msgstr ""
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:65
+msgid "Enter Lat/Lon to jump to position."
+msgstr ""
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:67
+msgid "You can also paste an URL from www.openstreetmap.org"
+msgstr ""
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:99
+msgid "Zoom (in metres)"
+msgstr ""
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+msgid "URL"
+msgstr "URL"
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105
+msgid "Jump there"
+msgstr ""
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
+msgid "Jump to Position"
+msgstr ""
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:124
+msgid "Could not parse Latitude, Longitude or Zoom. Please check."
+msgstr ""
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:124
+msgid "Unable to parse Lon/Lat"
+msgstr ""
+
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33
 msgid "Simplify Way"
@@ -7547,650 +8550,712 @@
 msgstr "Вы уверены?"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:428
-msgid "No image"
-msgstr "Изображений нет"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:438
-#, java-format
-msgid "Loading {0}"
-msgstr "Загрузка {0}"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:440
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:467
-#, java-format
-msgid "Error on file {0}"
-msgstr "Ошибка в файле {0}"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
-msgid "Open images with AgPifoJ..."
-msgstr "Открыть изображение через AgPifoJ..."
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
-msgid "Extracting GPS locations from EXIF"
-msgstr "Извлечение GPS координат из EXIF"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
-msgid "Starting directory scan"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
-msgid "One of the selected files was null !!!"
-msgstr "Один из выбранных файлов пуст!"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
-msgid "Read photos..."
-msgstr "Загрузка фото..."
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
-#, java-format
-msgid "Unable to get canonical path for directory {0}\n"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
-#, java-format
-msgid "Scanning directory {0}"
-msgstr "Скнирование каталога {0}"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
-#, java-format
-msgid "Found null file in directory {0}\n"
-msgstr "Найден пустой файл в каталоге {0}\n"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
-#, java-format
-msgid "Error while getting files from directory {0}\n"
-msgstr "Ошибка чтения файлов в каталоге {0}\n"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:260
-msgid "Correlate to GPX"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
-#, java-format
-msgid "{0} were found to be gps tagged."
-msgstr "{0} изображений имело тэги GPS"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
-msgid "AgPifoJ - Geotagged pictures"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
-msgid "Display geotagged photos"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78
-msgid "Remove photo from layer"
-msgstr "Удалить фото из слоя"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94
-msgid "Center view"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:102
-msgid "Zoom best fit and 1:1"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:166
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
+msgid "Validation errors"
+msgstr "Ошибки при проверке"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:89
+msgid "No validation errors"
+msgstr "Проверка не выявила ошибок"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163
+msgid "Grid"
+msgstr "Сетка"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #, java-format
 msgid ""
-"\n"
-"Altitude: {0} m"
-msgstr ""
-"\n"
-"Высота: {0} м"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169
-#, java-format
+"Error initializing test {0}:\n"
+" {1}"
+msgstr ""
+"Ошибка при инициализации теста {0}:\n"
+" {1}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+msgid "Use ignore list."
+msgstr "Использовать список игнорирования"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+msgid "Use the ignore list to suppress warnings."
+msgstr "Использовать список игнорирования для подавления предупреждений"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+msgid "Use error layer."
+msgstr "Использовать слой ошибок"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+msgid "Use the error layer to display problematic elements."
+msgstr "Использовать слой ошибок для отображения проблемных областей"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+msgid "Show informational level on upload."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+msgid "Show the informational tests in the upload check windows."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+msgid "On demand"
+msgstr "По требованию"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+msgid "On upload"
+msgstr "При загрузке"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
 msgid ""
-"\n"
-"{0} km/h"
-msgstr ""
-"\n"
-"{0} км/ч"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131
-msgid "GPX Files (*.gpx *.gpx.gz)"
-msgstr "Файлы GPX (*.gpx *.gpx.gz)"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151
-#, java-format
-msgid "File {0} is loaded yet under the name \"{1}\""
-msgstr "Файл {0} загружен под именем \"{1}\""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210
+"An OSM data validator that checks for common errors made by users and editor "
+"programs."
+msgstr ""
+"Модуль проверки данных OSM на предмет ошибок, часто вносимых пользователями "
+"и программами."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+msgid "Data validator"
+msgstr "Проверка данных"
+
+#. * Error messages
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:13
+msgid "Errors"
+msgstr "Ошибки"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:13
+msgid "validation error"
+msgstr "ошибка при проверке"
+
+#. * Warning messages
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:15
+msgid "Warnings"
+msgstr "Предупреждения"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:15
+msgid "validation warning"
+msgstr "предупреждение при проверке"
+
+#. * Other messages
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:17
+msgid "Other"
+msgstr "Другие"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:17
+msgid "validation other"
+msgstr "другое при проверке"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+msgid "Validation"
+msgstr "Проверка"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+msgid "Performs the data validation"
+msgstr "Произвести проверку данных"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117
+msgid "Data with errors. Upload anyway?"
+msgstr "Данные содержат ошибки. Всё равно продолжить?"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73
+msgid "Open the validation window."
+msgstr "Открыть окно проверки"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80
+msgid "Zoom to problem"
+msgstr "Показать проблему"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100
+msgid "Validate"
+msgstr "Проверить"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101
+msgid "Validate either current selection or complete dataset."
+msgstr "Проверить выделенное, либо все загруженные данные"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102
+msgid "Fix"
+msgstr "Исправить"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102
+msgid "Fix the selected errors."
+msgstr "Исправить выбранные ошибки."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106
+msgid "Ignore"
+msgstr "Игнорировать"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:107
+msgid "Ignore the selected errors next time."
+msgstr "Игнорировать выбранные ошибки в будущем."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192
+msgid "Whole group"
+msgstr "Всю группу"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192
+msgid "Single elements"
+msgstr "Отдельные элементы"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192
+msgid "Nothing"
+msgstr "Ничего"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:193
+msgid "Ignore whole group or individual elements?"
+msgstr "Игнорировать всю группу, или отдельные элементы?"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:194
+msgid "Ignoring elements"
+msgstr "Игнорировать элементы"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:67
+#, java-format
+msgid "Replace \"{0}\" by \"{1}\" for"
+msgstr "Заменить \"{0}\" на \"{1}\" для"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+msgid "Coastlines."
+msgstr "Береговые линии"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+msgid "This test checks that coastlines are correct."
+msgstr "Этот тест проверяет павильность береговых линий."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+msgid "Unordered coastline"
+msgstr "Неупорядоченная береговая линия"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+msgid "Crossing ways."
+msgstr "Пересекающиеся линии."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid ""
-"<html>Take a photo of your GPS receiver while it displays the "
-"time.<br>Display that photo here.<br>And then, simply capture the time you "
-"read on the photo and select a timezone<hr></html>"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228
-msgid "Photo time (from exif):"
-msgstr "Время фотоснимка (из EXIF):"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243
-msgid "Gps time (read from the above photo): "
-msgstr "Время GPS (прочтите на фото вверху): "
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255
-msgid " [dd/mm/yyyy hh:mm:ss]"
-msgstr " [дд/мм/гггг чч:мм:сс]"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263
-msgid "I'm in the timezone of: "
-msgstr "Я нахожусь в часовом поясе: "
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362
-msgid "No date"
-msgstr "Без даты"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335
-msgid "Open an other photo"
-msgstr "Открыть другое фото"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374
-msgid "Synchronize time from a photo of the GPS receiver"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385
+"This test checks if two roads, railways or waterways crosses in the same "
+"layer, but are not connected by a node."
+msgstr ""
+"Данный тест проверяет, если две линии (дороги, железные дороги, водоёмы) "
+"пересекаются на одном слое, но не имеют общей точки."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:116
+msgid "Crossing ways"
+msgstr "Пересекающиеся линии"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50
+msgid "Duplicated nodes"
+msgstr "Дублированные узлы"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33
+msgid "This test checks that there are no nodes at the very same location."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21
+msgid "Duplicated way nodes."
+msgstr "Повторяющиеся точки"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22
+msgid "Checks for ways with identical consecutive nodes."
+msgstr "Ищет линии с различными точками, имеющими одинаковые координаты"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35
+msgid "Duplicated way nodes"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+msgid "Nodes with same name"
+msgstr "Точки с одинаковыми названиями"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+msgid "This test finds nodes that have the same name (might be duplicates)."
+msgstr ""
+"Этот тест ищет точки с одинаковыми названиями (возможно, это дубликаты)"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+msgid "Overlapping ways."
+msgstr "Совпадающие линии."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid ""
-"Error while parsing the date.\n"
-"Please use the requested format"
-msgstr ""
-"Ошибка при разборе даты.\n"
-"Пожалуйста, используйте запрашиваемый формат"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387
-msgid "Invalid date"
-msgstr "Недопустимая дата"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430
-msgid "<No GPX track loaded yet>"
-msgstr "<Не загружены треки GPX>"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436
-msgid "GPX track: "
-msgstr "Трек GPX: "
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441
-msgid "Open another GPX trace"
-msgstr "Открыть другой трек GPX"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457
-msgid "Timezone: "
-msgstr "Часовой пояс: "
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479
-msgid "Offset:"
-msgstr "Смещение:"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491
+"This test checks that a connection between two nodes is not used by more "
+"than one way."
+msgstr ""
+"Этот тест проверяет, чтобы участок, соединяющий две точки, использовался "
+"только одной линией."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+msgid "Overlapping areas"
+msgstr "Накладывающиеся области"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+msgid "Overlapping highways (with area)"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+msgid "Overlapping railways (with area)"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+msgid "Overlapping ways (with area)"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+msgid "Overlapping highways"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+msgid "Overlapping railways"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+msgid "Overlapping ways"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:21
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:33
+msgid "Self-intersecting ways"
+msgstr "Линии, пересекающие сами себя"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:22
 msgid ""
-"<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
-msgstr ""
-"<html>Я могу сфотографировать экран GPS приёмника.<br>Это поможет?</html>"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508
-msgid "Update position for: "
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517
-msgid "All images"
-msgstr "Все изображения"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527
-msgid "Images with no exif position"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537
-msgid "Not yet tagged images"
-msgstr "Картинки без ярлыков"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557
-msgid "Correlate images with GPX track"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
-msgid "Correlate"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
-msgid "Auto-Guess"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569
-msgid "You should select a GPX track"
-msgstr "Необходимо выбрать трек GPX"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570
-msgid "No selected GPX track"
-msgstr "Не выбрано трека GPX"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582
-#, java-format
+"This test checks for ways that contain some of their nodes more than once."
+msgstr "Этот тест ищет линии, содержащие одну точку несколько раз."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+msgid "Similarly named ways"
+msgstr "Похожие названия линий"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
 msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583
-msgid "Invalid timezone"
-msgstr "Недопустимый часовой пояс"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595
+"This test checks for ways with similar names that may have been misspelled."
+msgstr ""
+"Этот тест ищет линии с похожими названиями. Возможно, это вызвано опечатками."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+msgid "Properties checker :"
+msgstr "Проверка параметров:"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+msgid "This plugin checks for errors in property keys and values."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#, java-format
+msgid "Invalid tagchecker line - {0}: {1}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+#, java-format
+msgid "Invalid spellcheck line: {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
 #, java-format
 msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596
-msgid "Invalid offset"
-msgstr "Недопустимое смещение"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639
-#, java-format
-msgid "Found {0} matches of {1} in GPX track {2}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640
-msgid "GPX Track loaded"
-msgstr "Трек GPX загружен"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675
-msgid "The selected photos don't contain time information."
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676
-msgid "Photos don't contain time information"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713
+"Could not access data file(s):\n"
+"{0}"
+msgstr ""
+"Нет доступа к файлу(ам) данных:\n"
+"{0}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:335
+msgid "Illegal tag/value combinations"
+msgstr ""
+
+#. passing translated text also to original string, as we already
+#. translated the stuff before. Makes the ignore file language dependend.
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:348
+msgid "Painting problem"
+msgstr "Проблемы отображения"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:357
+#, java-format
+msgid "Key ''{0}'' invalid."
+msgstr "Неправильный ключ {0}."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:362
+msgid "Tags with empty values"
+msgstr "Пустые значения тегов"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:368
+msgid "Invalid property key"
+msgstr "Неверный ключ свойств"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:374
+msgid "Invalid white space in property key"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:380
+msgid "Property values start or end with white space"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:386
+msgid "Property values contain HTML entity"
+msgstr "Значения содержат HTML разметку"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:410
+#, java-format
+msgid "Key ''{0}'' not in presets."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:411
+msgid "Presets do not contain property key"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:418
+#, java-format
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:419
+msgid "Presets do not contain property value"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
+msgid "FIXMES"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+msgid "Check property keys."
+msgstr "Проверьте ключи свойств."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
+msgid "Validate that property keys are valid checking against list of words."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:483
+msgid "Use complex property checker."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
+msgid "Validate property values and tags using complex rules."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:503
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:533
+msgid "TagChecker source"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
 msgid ""
-"The selected GPX track doesn't contain timestamps. Please select another one."
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714
-msgid "GPX Track has no time information"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759
-#, java-format
-msgid "Timezone: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760
-#, java-format
-msgid "Minutes: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761
-#, java-format
-msgid "Seconds: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
-#, java-format
-msgid "Matched {0} of {1} photos to GPX track."
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
-#, java-format
-msgid "(Time difference of {0} days)"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
-#, java-format
-msgid "Offset between track and photos: {0}m {1}s"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
-msgid ""
-"An error occured while trying to match the photos to the GPX track. You can "
-"adjust the sliders to manually match the photos."
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
-msgid "Matching photos to track failed"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
-msgid "Adjust timezone and offset"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
-msgid "Default Values"
-msgstr ""
-
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82
-msgid "Upload Traces"
-msgstr ""
-
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34
-msgid "Uploads traces to openstreetmap.org"
-msgstr ""
-
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71
-msgid "Upload Trace"
-msgstr ""
-
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102
-msgid "Public"
-msgstr "Публичный"
-
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103
-msgid "Selected makes your trace public in openstreetmap.org"
-msgstr ""
-
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
-#: trans_presets.java:2947
-msgid "Description"
-msgstr "Описание"
-
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
-msgid "Tags"
-msgstr ""
-
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:153
-#, java-format
-msgid "Selected track: {0}"
-msgstr ""
-
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:176
-msgid "Connecting..."
-msgstr "Подключение..."
-
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:199
-msgid "Upload cancelled"
-msgstr ""
-
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:209
-msgid "Error while uploading"
-msgstr ""
-
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260
-msgid "GPX upload was successful"
-msgstr ""
-
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261
-msgid "Upload failed. Server returned the following message: "
-msgstr ""
-
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303
-#, java-format
-msgid "Uploading GPX track: {0}% ({1} of {2})"
-msgstr ""
-
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335
-msgid "No description provided. Please provide some description."
-msgstr ""
-
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360
-msgid "No GPX layer selected. Cannot upload a trace."
-msgstr ""
-
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341
-msgid "No username provided."
-msgstr ""
-
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344
-msgid "No password provided."
-msgstr ""
-
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376
-msgid "Uploading GPX Track"
-msgstr ""
-
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
-msgid "Use"
-msgstr "Использовать"
-
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
-msgid "Please select a scheme to use."
-msgstr "Выберите тему для использования."
-
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
-msgid "Color Scheme"
-msgstr "Цветовая схема"
-
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
-msgid "Please select the scheme to delete."
-msgstr "Выберите тему для удаления."
-
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
-msgid "Use the selected scheme from the list."
-msgstr "Использовать выбранную тему из списка."
-
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
-msgid "Use the current colors as a new color scheme."
-msgstr "Использовать текущие цвета как новую цветовую тему."
-
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
-msgid "Delete the selected scheme from the list."
-msgstr "Удалить выбранную тему из списка."
-
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
-msgid "Color Schemes"
-msgstr "Цветовые схемы"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:68
-msgid "User"
-msgstr "Пользователь"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:74
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:75
-msgid "Show Author Panel"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:95
-msgid "Open User Page"
-msgstr "Открыть страницу пользователя"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:96
-msgid "Open User Page in browser"
-msgstr "Открыть страницу пользователя в браузере"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:109
-msgid "Select User's Data"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:110
-msgid "Replaces Selection with Users data"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:145
-msgid "Please select some data"
-msgstr "Пожалуйста, выберите данные"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:149
-msgid "Please choose a user using the author panel"
-msgstr "Пожалуйста, выберите пользователя в панели авторов"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:162
-msgid "Sorry, doesn't work with anonymous users"
-msgstr "Извините, для анонимных пользователей это недоступно"
-
-#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:108
-msgid "Version"
-msgstr "Версия"
-
-#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:89
-msgid "Add Site"
-msgstr "Добавить сайт"
-
-#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:92
-msgid "Update Site URL"
-msgstr "Обновить сайты"
-
-#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103
-msgid "Invalid URL"
-msgstr "Недопустимая дата"
-
-#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:109
-msgid "Delete Site(s)"
-msgstr "Удалить сайт(ы)"
-
-#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:113
-msgid "Please select the site to delete."
-msgstr "Пожалуйста удалите сайт для удаления."
-
-#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:123
-msgid "Check Site(s)"
-msgstr "Проверить сайт(ы)"
-
-#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:127
-msgid "Please select the site(s) to check for updates."
-msgstr "Пожалуйста, отметьте сайт(ы) для обновления"
-
-#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:151
-msgid "Add a new plugin site."
-msgstr "Добавть новый сайт модулей."
-
-#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:152
-msgid "Delete the selected site(s) from the list."
-msgstr "Удалить выбранный сайт(ы) из списка"
-
-#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:153
-msgid "Check the selected site(s) for new plugins or updates."
-msgstr ""
-
-#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:155
-msgid "Update Sites"
-msgstr "Обновить сайты"
-
-#: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:59
-msgid "Install"
-msgstr "Установить"
-
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:43
-msgid "Osmarender"
-msgstr "Osmarender"
-
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:90
-msgid ""
-"Firefox not found. Please set firefox executable in the Map Settings page of "
-"the preferences."
-msgstr ""
-"Firefox не найден. Пожалуйста, укажите исполняемый файл Firefox на странице "
-"Настройки карты в окне настроек."
-
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:121
-msgid "osmarender options"
-msgstr ""
-
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:122
-msgid "Firefox executable"
-msgstr "исполняемый файл Firefox"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20
-msgid "Rectified Image..."
-msgstr "Трансформированное изображение..."
-
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20
-msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
-msgstr "Скачать трансформированное изображение с WMS сервера Metacarta"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:24
-msgid "Metacarta Map Rectifier image id"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:32
-#, java-format
-msgid "rectifier id={0}"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:102
-#, java-format
-msgid ""
-"The projection ''{0}'' in URL and current projection ''{1}'' mismatch.\n"
-"This may lead to wrong coordinates."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:133
-msgid "WMS"
-msgstr "WMS"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:149
-msgid "Open a blank WMS layer to load data from a file"
-msgstr "Открыть пустой WMS-слой для загрузки данных из файла"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35
-msgid "WMS Plugin Preferences"
-msgstr "Настройки модуля WMS"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35
-msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-msgstr "Измениить список серверов WMS, отображаемых в меню модуля WMS"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
-msgid "Menu Name"
-msgstr "Название меню"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:71
-msgid "WMS URL"
-msgstr "Ссылка на WMS"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49
-msgid "Menu Name (Default)"
-msgstr "Имя пункта меню (по умолчанию)"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49
-msgid "WMS URL (Default)"
-msgstr "WMS URL (по умолчанию)"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
-msgid "Enter a menu name and WMS URL"
-msgstr "Введите имя пункта меню и URL этого WMS"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
-msgid "Copy Default"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:101
-msgid "Please select the row to copy."
-msgstr "Пожалуйста, выберите ряд для копирования."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
-msgid "Automatic downloading"
-msgstr "Автоматическое скачивание"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
-#, java-format
-msgid "WMS layer ({0}), automatically downloading in zoom {1}"
-msgstr "Автоматическое скачивание слоя WMS ({0}), в масштабе {1}"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
-#, java-format
-msgid "WMS layer ({0}), downloading in zoom {1}"
-msgstr "Скачивание слоя WMS ({0}), в масштабе {1}"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171
-msgid ""
-"The requested area is too big. Please zoom in a little, or change resolution"
-msgstr ""
-"Запрошенная область слишком велика. Пожалуйста, увеличьте масштаб, или "
-"измените разрешение"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:232
-msgid "Download visible tiles"
-msgstr "Скачать видимые квадраты"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
-msgid "Change resolution"
-msgstr "Изменить разрешение"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:253
-msgid "Reload erroneous tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:271
-msgid "Alpha channel"
-msgstr ""
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
+"org/index.php/User:JLS/speller) or tag checking data files."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:555
+msgid "Add a new source to the list."
+msgstr "Добавить в список новый источник."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+msgid "Edit the selected source."
+msgstr "Править выбранный источник."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+msgid "Data sources"
+msgstr "Источники данных"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:579
+msgid "Check property values."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:580
+msgid "Validate that property values are valid checking against presets."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:587
+msgid "Check for FIXMES."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Looks for nodes or ways with FIXME in any property value."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
+msgid "Check for paint notes."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
+msgid "Check if map painting found data errors."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+msgid "Use default data file."
+msgstr "Использовать файл данных по умолчанию."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+msgid "Use the default data file (recommended)."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
+msgid "Use default spellcheck file."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:608
+msgid "Use the default spellcheck file (recommended)."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+msgid "Fix properties"
+msgstr "Исправить параметры"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:810
+msgid "Could not find element type"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:827
+msgid "Could not find warning level"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:836
+#, java-format
+msgid "Illegal expression ''{0}''"
+msgstr "Недопустимое выражение ''{0}''"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
+#, java-format
+msgid "Illegal regular expression ''{0}''"
+msgstr "Недопустимое регулярное выражение ''{0}''"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+msgid "Unclosed Ways."
+msgstr "Незамкнутые линии"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+msgid "This tests if ways which should be circular are closed."
+msgstr "Этот тест ищет разомкнутые линии, которые должны быть замкнутыми."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#, java-format
+msgid "natural type {0}"
+msgstr "естественного типа {0}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#, java-format
+msgid "landuse type {0}"
+msgstr "землепользование типа {0}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#, java-format
+msgid "amenities type {0}"
+msgstr "удобства типа {0}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#, java-format
+msgid "sport type {0}"
+msgstr "спорт типа {0}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#, java-format
+msgid "tourism type {0}"
+msgstr "туризм типа {0}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#, java-format
+msgid "shop type {0}"
+msgstr "тип магазина: {0}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#, java-format
+msgid "leisure type {0}"
+msgstr "отдых типа {0}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#, java-format
+msgid "waterway type {0}"
+msgstr "тип водоёма: {0}"
+
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
+#. <rule>
+#. <condition k="openGeoDB:type" v="Stadt"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="openGeoDB:type" v="Kreis"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="openGeoDB:type" v="Gemeinde"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="openGeoDB:type" v="Ort"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="openGeoDB:type" v="District"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="openGeoDB:location" v="locality"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--annotation tags -->
+#.
+#. <!--"work in progress" tags -->
+#.
+#. <rule>
+#. <condition k="building" b="yes"/>
+#. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
+#. color building
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="building" v="church"/>
+#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
+#. color building
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="building" v="museum"/>
+#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
+#. color building
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="building" v="tower"/>
+#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
+#. color building
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="building" v="station"/>
+#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: build/trans_style.java:3796 build/trans_style.java:3803
+#: build/trans_style.java:3810 build/trans_style.java:3817
+#: build/trans_style.java:3824
+msgid "building"
+msgstr "здание"
+
+#. color building
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="area" b="yes"/>
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: build/trans_style.java:3831
+msgid "area"
+msgstr "область"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+msgid "Unclosed way"
+msgstr "Незамкнутая линия"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+msgid "Unconnected ways."
+msgstr "Несоединённые линии"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+msgid "This test checks if a way has an endpoint very near to another way."
+msgstr ""
+"Этот тест ищет линии, край которых расположен очень близко к другой линии."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+msgid "Way end node near other highway"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+msgid "Way end node near other way"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+msgid "Way node near other way"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+msgid "Connected way end node near other way"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88
+msgid "Untagged and unconnected nodes"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35
+msgid "This test checks for untagged nodes that are not part of any way."
+msgstr "Этот тест ищет точки, не имеющие тегов, и не являющиеся частью линий."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:56
+msgid "Untagged, empty and one node ways."
+msgstr "Линии без тегов, пустые, из одной точки"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:57
+msgid "This test checks for untagged, empty and one node ways."
+msgstr "Данный тест ищет линии без тегов, пустые, и линии из одной точки"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+msgid "Unnamed ways"
+msgstr "Безымянные линии"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+msgid "Untagged ways"
+msgstr "Линии без тегов"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+msgid "Empty ways"
+msgstr "Пустые линии"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+msgid "One node ways"
+msgstr "Линии из одной точки"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+msgid "Wrongly Ordered Ways."
+msgstr "Неверно упорядоченные линии"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+msgid "This test checks the direction of water, land and coastline ways."
+msgstr "Этот тест проверяет направление береговых линий."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
+msgid "Reversed coastline: land not on left side"
+msgstr "Неверное направление береговой линии: земля не слева"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:69
+msgid "Reversed water: land not on left side"
+msgstr "Неверное направление границы водоёма: земля не слева"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:74
+msgid "Reversed land: land not on left side"
+msgstr "Неверное направление линии суши: земля не слева"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75
+#, java-format
+msgid "{0}, ..."
+msgstr "{0}, ..."
 
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:53
@@ -8198,8 +9263,5 @@
 msgstr "Произошла ошибка."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
-msgid "Adjust the position of the selected WMS layer"
-msgstr ""
-
+#. super("Help / About");
 #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
 msgid "help"
@@ -8241,690 +9303,120 @@
 msgstr "Справка по модулю WMS"
 
-#: ../plugins/grid/src/grid/GridLayer.java:192
-msgid "Grid origin location"
-msgstr ""
-
-#: ../plugins/grid/src/grid/GridLayer.java:197
-msgid "Grid rotation"
-msgstr "Вращение сетки"
-
-#: ../plugins/grid/src/grid/GridLayer.java:199
-msgid "World"
-msgstr "Мир"
-
-#: ../plugins/grid/src/grid/GridLayer.java:200
-msgid "Grid layout"
-msgstr "Разметка сетки"
-
-#: ../plugins/grid/src/grid/GridLayer.java:222
-msgid "Grid layer:"
-msgstr "Слой сетки"
-
-#: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
-msgid "Navigator"
-msgstr "Навигатор"
-
-#: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
-msgid "Set start/end for routing. Middle mouse button to reset."
-msgstr ""
-
-#: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:40
-#: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:44
-msgid "Navigation"
-msgstr "Навигация"
-
-#: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:47
-msgid "Reset Graph"
-msgstr "Обнулить граф"
-
-#: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorAction.java:28
-msgid "Navigate"
-msgstr "Навигация"
-
-#: trans_style.java:49
-msgid "standard"
-msgstr ""
-
-#: trans_style.java:105 trans_style.java:119 trans_style.java:126
-#: trans_style.java:133 trans_style.java:140
-msgid "bridge"
-msgstr ""
-
-#: trans_style.java:112 trans_style.java:147 trans_style.java:154
-#: trans_style.java:161 trans_style.java:497 trans_style.java:2149
-#: trans_style.java:3796 trans_style.java:3805 trans_style.java:3814
-#: trans_style.java:3823 trans_style.java:3832 trans_style.java:3841
-#: trans_style.java:3850 trans_style.java:3851 trans_style.java:3860
-#: trans_style.java:3869
-msgid "deprecated"
-msgstr ""
-
-#: trans_style.java:178 trans_presets.java:308 trans_presets.java:309
-#: trans_presets.java:310 trans_presets.java:311 trans_presets.java:312
-#: trans_presets.java:313 trans_presets.java:314 trans_presets.java:315
-#: trans_presets.java:316 trans_presets.java:317 trans_presets.java:318
-#: trans_presets.java:512 trans_presets.java:513 trans_presets.java:514
-#: trans_presets.java:533 trans_presets.java:534 trans_presets.java:535
-#: trans_presets.java:554 trans_presets.java:555 trans_presets.java:556
-#: trans_presets.java:575 trans_presets.java:576 trans_presets.java:577
-#: trans_presets.java:596 trans_presets.java:597 trans_presets.java:598
-#: trans_presets.java:617 trans_presets.java:618 trans_presets.java:619
-msgid "permissive"
-msgstr "разрешающее"
-
-#: trans_style.java:185 trans_presets.java:308 trans_presets.java:309
-#: trans_presets.java:310 trans_presets.java:311 trans_presets.java:312
-#: trans_presets.java:313 trans_presets.java:314 trans_presets.java:315
-#: trans_presets.java:316 trans_presets.java:317 trans_presets.java:318
-#: trans_presets.java:512 trans_presets.java:513 trans_presets.java:514
-#: trans_presets.java:533 trans_presets.java:534 trans_presets.java:535
-#: trans_presets.java:554 trans_presets.java:555 trans_presets.java:556
-#: trans_presets.java:575 trans_presets.java:576 trans_presets.java:577
-#: trans_presets.java:596 trans_presets.java:597 trans_presets.java:598
-#: trans_presets.java:617 trans_presets.java:618 trans_presets.java:619
-msgid "private"
-msgstr "частный"
-
-#: trans_style.java:192 trans_presets.java:308 trans_presets.java:309
-#: trans_presets.java:310 trans_presets.java:311 trans_presets.java:312
-#: trans_presets.java:313 trans_presets.java:314 trans_presets.java:315
-#: trans_presets.java:316 trans_presets.java:317 trans_presets.java:318
-#: trans_presets.java:512 trans_presets.java:513 trans_presets.java:514
-#: trans_presets.java:533 trans_presets.java:534 trans_presets.java:535
-#: trans_presets.java:554 trans_presets.java:555 trans_presets.java:556
-#: trans_presets.java:575 trans_presets.java:576 trans_presets.java:577
-#: trans_presets.java:596 trans_presets.java:597 trans_presets.java:598
-#: trans_presets.java:617 trans_presets.java:618 trans_presets.java:619
-msgid "destination"
-msgstr "назначение"
-
-#: trans_style.java:206 trans_style.java:553 trans_style.java:743
-#: trans_style.java:751 trans_style.java:759 trans_style.java:767
-#: trans_style.java:775 trans_presets.java:2943
-msgid "bicycle"
-msgstr ""
-
-#: trans_style.java:220 trans_style.java:561 trans_style.java:569
-#: trans_style.java:577 trans_style.java:585 trans_presets.java:2943
-msgid "foot"
-msgstr ""
-
-#: trans_style.java:248 trans_style.java:545
-msgid "horse"
-msgstr ""
-
-#: trans_style.java:417 trans_style.java:425 trans_presets.java:334
-msgid "motorway"
-msgstr "Автобан"
-
-#: trans_style.java:433 trans_style.java:441 trans_presets.java:334
-msgid "trunk"
-msgstr "Автострада"
-
-#: trans_style.java:449 trans_style.java:457 trans_presets.java:334
-msgid "primary"
-msgstr "Основная"
-
-#: trans_style.java:465 trans_style.java:473 trans_presets.java:334
-msgid "secondary"
-msgstr "Вторичная"
-
-#: trans_style.java:481 trans_presets.java:334
-msgid "tertiary"
-msgstr "Третичная"
-
-#: trans_style.java:489 trans_style.java:505 trans_style.java:521
-#: trans_style.java:529
-msgid "street"
-msgstr ""
-
-#: trans_style.java:513 trans_style.java:785 trans_style.java:793
-#: trans_style.java:801 trans_style.java:809 trans_style.java:817
-msgid "highway_track"
-msgstr ""
-
-#: trans_style.java:537 trans_presets.java:334
-msgid "service"
-msgstr "Служебная"
-
-#: trans_style.java:593 trans_style.java:1016 trans_style.java:1074
-#: trans_style.java:1082 trans_style.java:1091
-msgid "rail"
-msgstr ""
-
-#: trans_style.java:678 trans_style.java:992
-msgid "viaduct"
-msgstr ""
-
-#: trans_style.java:714
-msgid "turningcircle"
-msgstr ""
-
-#: trans_style.java:722 trans_style.java:2822 trans_style.java:2823
-#: trans_presets.java:334
-msgid "construction"
-msgstr "Строительство"
-
-#: trans_style.java:732 trans_presets.java:396
-msgid "roundabout"
-msgstr "Круг"
-
-#: trans_style.java:835 trans_style.java:836
-msgid "riverbank"
-msgstr "берег реки"
-
-#: trans_style.java:852
-msgid "stream"
-msgstr ""
-
-#: trans_style.java:868
-msgid "dock"
-msgstr ""
-
-#: trans_style.java:890
-msgid "aqueduct"
-msgstr ""
-
-#: trans_style.java:927 trans_style.java:935 trans_style.java:944
-#: trans_style.java:1323 trans_style.java:1330 trans_style.java:1339
-#: trans_style.java:1347 trans_style.java:1371 trans_style.java:1379
-#: trans_style.java:1387 trans_style.java:1395 trans_style.java:1402
-#: trans_style.java:1411 trans_style.java:1419 trans_style.java:1427
-#: trans_style.java:1435
-msgid "manmade"
-msgstr ""
-
-#: trans_style.java:954 trans_style.java:969 trans_style.java:984
-#: trans_style.java:1000 trans_style.java:1008
-msgid "railwaypoint"
-msgstr ""
-
-#: trans_style.java:1025 trans_style.java:1034
-msgid "otherrail"
-msgstr ""
-
-#: trans_style.java:1026
-msgid "railover"
-msgstr ""
-
-#: trans_style.java:1042 trans_presets.java:2943
-msgid "subway"
-msgstr ""
-
-#: trans_style.java:1050 trans_style.java:1058 trans_style.java:1066
-msgid "oldrail"
-msgstr ""
-
-#: trans_style.java:1121 trans_style.java:1122 trans_style.java:1154
-msgid "aeroway"
-msgstr ""
-
-#: trans_style.java:1130
-msgid "terminal"
-msgstr ""
-
-#: trans_style.java:1138 trans_style.java:1146
-msgid "aeroway_dark"
-msgstr ""
-
-#: trans_style.java:1162
-msgid "aeroway_light"
-msgstr ""
-
-#: trans_style.java:1172 trans_style.java:1180 trans_style.java:1188
-#: trans_style.java:1196 trans_style.java:1204
-msgid "aerialway"
-msgstr ""
-
-#: trans_style.java:1214
-msgid "piste_easy"
-msgstr ""
-
-#: trans_style.java:1222
-msgid "piste_intermediate"
-msgstr ""
-
-#: trans_style.java:1230
-msgid "piste_advanced"
-msgstr ""
-
-#: trans_style.java:1238
-msgid "piste_freeride"
-msgstr ""
-
-#: trans_style.java:1246
-msgid "piste_novice"
-msgstr ""
-
-#: trans_style.java:1257 trans_style.java:1264 trans_style.java:1273
-#: trans_style.java:1281 trans_style.java:1289 trans_style.java:1297
-#: trans_style.java:1305 trans_style.java:1313
-msgid "power"
-msgstr ""
-
-#: trans_style.java:1354
-msgid "pier"
-msgstr ""
-
-#: trans_style.java:1362
-msgid "pipeline"
-msgstr ""
-
-#: trans_style.java:1445 trans_style.java:1453 trans_style.java:1461
-#: trans_style.java:1469 trans_style.java:1477 trans_style.java:1485
-#: trans_style.java:1501 trans_style.java:1509 trans_style.java:1517
-#: trans_style.java:1525 trans_style.java:1533 trans_style.java:1541
-#: trans_style.java:1549 trans_style.java:1557 trans_style.java:1565
-msgid "leisure"
-msgstr ""
-
-#: trans_style.java:1493
-msgid "marina"
-msgstr ""
-
-#: trans_style.java:1575 trans_style.java:1583 trans_style.java:1591
-#: trans_style.java:1599 trans_style.java:1607 trans_style.java:1615
-#: trans_style.java:1623 trans_style.java:1631
-msgid "amenity"
-msgstr ""
-
-#: trans_style.java:1639 trans_style.java:1647 trans_style.java:1655
-#: trans_style.java:1663 trans_style.java:1671 trans_style.java:1679
-#: trans_style.java:1687 trans_style.java:1695 trans_style.java:1702
-#: trans_style.java:1711 trans_style.java:1719
-msgid "amenity_traffic"
-msgstr ""
-
-#: trans_style.java:1727 trans_style.java:1735 trans_style.java:1743
-#: trans_style.java:1751 trans_style.java:1759 trans_style.java:1767
-#: trans_style.java:1775 trans_style.java:1783 trans_style.java:1877
-#: trans_style.java:1885 trans_style.java:1892 trans_style.java:1901
-#: trans_style.java:1909 trans_style.java:1917 trans_style.java:1925
-#: trans_style.java:1933 trans_style.java:1941 trans_style.java:1949
-#: trans_style.java:2004 trans_style.java:2012 trans_style.java:2020
-#: trans_style.java:2029 trans_style.java:2037 trans_style.java:2044
-#: trans_style.java:2052 trans_style.java:2060 trans_style.java:2068
-#: trans_style.java:2076 trans_style.java:2084 trans_style.java:2092
-#: trans_style.java:2100 trans_style.java:2108 trans_style.java:2116
-#: trans_style.java:2124 trans_style.java:2133 trans_style.java:2141
-msgid "amenity_light"
-msgstr ""
-
-#: trans_style.java:1791 trans_style.java:1799 trans_style.java:2908
-msgid "light_water"
-msgstr ""
-
-#: trans_style.java:1956 trans_style.java:1964 trans_style.java:1972
-#: trans_style.java:1980 trans_style.java:1988 trans_style.java:1996
-msgid "health"
-msgstr ""
-
-#: trans_style.java:2159 trans_style.java:2167 trans_style.java:2175
-#: trans_style.java:2183 trans_style.java:2191 trans_style.java:2199
-#: trans_style.java:2207 trans_style.java:2215 trans_style.java:2223
-#: trans_style.java:2231 trans_style.java:2239 trans_style.java:2247
-#: trans_style.java:2255 trans_style.java:2263 trans_style.java:2271
-#: trans_style.java:2279 trans_style.java:2287 trans_style.java:2295
-#: trans_style.java:2303 trans_style.java:2311 trans_style.java:2319
-#: trans_style.java:2327 trans_style.java:2335 trans_style.java:2343
-#: trans_style.java:2351 trans_style.java:2359 trans_style.java:2367
-#: trans_style.java:2375 trans_style.java:2383 trans_style.java:2391
-#: trans_style.java:2399 trans_style.java:2407 trans_style.java:2415
-#: trans_style.java:2423 trans_style.java:2431 trans_style.java:2439
-#: trans_style.java:2447 trans_style.java:2455 trans_style.java:2463
-#: trans_style.java:2472
-msgid "shop"
-msgstr ""
-
-#: trans_style.java:2482 trans_style.java:2546 trans_style.java:2554
-#: trans_style.java:2562 trans_style.java:2570 trans_style.java:2578
-#: trans_style.java:2586 trans_style.java:2594
-msgid "tourism"
-msgstr "туризм"
-
-#: trans_style.java:2490 trans_style.java:2498 trans_style.java:2506
-#: trans_style.java:2514 trans_style.java:2522 trans_style.java:2530
-#: trans_style.java:2538
-msgid "hotel"
-msgstr ""
-
-#: trans_style.java:2604 trans_style.java:2612 trans_style.java:2620
-#: trans_style.java:2628 trans_style.java:2636 trans_style.java:2644
-#: trans_style.java:2652 trans_style.java:2660
-msgid "historic"
-msgstr "исторический"
-
-#: trans_style.java:2669 trans_style.java:2677 trans_style.java:2685
-#: trans_style.java:2693 trans_style.java:2741 trans_style.java:2749
-#: trans_style.java:2847 trans_style.java:2855
-msgid "green"
-msgstr ""
-
-#: trans_style.java:2701
-msgid "quarry"
-msgstr ""
-
-#: trans_style.java:2709
-msgid "landfill"
-msgstr ""
-
-#: trans_style.java:2717 trans_style.java:2725
-msgid "basin"
-msgstr "водоём"
-
-#: trans_style.java:2733
-msgid "forest"
-msgstr "лес"
-
-#: trans_style.java:2757 trans_presets.java:334
-msgid "residential"
-msgstr "местного значения"
-
-#: trans_style.java:2765
-msgid "farmyard"
-msgstr ""
-
-#: trans_style.java:2774 trans_style.java:2782
-msgid "retail"
-msgstr ""
-
-#: trans_style.java:2790
-msgid "industrial"
-msgstr ""
-
-#: trans_style.java:2798
-msgid "brownfield"
-msgstr ""
-
-#: trans_style.java:2806
-msgid "greenfield"
-msgstr ""
-
-#: trans_style.java:2814
-msgid "railland"
-msgstr ""
-
-#: trans_style.java:2831 trans_style.java:2866 trans_style.java:2874
-#: trans_style.java:2882 trans_style.java:2890 trans_style.java:2898
-msgid "military"
-msgstr ""
-
-#: trans_style.java:2839
-msgid "cemetery"
-msgstr "кладбище"
-
-#: trans_style.java:2915
-msgid "peak"
-msgstr "пик"
-
-#: trans_style.java:2924
-msgid "glacier"
-msgstr ""
-
-#: trans_style.java:2932
-msgid "volcano"
-msgstr "вулкан"
-
-#: trans_style.java:2940 trans_style.java:2948 trans_style.java:2964
-#: trans_style.java:3028 trans_style.java:3036 trans_style.java:3044
-msgid "natural"
-msgstr ""
-
-#: trans_style.java:2956
-msgid "scrub"
-msgstr ""
-
-#: trans_style.java:2972
-msgid "heath"
-msgstr ""
-
-#: trans_style.java:2980
-msgid "wood"
-msgstr ""
-
-#: trans_style.java:2988 trans_presets.java:1118
-msgid "marsh"
-msgstr ""
-
-#: trans_style.java:3012
-msgid "mud"
-msgstr ""
-
-#: trans_style.java:3020
-msgid "beach"
-msgstr ""
-
-#: trans_style.java:3060 trans_style.java:3068 trans_style.java:3076
-#: trans_style.java:3084 trans_style.java:3092 trans_style.java:3100
-#: trans_style.java:3108 trans_style.java:3116
-msgid "route"
-msgstr ""
-
-#: trans_style.java:3126 trans_style.java:3134 trans_style.java:3142
-#: trans_style.java:3150 trans_style.java:3158
-msgid "boundary"
-msgstr "граница"
-
-#: trans_style.java:3168 trans_style.java:3176 trans_style.java:3184
-#: trans_style.java:3192 trans_style.java:3200 trans_style.java:3208
-#: trans_style.java:3216 trans_style.java:3224 trans_style.java:3232
-#: trans_style.java:3240 trans_style.java:3248 trans_style.java:3256
-#: trans_style.java:3264 trans_style.java:3272 trans_style.java:3280
-#: trans_style.java:3288 trans_style.java:3296 trans_style.java:3304
-#: trans_style.java:3312 trans_style.java:3320 trans_style.java:3328
-#: trans_style.java:3336 trans_style.java:3344 trans_style.java:3352
-#: trans_style.java:3360 trans_style.java:3368 trans_style.java:3376
-#: trans_style.java:3384 trans_style.java:3392 trans_style.java:3400
-#: trans_style.java:3408 trans_style.java:3416 trans_style.java:3424
-#: trans_style.java:3432 trans_style.java:3440 trans_style.java:3448
-#: trans_style.java:3456 trans_style.java:3464 trans_style.java:3472
-#: trans_style.java:3480 trans_style.java:3488 trans_style.java:3496
-#: trans_style.java:3504 trans_style.java:3512 trans_presets.java:1754
-#: trans_presets.java:1763 trans_presets.java:1772 trans_presets.java:1781
-msgid "sport"
-msgstr "спорт"
-
-#: trans_style.java:3573 trans_style.java:3581 trans_style.java:3589
-#: trans_style.java:3597 trans_style.java:3605 trans_style.java:3613
-#: trans_style.java:3621 trans_style.java:3629 trans_style.java:3637
-#: trans_style.java:3645 trans_style.java:3653 trans_style.java:3661
-msgid "place"
-msgstr ""
-
-#: trans_style.java:3772 trans_style.java:3779 trans_style.java:3786
-msgid "address"
-msgstr ""
-
-#: trans_wms.java:5
-msgid "Landsat"
-msgstr "Landsat"
-
-#: trans_wms.java:6
-msgid "Open Aerial Map"
-msgstr ""
-
-#: trans_wms.java:8
-msgid "NPE Maps"
-msgstr "карты NPE"
-
-#: trans_wms.java:9
-msgid "NPE Maps (Tim)"
-msgstr ""
-
-#: trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr "YAHOO (GNOME)"
-
-#: trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr ""
-
-#: trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr "YAHOO (WebKit)"
-
-#: trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr "YAHOO (WebKit GTK)"
-
-#: trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr "подложка Geofabrik.de"
-
-#: trans_wms.java:20
-msgid "Streets NRW Geofabrik.de"
-msgstr ""
-
-#: trans_validator.java:38
-msgid "oneway tag on a node"
-msgstr "тэг \"одностороннее движение\" в точке"
-
-#: trans_validator.java:39
-msgid "bridge tag on a node"
-msgstr "тэг \"мост\" в точке"
-
-#: trans_validator.java:40 trans_validator.java:41 trans_validator.java:42
-#: trans_validator.java:43 trans_validator.java:44
-msgid "wrong highway tag on a node"
-msgstr "неверный тэг \"дорога\" в точке"
-
-#: trans_validator.java:45 trans_validator.java:46 trans_validator.java:47
-msgid "highway without a reference"
-msgstr "дорога без сноски"
-
-#: trans_validator.java:48
-msgid "temporary highway type"
-msgstr "временный тип дороги"
-
-#: trans_validator.java:49
-msgid "misspelled key name"
-msgstr "опечатка в названии ключа"
-
-#: trans_validator.java:51
-msgid "cycleway with tag bicycle"
-msgstr "велодорожка с тэгом 'велосипед'"
-
-#: trans_validator.java:52
-msgid "footway with tag foot"
-msgstr "пешеходная дорожка с тэгом 'пешеход'"
-
-#: trans_validator.java:55
-msgid "separate cycleway as lane on a cycleway"
-msgstr "отдельная полоса для велосипедов на велодорожке"
-
-#: trans_validator.java:56
-msgid "barrier used on a way"
-msgstr "преграда на пути движения"
-
-#: trans_validator.java:59
-msgid "maxspeed used for footway"
-msgstr "для пешеходной дороги установлена максимальная скорость движения"
-
-#: trans_validator.java:61
-msgid "layer tag with + sign"
-msgstr "номер слоя со знаком +"
-
-#: trans_validator.java:63
-msgid "street name contains ss"
-msgstr "название улицы содержит ss"
-
-#: trans_validator.java:64
-msgid "abbreviated street name"
-msgstr "сокращённое название улицы"
-
-#: trans_validator.java:66
-msgid "relation without type"
-msgstr ""
-
-#: trans_validator.java:68
-msgid "restaurant without name"
-msgstr ""
-
-#: trans_validator.java:70 trans_validator.java:71 trans_validator.java:72
-msgid "unusual tag combination"
-msgstr ""
-
-#: trans_surveyor.java:6
-msgid "Tunnel Start"
-msgstr "Начало тоннеля"
-
-#: trans_surveyor.java:12 trans_presets.java:61 trans_presets.java:78
-#: trans_presets.java:97 trans_presets.java:115 trans_presets.java:135
-#: trans_presets.java:150 trans_presets.java:170 trans_presets.java:189
-#: trans_presets.java:205 trans_presets.java:223 trans_presets.java:241
-#: trans_presets.java:260 trans_presets.java:293 trans_presets.java:338
-#: trans_presets.java:347 trans_presets.java:390 trans_presets.java:410
-#: trans_presets.java:430 trans_presets.java:449 trans_presets.java:468
-#: trans_presets.java:487 trans_presets.java:506 trans_presets.java:527
-#: trans_presets.java:548 trans_presets.java:569 trans_presets.java:590
-#: trans_presets.java:611 trans_presets.java:641 trans_presets.java:1284
-msgid "Bridge"
-msgstr "Мост"
-
-#: trans_surveyor.java:16
-msgid "Village/City"
-msgstr "Город/Село"
-
-#: trans_surveyor.java:24 trans_presets.java:1360 trans_presets.java:1407
-msgid "Parking"
-msgstr "Стоянка"
-
-#: trans_surveyor.java:29
-msgid "One Way"
-msgstr "Односторонняя"
-
-#: trans_surveyor.java:33
-msgid "Church"
-msgstr "Церковь"
-
-#: trans_surveyor.java:38
-msgid "Fuel Station"
-msgstr "Заправка"
-
-#: trans_surveyor.java:43 trans_presets.java:1533
-msgid "Hotel"
-msgstr "Гостиница"
-
-#: trans_surveyor.java:47 trans_presets.java:1583
-msgid "Restaurant"
-msgstr "Ресторан"
-
-#: trans_surveyor.java:52
-msgid "Shopping"
-msgstr "Магазин"
-
-#: trans_surveyor.java:56
-msgid "WC"
-msgstr "Туалет"
-
-#: trans_surveyor.java:60
-msgid "Camping"
-msgstr "Кэмпинг"
-
-#: trans_surveyor.java:72 trans_presets.java:48
-msgid "Motorway"
-msgstr "Автобан"
-
-#: trans_surveyor.java:76 trans_presets.java:122
-msgid "Primary"
-msgstr "Основная"
-
-#: trans_surveyor.java:80 trans_presets.java:156
-msgid "Secondary"
-msgstr "Вторичная"
-
-#: trans_surveyor.java:84 trans_presets.java:195
-msgid "Unclassified"
-msgstr "Не классифицировано"
-
-#: trans_surveyor.java:88 trans_presets.java:214
-msgid "Residential"
-msgstr "Местного значения"
-
-#: trans_surveyor.java:93 trans_surveyor.java:97
-msgid "Test"
-msgstr "Тест"
-
-#: specialmessages.java:6
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20
+msgid "Rectified Image..."
+msgstr "Трансформированное изображение..."
+
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20
+msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
+msgstr "Скачать трансформированное изображение с WMS сервера Metacarta"
+
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:24
+msgid "Metacarta Map Rectifier image id"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:32
+#, java-format
+msgid "rectifier id={0}"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
+msgid "Adjust the position of the selected WMS layer"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:102
+#, java-format
+msgid ""
+"The projection ''{0}'' in URL and current projection ''{1}'' mismatch.\n"
+"This may lead to wrong coordinates."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
+msgid "Automatic downloading"
+msgstr "Автоматическое скачивание"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
+#, java-format
+msgid "WMS layer ({0}), automatically downloading in zoom {1}"
+msgstr "Автоматическое скачивание слоя WMS ({0}), в масштабе {1}"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
+#, java-format
+msgid "WMS layer ({0}), downloading in zoom {1}"
+msgstr "Скачивание слоя WMS ({0}), в масштабе {1}"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171
+msgid ""
+"The requested area is too big. Please zoom in a little, or change resolution"
+msgstr ""
+"Запрошенная область слишком велика. Пожалуйста, увеличьте масштаб, или "
+"измените разрешение"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:232
+msgid "Download visible tiles"
+msgstr "Скачать видимые квадраты"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
+msgid "Change resolution"
+msgstr "Изменить разрешение"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:253
+msgid "Reload erroneous tiles"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:271
+msgid "Alpha channel"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:133
+msgid "WMS"
+msgstr "WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:149
+msgid "Open a blank WMS layer to load data from a file"
+msgstr "Открыть пустой WMS-слой для загрузки данных из файла"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35
+msgid "WMS Plugin Preferences"
+msgstr "Настройки модуля WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35
+msgid "Modify list of WMS servers displayed in the WMS plugin menu"
+msgstr "Измениить список серверов WMS, отображаемых в меню модуля WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Menu Name"
+msgstr "Название меню"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:71
+msgid "WMS URL"
+msgstr "Ссылка на WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49
+msgid "Menu Name (Default)"
+msgstr "Имя пункта меню (по умолчанию)"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49
+msgid "WMS URL (Default)"
+msgstr "WMS URL (по умолчанию)"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
+msgid "Enter a menu name and WMS URL"
+msgstr "Введите имя пункта меню и URL этого WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
+msgid "Copy Default"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:101
+msgid "Please select the row to copy."
+msgstr "Пожалуйста, выберите ряд для копирования."
+
+#. *
+#. This file can be used to add some special messages to the translation,
+#. which are not part of the programm texts, but should be translated nevertheless.
+#.
+#: build/specialmessages.java:6
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -8934,9 +9426,11 @@
 "либо используйте planet.osm"
 
-#: specialmessages.java:7
+#. OSM server message
+#: build/specialmessages.java:7
 msgid "Database offline for maintenance"
 msgstr "На базе данных ведутся работы, и она недоступна"
 
-#: specialmessages.java:8
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -8946,4212 +9440,10932 @@
 "Уменьшите область, либо воспользуйтесь planet.osm"
 
-#: specialmessages.java:9
+#. OSM server message
+#: build/specialmessages.java:9
 msgid "could not get audio input stream from input URL"
 msgstr ""
 
-#: trans_presets.java:47
+#. Java message loading audio data
+#. <!--
+#. Pics have been derived from
+#. http://commons.wikipedia.org (german street sign SVGs)
+#. http://commons.wikimedia.org/wiki/Image:National_Park_Service_sample_pictographs.svg (various monochrome pictograms)
+#. http://www.kde.org
+#. http://openclipart.org/media/view/media/clip_art
+#. http://www.sjjb.co.uk/mapicons/ (meanwhile in osm svn)
+#. -->
+#. <!--
+#. item:
+#. name: the text to display
+#. icon: the icon to display
+#. type: the data types - way,node,relation,closedway (separated by comma)
+#. link: link to the relating map features website
+#. label: simple static text label
+#. text: the text to display
+#. key: fixed key/value pair to be set
+#. key: key to set
+#. value: value to set
+#. text: text box
+#. key: key to set
+#. text: fixed label to display
+#. default: default string to display
+#. delete_if_empty: true/false
+#. use_last_as_default: true/false
+#. combo: combo box, with multiple choices and possible to enter free form text
+#. key: key to set
+#. text: fixed label to display
+#. values: comma seperated list of values
+#. default: default string to display
+#. delete_if_empty: true/false
+#. check: checkbox
+#. key: key to set
+#. text: fixed label to display
+#. default: ticked on/off
+#. delete_if_empty: true/false
+#. See also http://josm.openstreetmap.de/wiki/TaggingPresets.
+#. -->
+#. <annotations>
+#: build/trans_presets.java:47
 msgid "Streets"
 msgstr "Улицы"
 
-#: trans_presets.java:51
+#. group "Streets"
+#. <button label="Exit" hotkey="E">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Exit"/>
+#. </button>
+#: build/trans_presets.java:48 build/trans_surveyor.java:72
+msgid "Motorway"
+msgstr "Автобан"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
+#: build/trans_presets.java:51
 msgid "Edit a Motorway"
 msgstr "Править автобан"
 
-#: trans_presets.java:54 trans_presets.java:90 trans_presets.java:109
-#: trans_presets.java:128 trans_presets.java:163 trans_presets.java:183
-#: trans_presets.java:1525 trans_presets.java:2945
+#. item "Streets/Motorway" label "Edit a Motorway"
+#. <space />
+#. <key key="highway" value="motorway" />
+#. item "Streets/Trunk" label "Edit a Trunk"
+#. <space />
+#. <key key="highway" value="trunk" />
+#. item "Streets/Trunk Link" label "Edit a Trunk Link"
+#. <space />
+#. <key key="highway" value="trunk_link" />
+#. item "Streets/Primary" label "Edit a Primary Road"
+#. <space />
+#. <key key="highway" value="primary" />
+#. item "Streets/Secondary" label "Edit a Secondary Road"
+#. <space />
+#. <key key="highway" value="secondary" />
+#. item "Streets/Tertiary" label "Edit a Tertiary Road"
+#. <space />
+#. <key key="highway" value="tertiary" />
+#. item "Public Transport/Airport" text "Name"
+#. <optional>
+#. item "Relations/Route" text "Name"
+#: build/trans_presets.java:54 build/trans_presets.java:90
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:163 build/trans_presets.java:183
+#: build/trans_presets.java:1522 build/trans_presets.java:2975
 msgid "Reference"
 msgstr "Сноска"
 
-#: trans_presets.java:57 trans_presets.java:74 trans_presets.java:93
-#: trans_presets.java:111 trans_presets.java:131 trans_presets.java:146
-#: trans_presets.java:166 trans_presets.java:186 trans_presets.java:209
-#: trans_presets.java:227 trans_presets.java:245 trans_presets.java:264
-#: trans_presets.java:297 trans_presets.java:342 trans_presets.java:357
-#: trans_presets.java:372 trans_presets.java:394 trans_presets.java:414
-#: trans_presets.java:434 trans_presets.java:453 trans_presets.java:472
-#: trans_presets.java:491 trans_presets.java:511 trans_presets.java:532
-#: trans_presets.java:553 trans_presets.java:574 trans_presets.java:595
-#: trans_presets.java:616 trans_presets.java:645 trans_presets.java:1043
-#: trans_presets.java:1051 trans_presets.java:1059 trans_presets.java:1069
-#: trans_presets.java:1288
+#. item "Streets/Motorway" text "Name"
+#. item "Streets/Motorway Link" label "Edit a Motorway Link"
+#. <space />
+#. <key key="highway" value="motorway_link" />
+#. <optional>
+#. item "Streets/Trunk" text "Name"
+#. item "Streets/Trunk Link" text "Reference"
+#. <optional>
+#. item "Streets/Primary" text "Name"
+#. item "Streets/Primary Link" label "Edit a Primary Link"
+#. <space />
+#. <key key="highway" value="primary_link" />
+#. <optional>
+#. item "Streets/Secondary" text "Name"
+#. item "Streets/Tertiary" text "Name"
+#. item "Streets/Unclassified" check "Embankment"
+#. item "Streets/Residential" check "Embankment"
+#. item "Streets/Living Street" check "Embankment"
+#. item "Streets/Service" check "Embankment"
+#. item "Streets/Road (Unknown Type)" check "Embankment"
+#. item "Streets/Roundabout" check "Embankment"
+#. item "Streets/Bridge" text "Name"
+#. item "Streets/Tunnel" text "Name"
+#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Bridleway" check "Embankment"
+#. item "Ways/Cycleway" check "Embankment"
+#. item "Ways/Footway" check "Embankment"
+#. item "Ways/Pedestrian" check "Embankment"
+#. item "Ways/Steps" check "Embankment"
+#. item "Ways/Path" check "Embankment"
+#. item "Water/Drain" text "Name"
+#. item "Water/Stream" text "Name"
+#. item "Water/Canal" text "Name"
+#. item "Water/River" text "Name"
+#. item "Railway/Bus Guideway" check "Embankment"
+#: build/trans_presets.java:57 build/trans_presets.java:74
+#: build/trans_presets.java:93 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:146
+#: build/trans_presets.java:166 build/trans_presets.java:186
+#: build/trans_presets.java:209 build/trans_presets.java:227
+#: build/trans_presets.java:245 build/trans_presets.java:264
+#: build/trans_presets.java:297 build/trans_presets.java:342
+#: build/trans_presets.java:357 build/trans_presets.java:372
+#: build/trans_presets.java:394 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:511 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:645 build/trans_presets.java:1040
+#: build/trans_presets.java:1048 build/trans_presets.java:1056
+#: build/trans_presets.java:1066 build/trans_presets.java:1285
 msgid "Layer"
 msgstr "Слой"
 
-#: trans_presets.java:58 trans_presets.java:75 trans_presets.java:94
-#: trans_presets.java:112 trans_presets.java:132 trans_presets.java:147
-#: trans_presets.java:167 trans_presets.java:343
+#. item "Streets/Motorway" combo "Layer"
+#. item "Streets/Motorway Link" combo "Layer"
+#. item "Streets/Trunk" combo "Layer"
+#. item "Streets/Trunk Link" combo "Layer"
+#. item "Streets/Primary" combo "Layer"
+#. item "Streets/Primary Link" combo "Layer"
+#. item "Streets/Secondary" combo "Layer"
+#. item "Streets/Roundabout" combo "Layer"
+#: build/trans_presets.java:58 build/trans_presets.java:75
+#: build/trans_presets.java:94 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:147
+#: build/trans_presets.java:167 build/trans_presets.java:343
 msgid "Lanes"
 msgstr "Полосы"
 
-#: trans_presets.java:59 trans_presets.java:76 trans_presets.java:95
-#: trans_presets.java:113 trans_presets.java:133 trans_presets.java:148
-#: trans_presets.java:168 trans_presets.java:187 trans_presets.java:210
-#: trans_presets.java:266 trans_presets.java:298 trans_presets.java:319
-#: trans_presets.java:358 trans_presets.java:373 trans_presets.java:397
-#: trans_presets.java:416 trans_presets.java:436 trans_presets.java:455
-#: trans_presets.java:493 trans_presets.java:647 trans_presets.java:1290
+#. item "Streets/Motorway" combo "Lanes"
+#. item "Streets/Motorway Link" combo "Lanes"
+#. item "Streets/Trunk" combo "Lanes"
+#. item "Streets/Trunk Link" combo "Lanes"
+#. item "Streets/Primary" combo "Lanes"
+#. item "Streets/Primary Link" combo "Lanes"
+#. item "Streets/Secondary" combo "Lanes"
+#. item "Streets/Tertiary" combo "Layer"
+#. item "Streets/Unclassified" combo "Layer"
+#. item "Streets/Road (Unknown Type)" combo "Layer"
+#. item "Streets/Bridge" combo "Layer"
+#. item "Streets/Tunnel" combo "Layer"
+#: build/trans_presets.java:59 build/trans_presets.java:76
+#: build/trans_presets.java:95 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:148
+#: build/trans_presets.java:168 build/trans_presets.java:187
+#: build/trans_presets.java:210 build/trans_presets.java:266
+#: build/trans_presets.java:298 build/trans_presets.java:319
+#: build/trans_presets.java:358 build/trans_presets.java:373
+#: build/trans_presets.java:397 build/trans_presets.java:416
+#: build/trans_presets.java:436 build/trans_presets.java:455
+#: build/trans_presets.java:493 build/trans_presets.java:647
+#: build/trans_presets.java:1287
 msgid "Max. speed (km/h)"
 msgstr "Макс. скорость (км/ч)"
 
-#: trans_presets.java:60 trans_presets.java:77 trans_presets.java:96
-#: trans_presets.java:114 trans_presets.java:134 trans_presets.java:149
-#: trans_presets.java:169 trans_presets.java:188 trans_presets.java:204
-#: trans_presets.java:222 trans_presets.java:240 trans_presets.java:259
-#: trans_presets.java:279 trans_presets.java:292 trans_presets.java:305
-#: trans_presets.java:337 trans_presets.java:389 trans_presets.java:409
-#: trans_presets.java:429 trans_presets.java:448 trans_presets.java:467
-#: trans_presets.java:486 trans_presets.java:640 trans_presets.java:1283
+#. item "Streets/Motorway" text "Max. speed (km/h)"
+#. item "Streets/Motorway Link" text "Max. speed (km/h)"
+#. item "Streets/Trunk" text "Max. speed (km/h)"
+#. item "Streets/Trunk Link" text "Max. speed (km/h)"
+#. item "Streets/Primary" text "Max. speed (km/h)"
+#. item "Streets/Primary Link" text "Max. speed (km/h)"
+#. item "Streets/Secondary" text "Max. speed (km/h)"
+#. item "Streets/Tertiary" text "Max. speed (km/h)"
+#. item "Streets/Unclassified" text "Name"
+#. item "Streets/Residential" text "Name"
+#. <optional>
+#. item "Streets/Living Street" text "Name"
+#. <optional>
+#. item "Streets/Service" text "Name"
+#. item "Streets/Parking Aisle" label "Edit a Parking Aisle"
+#. <space />
+#. <key key="highway" value="service" />
+#. <key key="service" value="parking_aisle" />
+#. <optional>
+#. item "Streets/Road (Unknown Type)" text "Name"
+#. item "Streets/Road Restrictions" label "Edit Road Restrictions"
+#. item "Streets/Roundabout" text "Name"
+#. item "Ways/Construction" text "Name"
+#. item "Ways/Bridleway" text "Name"
+#. item "Ways/Cycleway" text "Name"
+#. item "Ways/Footway" text "Name"
+#. item "Ways/Pedestrian" text "Name"
+#. <optional>
+#. item "Ways/Steps" text "Name"
+#. item "Ways/Path" text "Name"
+#. item "Railway/Bus Guideway" text "Name"
+#: build/trans_presets.java:60 build/trans_presets.java:77
+#: build/trans_presets.java:96 build/trans_presets.java:114
+#: build/trans_presets.java:134 build/trans_presets.java:149
+#: build/trans_presets.java:169 build/trans_presets.java:188
+#: build/trans_presets.java:204 build/trans_presets.java:222
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:279 build/trans_presets.java:292
+#: build/trans_presets.java:305 build/trans_presets.java:337
+#: build/trans_presets.java:389 build/trans_presets.java:409
+#: build/trans_presets.java:429 build/trans_presets.java:448
+#: build/trans_presets.java:467 build/trans_presets.java:486
+#: build/trans_presets.java:640 build/trans_presets.java:1280
 msgid "Oneway"
 msgstr "Односторонняя"
 
-#: trans_presets.java:62 trans_presets.java:79 trans_presets.java:98
-#: trans_presets.java:116 trans_presets.java:136 trans_presets.java:151
-#: trans_presets.java:171 trans_presets.java:190 trans_presets.java:206
-#: trans_presets.java:224 trans_presets.java:242 trans_presets.java:261
-#: trans_presets.java:294 trans_presets.java:339 trans_presets.java:363
-#: trans_presets.java:391 trans_presets.java:411 trans_presets.java:431
-#: trans_presets.java:450 trans_presets.java:469 trans_presets.java:488
-#: trans_presets.java:507 trans_presets.java:528 trans_presets.java:549
-#: trans_presets.java:570 trans_presets.java:591 trans_presets.java:612
-#: trans_presets.java:642 trans_presets.java:1285
+#. item "Streets/Motorway" check "Oneway"
+#. item "Streets/Motorway Link" check "Oneway"
+#. item "Streets/Trunk" check "Oneway"
+#. item "Streets/Trunk Link" check "Oneway"
+#. item "Streets/Primary" check "Oneway"
+#. item "Streets/Primary Link" check "Oneway"
+#. item "Streets/Secondary" check "Oneway"
+#. item "Streets/Tertiary" check "Oneway"
+#. item "Streets/Unclassified" check "Oneway"
+#. item "Streets/Residential" check "Oneway"
+#. item "Streets/Living Street" check "Oneway"
+#. item "Streets/Service" check "Oneway"
+#. item "Streets/Road (Unknown Type)" check "Oneway"
+#. item "Streets/Roundabout" check "Oneway"
+#. item "Streets/Roundabout" text "Width (meters)"
+#. </optional>
+#. item "Ways/Construction" check "Oneway"
+#. item "Ways/Bridleway" check "Oneway"
+#. item "Ways/Cycleway" check "Oneway"
+#. item "Ways/Footway" check "Oneway"
+#. item "Ways/Pedestrian" check "Oneway"
+#. item "Ways/Steps" check "Oneway"
+#. item "Ways/Track" text "Name"
+#. item "Ways/Track Grade 1" text "Name"
+#. item "Ways/Track Grade 2" text "Name"
+#. item "Ways/Track Grade 3" text "Name"
+#. item "Ways/Track Grade 4" text "Name"
+#. item "Ways/Track Grade 5" text "Name"
+#. item "Ways/Path" check "Oneway"
+#. item "Railway/Bus Guideway" check "Oneway"
+#. <button label="Tunnel Start" hotkey="T" icon="tunnel">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="tunnel start"/>
+#. <!--action class="ConsolePrinterAction" params="tunnel start,tunnel"/-->
+#. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
+#. </button>
+#: build/trans_presets.java:61 build/trans_presets.java:78
+#: build/trans_presets.java:97 build/trans_presets.java:115
+#: build/trans_presets.java:135 build/trans_presets.java:150
+#: build/trans_presets.java:170 build/trans_presets.java:189
+#: build/trans_presets.java:205 build/trans_presets.java:223
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:293 build/trans_presets.java:338
+#: build/trans_presets.java:347 build/trans_presets.java:390
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:641
+#: build/trans_presets.java:1281 build/trans_surveyor.java:12
+msgid "Bridge"
+msgstr "Мост"
+
+#. item "Streets/Motorway" check "Bridge"
+#. item "Streets/Motorway Link" check "Bridge"
+#. item "Streets/Trunk" check "Bridge"
+#. item "Streets/Trunk Link" check "Bridge"
+#. item "Streets/Primary" check "Bridge"
+#. item "Streets/Primary Link" check "Bridge"
+#. item "Streets/Secondary" check "Bridge"
+#. item "Streets/Tertiary" check "Bridge"
+#. item "Streets/Unclassified" check "Bridge"
+#. item "Streets/Residential" check "Bridge"
+#. item "Streets/Living Street" check "Bridge"
+#. item "Streets/Service" check "Bridge"
+#. item "Streets/Road (Unknown Type)" check "Bridge"
+#. item "Streets/Roundabout" check "Bridge"
+#. item "Streets/Bridge" text "Width (meters)"
+#. </optional>
+#. item "Ways/Construction" check "Bridge"
+#. item "Ways/Bridleway" check "Bridge"
+#. item "Ways/Cycleway" check "Bridge"
+#. item "Ways/Footway" check "Bridge"
+#. item "Ways/Pedestrian" check "Bridge"
+#. item "Ways/Steps" check "Bridge"
+#. item "Ways/Track" check "Bridge"
+#. item "Ways/Track Grade 1" check "Bridge"
+#. item "Ways/Track Grade 2" check "Bridge"
+#. item "Ways/Track Grade 3" check "Bridge"
+#. item "Ways/Track Grade 4" check "Bridge"
+#. item "Ways/Track Grade 5" check "Bridge"
+#. item "Ways/Path" check "Bridge"
+#. item "Railway/Bus Guideway" check "Bridge"
+#: build/trans_presets.java:62 build/trans_presets.java:79
+#: build/trans_presets.java:98 build/trans_presets.java:116
+#: build/trans_presets.java:136 build/trans_presets.java:151
+#: build/trans_presets.java:171 build/trans_presets.java:190
+#: build/trans_presets.java:206 build/trans_presets.java:224
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:294 build/trans_presets.java:339
+#: build/trans_presets.java:363 build/trans_presets.java:391
+#: build/trans_presets.java:411 build/trans_presets.java:431
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:528 build/trans_presets.java:549
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:642
+#: build/trans_presets.java:1282
 msgid "Tunnel"
 msgstr "Тоннель"
 
-#: trans_presets.java:63 trans_presets.java:80 trans_presets.java:99
-#: trans_presets.java:117 trans_presets.java:137 trans_presets.java:152
-#: trans_presets.java:172 trans_presets.java:191 trans_presets.java:207
-#: trans_presets.java:225 trans_presets.java:243 trans_presets.java:262
-#: trans_presets.java:295 trans_presets.java:340 trans_presets.java:392
-#: trans_presets.java:412 trans_presets.java:432 trans_presets.java:451
-#: trans_presets.java:470 trans_presets.java:489 trans_presets.java:508
-#: trans_presets.java:529 trans_presets.java:550 trans_presets.java:571
-#: trans_presets.java:592 trans_presets.java:613 trans_presets.java:643
-#: trans_presets.java:1286
+#. item "Streets/Motorway" check "Tunnel"
+#. item "Streets/Motorway Link" check "Tunnel"
+#. item "Streets/Trunk" check "Tunnel"
+#. item "Streets/Trunk Link" check "Tunnel"
+#. item "Streets/Primary" check "Tunnel"
+#. item "Streets/Primary Link" check "Tunnel"
+#. item "Streets/Secondary" check "Tunnel"
+#. item "Streets/Tertiary" check "Tunnel"
+#. item "Streets/Unclassified" check "Tunnel"
+#. item "Streets/Residential" check "Tunnel"
+#. item "Streets/Living Street" check "Tunnel"
+#. item "Streets/Service" check "Tunnel"
+#. item "Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Streets/Roundabout" check "Tunnel"
+#. item "Ways/Construction" check "Tunnel"
+#. item "Ways/Bridleway" check "Tunnel"
+#. item "Ways/Cycleway" check "Tunnel"
+#. item "Ways/Footway" check "Tunnel"
+#. item "Ways/Pedestrian" check "Tunnel"
+#. item "Ways/Steps" check "Tunnel"
+#. item "Ways/Track" check "Tunnel"
+#. item "Ways/Track Grade 1" check "Tunnel"
+#. item "Ways/Track Grade 2" check "Tunnel"
+#. item "Ways/Track Grade 3" check "Tunnel"
+#. item "Ways/Track Grade 4" check "Tunnel"
+#. item "Ways/Track Grade 5" check "Tunnel"
+#. item "Ways/Path" check "Tunnel"
+#. item "Railway/Bus Guideway" check "Tunnel"
+#: build/trans_presets.java:63 build/trans_presets.java:80
+#: build/trans_presets.java:99 build/trans_presets.java:117
+#: build/trans_presets.java:137 build/trans_presets.java:152
+#: build/trans_presets.java:172 build/trans_presets.java:191
+#: build/trans_presets.java:207 build/trans_presets.java:225
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:295 build/trans_presets.java:340
+#: build/trans_presets.java:392 build/trans_presets.java:412
+#: build/trans_presets.java:432 build/trans_presets.java:451
+#: build/trans_presets.java:470 build/trans_presets.java:489
+#: build/trans_presets.java:508 build/trans_presets.java:529
+#: build/trans_presets.java:550 build/trans_presets.java:571
+#: build/trans_presets.java:592 build/trans_presets.java:613
+#: build/trans_presets.java:643 build/trans_presets.java:1283
 msgid "Cutting"
 msgstr ""
 
-#: trans_presets.java:64 trans_presets.java:81 trans_presets.java:100
-#: trans_presets.java:118 trans_presets.java:138 trans_presets.java:153
-#: trans_presets.java:173 trans_presets.java:192 trans_presets.java:208
-#: trans_presets.java:226 trans_presets.java:244 trans_presets.java:263
-#: trans_presets.java:296 trans_presets.java:341 trans_presets.java:393
-#: trans_presets.java:413 trans_presets.java:433 trans_presets.java:452
-#: trans_presets.java:471 trans_presets.java:490 trans_presets.java:509
-#: trans_presets.java:530 trans_presets.java:551 trans_presets.java:572
-#: trans_presets.java:593 trans_presets.java:614 trans_presets.java:644
-#: trans_presets.java:1287
+#. item "Streets/Motorway" check "Cutting"
+#. item "Streets/Motorway Link" check "Cutting"
+#. item "Streets/Trunk" check "Cutting"
+#. item "Streets/Trunk Link" check "Cutting"
+#. item "Streets/Primary" check "Cutting"
+#. item "Streets/Primary Link" check "Cutting"
+#. item "Streets/Secondary" check "Cutting"
+#. item "Streets/Tertiary" check "Cutting"
+#. item "Streets/Unclassified" check "Cutting"
+#. item "Streets/Residential" check "Cutting"
+#. item "Streets/Living Street" check "Cutting"
+#. item "Streets/Service" check "Cutting"
+#. item "Streets/Road (Unknown Type)" check "Cutting"
+#. item "Streets/Roundabout" check "Cutting"
+#. item "Ways/Construction" check "Cutting"
+#. item "Ways/Bridleway" check "Cutting"
+#. item "Ways/Cycleway" check "Cutting"
+#. item "Ways/Footway" check "Cutting"
+#. item "Ways/Pedestrian" check "Cutting"
+#. item "Ways/Steps" check "Cutting"
+#. item "Ways/Track" check "Cutting"
+#. item "Ways/Track Grade 1" check "Cutting"
+#. item "Ways/Track Grade 2" check "Cutting"
+#. item "Ways/Track Grade 3" check "Cutting"
+#. item "Ways/Track Grade 4" check "Cutting"
+#. item "Ways/Track Grade 5" check "Cutting"
+#. item "Ways/Path" check "Cutting"
+#. item "Railway/Bus Guideway" check "Cutting"
+#: build/trans_presets.java:64 build/trans_presets.java:81
+#: build/trans_presets.java:100 build/trans_presets.java:118
+#: build/trans_presets.java:138 build/trans_presets.java:153
+#: build/trans_presets.java:173 build/trans_presets.java:192
+#: build/trans_presets.java:208 build/trans_presets.java:226
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:296 build/trans_presets.java:341
+#: build/trans_presets.java:393 build/trans_presets.java:413
+#: build/trans_presets.java:433 build/trans_presets.java:452
+#: build/trans_presets.java:471 build/trans_presets.java:490
+#: build/trans_presets.java:509 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:644 build/trans_presets.java:1284
 msgid "Embankment"
 msgstr ""
 
-#: trans_presets.java:67
+#. item "Streets/Motorway" check "Embankment"
+#. </optional>
+#: build/trans_presets.java:67
 msgid "Motorway Link"
 msgstr "Съезд с автобана"
 
-#: trans_presets.java:70
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
+#: build/trans_presets.java:70
 msgid "Edit a Motorway Link"
 msgstr "Править съезд с автобана"
 
-#: trans_presets.java:84
+#. item "Streets/Motorway Link" check "Embankment"
+#. </optional>
+#: build/trans_presets.java:84
 msgid "Trunk"
 msgstr "Автострада"
 
-#: trans_presets.java:87
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
+#: build/trans_presets.java:87
 msgid "Edit a Trunk"
 msgstr "Править автостраду"
 
-#: trans_presets.java:103
+#. item "Streets/Trunk" check "Embankment"
+#. </optional>
+#: build/trans_presets.java:103
 msgid "Trunk Link"
 msgstr "Съезд с автострады"
 
-#: trans_presets.java:106
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
+#: build/trans_presets.java:106
 msgid "Edit a Trunk Link"
 msgstr "Править съезд с автострады"
 
-#: trans_presets.java:125
+#. item "Streets/Trunk Link" check "Embankment"
+#. </optional>
+#. <separator/>
+#. <button label="Motorway" hotkey="1">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Motorway"/>
+#. </button>
+#: build/trans_presets.java:122 build/trans_surveyor.java:76
+msgid "Primary"
+msgstr "Основная"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
+#: build/trans_presets.java:125
 msgid "Edit a Primary Road"
 msgstr "Править основную дорогу"
 
-#: trans_presets.java:141
+#. item "Streets/Primary" check "Embankment"
+#. </optional>
+#: build/trans_presets.java:141
 msgid "Primary Link"
 msgstr "Съезд с основной"
 
-#: trans_presets.java:142
+#. item
+#: build/trans_presets.java:142
 msgid "Edit a Primary Link"
 msgstr "Править съезд с основной"
 
-#: trans_presets.java:160
+#. item "Streets/Primary Link" check "Embankment"
+#. </optional>
+#. <button label="Primary" hotkey="2">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Primary"/>
+#. </button>
+#: build/trans_presets.java:156 build/trans_surveyor.java:80
+msgid "Secondary"
+msgstr "Вторичная"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=secondary"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
+#: build/trans_presets.java:160
 msgid "Edit a Secondary Road"
 msgstr "Править вторичную"
 
-#: trans_presets.java:176
+#. item "Streets/Secondary" check "Embankment"
+#. </optional>
+#: build/trans_presets.java:176
 msgid "Tertiary"
 msgstr "Третичная"
 
-#: trans_presets.java:180
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=tertiary"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
+#: build/trans_presets.java:180
 msgid "Edit a Tertiary Road"
 msgstr "Править третичную"
 
-#: trans_presets.java:199
+#. item "Streets/Tertiary" check "Embankment"
+#. </optional>
+#. <button label="Secondary" hotkey="3">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Secondary"/>
+#. </button>
+#: build/trans_presets.java:195 build/trans_surveyor.java:84
+msgid "Unclassified"
+msgstr "Не классифицировано"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=unclassified"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
+#: build/trans_presets.java:199
 msgid "Edit a Unclassified Road"
 msgstr "Править неклассифицированную дорогу"
 
-#: trans_presets.java:211 trans_presets.java:229 trans_presets.java:247
-#: trans_presets.java:267 trans_presets.java:299 trans_presets.java:344
-#: trans_presets.java:360 trans_presets.java:374 trans_presets.java:398
-#: trans_presets.java:417 trans_presets.java:437 trans_presets.java:456
-#: trans_presets.java:474 trans_presets.java:494 trans_presets.java:515
-#: trans_presets.java:536 trans_presets.java:557 trans_presets.java:578
-#: trans_presets.java:599 trans_presets.java:620 trans_presets.java:648
-#: trans_presets.java:661 trans_presets.java:674 trans_presets.java:687
-#: trans_presets.java:700 trans_presets.java:713 trans_presets.java:726
-#: trans_presets.java:1291 trans_presets.java:1467 trans_presets.java:1508
+#. item "Streets/Unclassified" text "Max. speed (km/h)"
+#. item "Streets/Service" text "Max. speed (km/h)"
+#. item "Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Streets/Roundabout" combo "Lanes"
+#. item "Streets/Bridge" text "Max. weight (tonnes)"
+#. item "Streets/Tunnel" text "Max. speed (km/h)"
+#. item "Ways/Construction" text "Max. speed (km/h)"
+#. item "Ways/Bridleway" text "Max. speed (km/h)"
+#. item "Ways/Cycleway" text "Max. speed (km/h)"
+#. item "Ways/Footway" text "Max. speed (km/h)"
+#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Path" text "Max. speed (km/h)"
+#. item "Ways/Hiking" text "Name"
+#. item "Ways/Mountain Hiking" text "Name"
+#. item "Ways/Demanding Mountain Hiking" text "Name"
+#. item "Ways/Alpine Hiking" text "Name"
+#. item "Ways/Demanding alpine hiking" text "Name"
+#. item "Ways/Difficult alpine hiking" text "Name"
+#. item "Railway/Bus Guideway" text "Max. speed (km/h)"
+#. item "Public Transport/Railway Platform" text "Reference (track number)"
+#. item "Public Transport/Bus Platform" text "Reference (track number)"
+#: build/trans_presets.java:211 build/trans_presets.java:229
+#: build/trans_presets.java:247 build/trans_presets.java:267
+#: build/trans_presets.java:299 build/trans_presets.java:344
+#: build/trans_presets.java:360 build/trans_presets.java:374
+#: build/trans_presets.java:398 build/trans_presets.java:417
+#: build/trans_presets.java:437 build/trans_presets.java:456
+#: build/trans_presets.java:474 build/trans_presets.java:494
+#: build/trans_presets.java:515 build/trans_presets.java:536
+#: build/trans_presets.java:557 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:620
+#: build/trans_presets.java:648 build/trans_presets.java:661
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:1288
+#: build/trans_presets.java:1464 build/trans_presets.java:1505
 msgid "Width (meters)"
 msgstr ""
 
-#: trans_presets.java:217
+#. item "Streets/Unclassified" text "Width (meters)"
+#. </optional>
+#. <button label="Unclassified" hotkey="4">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Unclassified"/>
+#. </button>
+#: build/trans_presets.java:214 build/trans_surveyor.java:88
+msgid "Residential"
+msgstr "Местного значения"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
+#: build/trans_presets.java:217
 msgid "Edit a Residential Street"
 msgstr "Править улицу местного значения"
 
-#: trans_presets.java:228 trans_presets.java:246 trans_presets.java:265
-#: trans_presets.java:280 trans_presets.java:395 trans_presets.java:415
-#: trans_presets.java:435 trans_presets.java:454 trans_presets.java:473
-#: trans_presets.java:492 trans_presets.java:510 trans_presets.java:531
-#: trans_presets.java:552 trans_presets.java:573 trans_presets.java:594
-#: trans_presets.java:615 trans_presets.java:646 trans_presets.java:1289
+#. item "Streets/Residential" combo "Layer"
+#. item "Streets/Living Street" combo "Layer"
+#. item "Streets/Service" combo "Layer"
+#. item "Streets/Parking Aisle" check "Oneway"
+#. item "Ways/Construction" combo "Layer"
+#. item "Ways/Bridleway" combo "Layer"
+#. item "Ways/Cycleway" combo "Layer"
+#. item "Ways/Footway" combo "Layer"
+#. item "Ways/Pedestrian" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
+#. item "Ways/Track" check "Embankment"
+#. item "Ways/Track Grade 1" check "Embankment"
+#. item "Ways/Track Grade 2" check "Embankment"
+#. item "Ways/Track Grade 3" check "Embankment"
+#. item "Ways/Track Grade 4" check "Embankment"
+#. item "Ways/Track Grade 5" check "Embankment"
+#. item "Ways/Path" combo "Layer"
+#. item "Railway/Bus Guideway" combo "Layer"
+#: build/trans_presets.java:228 build/trans_presets.java:246
+#: build/trans_presets.java:265 build/trans_presets.java:280
+#: build/trans_presets.java:395 build/trans_presets.java:415
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:473 build/trans_presets.java:492
+#: build/trans_presets.java:510 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:646 build/trans_presets.java:1286
 msgid "Surface"
 msgstr "Дорожное покрытие"
 
-#: trans_presets.java:228 trans_presets.java:246 trans_presets.java:265
-#: trans_presets.java:280 trans_presets.java:395 trans_presets.java:415
-#: trans_presets.java:435 trans_presets.java:454 trans_presets.java:473
-#: trans_presets.java:492 trans_presets.java:510 trans_presets.java:531
-#: trans_presets.java:552 trans_presets.java:573 trans_presets.java:594
-#: trans_presets.java:615 trans_presets.java:646 trans_presets.java:1289
+#. item "Streets/Residential" combo "Surface"
+#. item "Streets/Living Street" combo "Surface"
+#. item "Streets/Service" combo "Surface"
+#. item "Streets/Parking Aisle" combo "Surface"
+#. item "Ways/Construction" combo "Surface"
+#. item "Ways/Bridleway" combo "Surface"
+#. item "Ways/Cycleway" combo "Surface"
+#. item "Ways/Footway" combo "Surface"
+#. item "Ways/Pedestrian" combo "Surface"
+#. item "Ways/Steps" combo "Surface"
+#. item "Ways/Track" combo "Surface"
+#. item "Ways/Track Grade 1" combo "Surface"
+#. item "Ways/Track Grade 2" combo "Surface"
+#. item "Ways/Track Grade 3" combo "Surface"
+#. item "Ways/Track Grade 4" combo "Surface"
+#. item "Ways/Track Grade 5" combo "Surface"
+#. item "Ways/Path" combo "Surface"
+#. item "Railway/Bus Guideway" combo "Surface"
+#: build/trans_presets.java:228 build/trans_presets.java:246
+#: build/trans_presets.java:265 build/trans_presets.java:280
+#: build/trans_presets.java:395 build/trans_presets.java:415
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:473 build/trans_presets.java:492
+#: build/trans_presets.java:510 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:646 build/trans_presets.java:1286
 msgid "paved"
 msgstr "асфальтированная"
 
-#: trans_presets.java:228 trans_presets.java:246 trans_presets.java:265
-#: trans_presets.java:280 trans_presets.java:395 trans_presets.java:415
-#: trans_presets.java:435 trans_presets.java:454 trans_presets.java:473
-#: trans_presets.java:492 trans_presets.java:646 trans_presets.java:1289
+#: build/trans_presets.java:228 build/trans_presets.java:246
+#: build/trans_presets.java:265 build/trans_presets.java:280
+#: build/trans_presets.java:395 build/trans_presets.java:415
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:473 build/trans_presets.java:492
+#: build/trans_presets.java:646 build/trans_presets.java:1286
 msgid "unpaved"
 msgstr "неасфальтированная"
 
-#: trans_presets.java:228 trans_presets.java:246 trans_presets.java:265
-#: trans_presets.java:280 trans_presets.java:395 trans_presets.java:415
-#: trans_presets.java:435 trans_presets.java:454 trans_presets.java:473
-#: trans_presets.java:492 trans_presets.java:510 trans_presets.java:531
-#: trans_presets.java:552 trans_presets.java:573 trans_presets.java:594
-#: trans_presets.java:615 trans_presets.java:646 trans_presets.java:1289
+#: build/trans_presets.java:228 build/trans_presets.java:246
+#: build/trans_presets.java:265 build/trans_presets.java:280
+#: build/trans_presets.java:395 build/trans_presets.java:415
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:473 build/trans_presets.java:492
+#: build/trans_presets.java:510 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:646 build/trans_presets.java:1286
 msgid "cobblestone"
 msgstr "мостовая"
 
-#: trans_presets.java:232
+#. item "Streets/Residential" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:232
 msgid "Living Street"
 msgstr "Жилая улица"
 
-#: trans_presets.java:235
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
+#: build/trans_presets.java:235
 msgid "Edit a Living Street"
 msgstr "Править жилую улицу"
 
-#: trans_presets.java:250
+#. item "Streets/Living Street" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:250
 msgid "Service"
 msgstr "Служебная"
 
-#: trans_presets.java:253
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
+#: build/trans_presets.java:253
 msgid "Edit a Serviceway"
 msgstr "Править служебную дорогу"
 
-#: trans_presets.java:257
+#. item "Streets/Service" label "Edit a Serviceway"
+#. <space />
+#. <key key="highway" value="service" />
+#. <optional>
+#: build/trans_presets.java:257
 msgid "Serviceway type"
 msgstr ""
 
-#: trans_presets.java:257
+#. item "Streets/Service" combo "Serviceway type"
+#: build/trans_presets.java:257
 msgid "alley"
 msgstr ""
 
-#: trans_presets.java:257
+#: build/trans_presets.java:257
 msgid "driveway"
 msgstr ""
 
-#: trans_presets.java:257
+#: build/trans_presets.java:257
 msgid "parking_aisle"
 msgstr ""
 
-#: trans_presets.java:270
+#. item "Streets/Service" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:270
 msgid "Parking Aisle"
 msgstr "Проезд на парковке"
 
-#: trans_presets.java:274
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:service=parking_aisle"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
+#: build/trans_presets.java:274
 msgid "Edit a Parking Aisle"
 msgstr ""
 
-#: trans_presets.java:284
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:284
 msgid "Road (Unknown Type)"
 msgstr "Дорога (тип неизвестен)"
 
-#: trans_presets.java:287
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
+#: build/trans_presets.java:287
 msgid "Edit a Road of unknown type"
 msgstr "Править дорогу неизвестного типа"
 
-#: trans_presets.java:303
+#. item "Streets/Road (Unknown Type)" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:303
 msgid "Road Restrictions"
 msgstr "Дорожные ограничения"
 
-#: trans_presets.java:304
+#. item
+#: build/trans_presets.java:304
 msgid "Edit Road Restrictions"
 msgstr "Править дорожные ограничения"
 
-#: trans_presets.java:306
+#. item "Streets/Road Restrictions" check "Oneway"
+#: build/trans_presets.java:306
 msgid "Toll"
 msgstr "Платная"
 
-#: trans_presets.java:307
+#. item "Streets/Road Restrictions" check "Toll"
+#: build/trans_presets.java:307
 msgid "No exit (cul-de-sac)"
 msgstr "Тупик"
 
-#: trans_presets.java:308 trans_presets.java:512 trans_presets.java:533
-#: trans_presets.java:554 trans_presets.java:575 trans_presets.java:596
-#: trans_presets.java:617
+#. item "Streets/Road Restrictions" check "No exit (cul-de-sac)"
+#. item "Ways/Track" combo "Layer"
+#. item "Ways/Track Grade 1" combo "Layer"
+#. item "Ways/Track Grade 2" combo "Layer"
+#. item "Ways/Track Grade 3" combo "Layer"
+#. item "Ways/Track Grade 4" combo "Layer"
+#. item "Ways/Track Grade 5" combo "Layer"
+#: build/trans_presets.java:308 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617
 msgid "Access"
 msgstr "Доступ"
 
-#: trans_presets.java:308 trans_presets.java:309 trans_presets.java:310
-#: trans_presets.java:311 trans_presets.java:312 trans_presets.java:313
-#: trans_presets.java:314 trans_presets.java:315 trans_presets.java:316
-#: trans_presets.java:317 trans_presets.java:318 trans_presets.java:512
-#: trans_presets.java:513 trans_presets.java:514 trans_presets.java:533
-#: trans_presets.java:534 trans_presets.java:535 trans_presets.java:554
-#: trans_presets.java:555 trans_presets.java:556 trans_presets.java:575
-#: trans_presets.java:576 trans_presets.java:577 trans_presets.java:596
-#: trans_presets.java:597 trans_presets.java:598 trans_presets.java:617
-#: trans_presets.java:618 trans_presets.java:619 trans_presets.java:632
-#: trans_presets.java:633 trans_presets.java:634 trans_presets.java:635
-#: trans_presets.java:636 trans_presets.java:637 trans_presets.java:1368
-#: trans_presets.java:2271 trans_presets.java:2529
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Charge"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:308 build/trans_presets.java:309
+#: build/trans_presets.java:310 build/trans_presets.java:311
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:512
+#: build/trans_presets.java:513 build/trans_presets.java:514
+#: build/trans_presets.java:533 build/trans_presets.java:534
+#: build/trans_presets.java:535 build/trans_presets.java:554
+#: build/trans_presets.java:555 build/trans_presets.java:556
+#: build/trans_presets.java:575 build/trans_presets.java:576
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:597 build/trans_presets.java:598
+#: build/trans_presets.java:617 build/trans_presets.java:618
+#: build/trans_presets.java:619 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:634
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:1365
+#: build/trans_presets.java:2301 build/trans_presets.java:2559
 msgid "yes"
 msgstr "да"
 
-#: trans_presets.java:308 trans_presets.java:309 trans_presets.java:310
-#: trans_presets.java:311 trans_presets.java:312 trans_presets.java:313
-#: trans_presets.java:314 trans_presets.java:315 trans_presets.java:316
-#: trans_presets.java:317 trans_presets.java:318 trans_presets.java:512
-#: trans_presets.java:513 trans_presets.java:514 trans_presets.java:533
-#: trans_presets.java:534 trans_presets.java:535 trans_presets.java:554
-#: trans_presets.java:555 trans_presets.java:556 trans_presets.java:575
-#: trans_presets.java:576 trans_presets.java:577 trans_presets.java:596
-#: trans_presets.java:597 trans_presets.java:598 trans_presets.java:617
-#: trans_presets.java:618 trans_presets.java:619 trans_presets.java:632
-#: trans_presets.java:633 trans_presets.java:634 trans_presets.java:635
-#: trans_presets.java:636 trans_presets.java:637
+#. color permissive
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="private"/>
+#: build/trans_presets.java:308 build/trans_presets.java:309
+#: build/trans_presets.java:310 build/trans_presets.java:311
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:512
+#: build/trans_presets.java:513 build/trans_presets.java:514
+#: build/trans_presets.java:533 build/trans_presets.java:534
+#: build/trans_presets.java:535 build/trans_presets.java:554
+#: build/trans_presets.java:555 build/trans_presets.java:556
+#: build/trans_presets.java:575 build/trans_presets.java:576
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:597 build/trans_presets.java:598
+#: build/trans_presets.java:617 build/trans_presets.java:618
+#: build/trans_presets.java:619 build/trans_style.java:185
+msgid "private"
+msgstr "частный"
+
+#: build/trans_presets.java:308 build/trans_presets.java:309
+#: build/trans_presets.java:310 build/trans_presets.java:311
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:512
+#: build/trans_presets.java:513 build/trans_presets.java:514
+#: build/trans_presets.java:533 build/trans_presets.java:534
+#: build/trans_presets.java:535 build/trans_presets.java:554
+#: build/trans_presets.java:555 build/trans_presets.java:556
+#: build/trans_presets.java:575 build/trans_presets.java:576
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:597 build/trans_presets.java:598
+#: build/trans_presets.java:617 build/trans_presets.java:618
+#: build/trans_presets.java:619 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:634
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "designated"
 msgstr "предусмотрен"
 
-#: trans_presets.java:308 trans_presets.java:312 trans_presets.java:315
-#: trans_presets.java:512 trans_presets.java:513 trans_presets.java:514
-#: trans_presets.java:533 trans_presets.java:534 trans_presets.java:535
-#: trans_presets.java:554 trans_presets.java:555 trans_presets.java:556
-#: trans_presets.java:575 trans_presets.java:576 trans_presets.java:577
-#: trans_presets.java:596 trans_presets.java:597 trans_presets.java:598
-#: trans_presets.java:617 trans_presets.java:618 trans_presets.java:619
+#. color private
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="destination"/>
+#: build/trans_presets.java:308 build/trans_presets.java:309
+#: build/trans_presets.java:310 build/trans_presets.java:311
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:512
+#: build/trans_presets.java:513 build/trans_presets.java:514
+#: build/trans_presets.java:533 build/trans_presets.java:534
+#: build/trans_presets.java:535 build/trans_presets.java:554
+#: build/trans_presets.java:555 build/trans_presets.java:556
+#: build/trans_presets.java:575 build/trans_presets.java:576
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:597 build/trans_presets.java:598
+#: build/trans_presets.java:617 build/trans_presets.java:618
+#: build/trans_presets.java:619 build/trans_style.java:192
+msgid "destination"
+msgstr "назначение"
+
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--restrictions tags -->
+#. <!--the restrictions rules should be placed before the path rule! -->
+#.
+#. <rule>
+#. <condition k="access" b="no"/>
+#. <icon src="vehicle/restriction/access.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="permissive"/>
+#: build/trans_presets.java:308 build/trans_presets.java:309
+#: build/trans_presets.java:310 build/trans_presets.java:311
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:512
+#: build/trans_presets.java:513 build/trans_presets.java:514
+#: build/trans_presets.java:533 build/trans_presets.java:534
+#: build/trans_presets.java:535 build/trans_presets.java:554
+#: build/trans_presets.java:555 build/trans_presets.java:556
+#: build/trans_presets.java:575 build/trans_presets.java:576
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:597 build/trans_presets.java:598
+#: build/trans_presets.java:617 build/trans_presets.java:618
+#: build/trans_presets.java:619 build/trans_style.java:178
+msgid "permissive"
+msgstr "разрешающее"
+
+#: build/trans_presets.java:308 build/trans_presets.java:312
+#: build/trans_presets.java:315 build/trans_presets.java:512
+#: build/trans_presets.java:513 build/trans_presets.java:514
+#: build/trans_presets.java:533 build/trans_presets.java:534
+#: build/trans_presets.java:535 build/trans_presets.java:554
+#: build/trans_presets.java:555 build/trans_presets.java:556
+#: build/trans_presets.java:575 build/trans_presets.java:576
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:597 build/trans_presets.java:598
+#: build/trans_presets.java:617 build/trans_presets.java:618
+#: build/trans_presets.java:619
 msgid "agricultural"
 msgstr "сельскохозяйственное"
 
-#: trans_presets.java:308 trans_presets.java:309 trans_presets.java:310
-#: trans_presets.java:311 trans_presets.java:312 trans_presets.java:313
-#: trans_presets.java:314 trans_presets.java:315 trans_presets.java:316
-#: trans_presets.java:317 trans_presets.java:318 trans_presets.java:512
-#: trans_presets.java:513 trans_presets.java:514 trans_presets.java:533
-#: trans_presets.java:534 trans_presets.java:535 trans_presets.java:554
-#: trans_presets.java:555 trans_presets.java:556 trans_presets.java:575
-#: trans_presets.java:576 trans_presets.java:577 trans_presets.java:596
-#: trans_presets.java:597 trans_presets.java:598 trans_presets.java:617
-#: trans_presets.java:618 trans_presets.java:619 trans_presets.java:632
-#: trans_presets.java:633 trans_presets.java:634 trans_presets.java:635
-#: trans_presets.java:636 trans_presets.java:637 trans_presets.java:754
-#: trans_presets.java:769 trans_presets.java:1313 trans_presets.java:1368
-#: trans_presets.java:2271 trans_presets.java:2529
+#: build/trans_presets.java:308 build/trans_presets.java:309
+#: build/trans_presets.java:310 build/trans_presets.java:311
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:512
+#: build/trans_presets.java:513 build/trans_presets.java:514
+#: build/trans_presets.java:533 build/trans_presets.java:534
+#: build/trans_presets.java:535 build/trans_presets.java:554
+#: build/trans_presets.java:555 build/trans_presets.java:556
+#: build/trans_presets.java:575 build/trans_presets.java:576
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:597 build/trans_presets.java:598
+#: build/trans_presets.java:617 build/trans_presets.java:618
+#: build/trans_presets.java:619 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:634
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:754
+#: build/trans_presets.java:769 build/trans_presets.java:1310
+#: build/trans_presets.java:1365 build/trans_presets.java:2301
+#: build/trans_presets.java:2559
 msgid "no"
 msgstr "нет"
 
-#: trans_presets.java:311
+#: build/trans_presets.java:311
 msgid "Goods"
 msgstr "Грузовик (до 3.5т)"
 
-#: trans_presets.java:312
+#: build/trans_presets.java:312
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Грузовик (более 3.5т)"
 
-#: trans_presets.java:313 trans_presets.java:634 trans_presets.java:852
-#: trans_presets.java:865 trans_presets.java:876 trans_presets.java:903
-#: trans_presets.java:913 trans_presets.java:926 trans_presets.java:938
-#: trans_presets.java:950 trans_presets.java:962 trans_presets.java:1010
-#: trans_presets.java:1023
+#. item "Barriers/Hampshire Gate" check "Bicycle"
+#. item "Barriers/Bollard" check "Bicycle"
+#. item "Barriers/Drawbridge" check "Bicycle"
+#. item "Barriers/Spikes" check "Bicycle"
+#. item "Barriers/Portcullis" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Gate" check "Bicycle"
+#. item "Barriers/Lift Gate" check "Bicycle"
+#. item "Barriers/Sally Port" check "Bicycle"
+#. item "Barriers/Bump Gate" check "Bicycle"
+#. item "Barriers/Border Control" check "Bicycle"
+#. item "Barriers/Entrance" check "Bicycle"
+#: build/trans_presets.java:313 build/trans_presets.java:634
+#: build/trans_presets.java:849 build/trans_presets.java:862
+#: build/trans_presets.java:873 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:923
+#: build/trans_presets.java:935 build/trans_presets.java:947
+#: build/trans_presets.java:959 build/trans_presets.java:1007
+#: build/trans_presets.java:1020
 msgid "Horse"
 msgstr "Лошадь"
 
-#: trans_presets.java:314 trans_presets.java:513 trans_presets.java:534
-#: trans_presets.java:555 trans_presets.java:576 trans_presets.java:597
-#: trans_presets.java:618 trans_presets.java:853 trans_presets.java:866
-#: trans_presets.java:877 trans_presets.java:892 trans_presets.java:904
-#: trans_presets.java:914 trans_presets.java:927 trans_presets.java:939
-#: trans_presets.java:951 trans_presets.java:963 trans_presets.java:1011
-#: trans_presets.java:1024
+#. item "Barriers/Hampshire Gate" check "Horse"
+#. item "Barriers/Bollard" check "Horse"
+#. item "Barriers/Drawbridge" check "Horse"
+#. item "Barriers/Cattle Grid" check "Bicycle"
+#. item "Barriers/Spikes" check "Horse"
+#. item "Barriers/Portcullis" check "Horse"
+#. item "Barriers/Gate" check "Horse"
+#. item "Barriers/Lift Gate" check "Horse"
+#. item "Barriers/Sally Port" check "Horse"
+#. item "Barriers/Bump Gate" check "Horse"
+#. item "Barriers/Border Control" check "Horse"
+#. item "Barriers/Entrance" check "Horse"
+#: build/trans_presets.java:314 build/trans_presets.java:513
+#: build/trans_presets.java:534 build/trans_presets.java:555
+#: build/trans_presets.java:576 build/trans_presets.java:597
+#: build/trans_presets.java:618 build/trans_presets.java:850
+#: build/trans_presets.java:863 build/trans_presets.java:874
+#: build/trans_presets.java:889 build/trans_presets.java:901
+#: build/trans_presets.java:911 build/trans_presets.java:924
+#: build/trans_presets.java:936 build/trans_presets.java:948
+#: build/trans_presets.java:960 build/trans_presets.java:1008
+#: build/trans_presets.java:1021
 msgid "Motorcycle"
 msgstr "Мотоцикл"
 
-#: trans_presets.java:315 trans_presets.java:514 trans_presets.java:535
-#: trans_presets.java:556 trans_presets.java:577 trans_presets.java:598
-#: trans_presets.java:619 trans_presets.java:632 trans_presets.java:854
-#: trans_presets.java:878 trans_presets.java:893 trans_presets.java:905
-#: trans_presets.java:915 trans_presets.java:928 trans_presets.java:940
-#: trans_presets.java:952 trans_presets.java:964 trans_presets.java:1012
-#: trans_presets.java:1025
+#. item "Ways/Path" label "Type"
+#. item "Barriers/Hampshire Gate" check "Motorcycle"
+#. item "Barriers/Drawbridge" check "Motorcycle"
+#. item "Barriers/Cattle Grid" check "Motorcycle"
+#. item "Barriers/Spikes" check "Motorcycle"
+#. item "Barriers/Portcullis" check "Motorcycle"
+#. item "Barriers/Gate" check "Motorcycle"
+#. item "Barriers/Lift Gate" check "Motorcycle"
+#. item "Barriers/Sally Port" check "Motorcycle"
+#. item "Barriers/Bump Gate" check "Motorcycle"
+#. item "Barriers/Border Control" check "Motorcycle"
+#. item "Barriers/Entrance" check "Motorcycle"
+#: build/trans_presets.java:315 build/trans_presets.java:514
+#: build/trans_presets.java:535 build/trans_presets.java:556
+#: build/trans_presets.java:577 build/trans_presets.java:598
+#: build/trans_presets.java:619 build/trans_presets.java:632
+#: build/trans_presets.java:851 build/trans_presets.java:875
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:925
+#: build/trans_presets.java:937 build/trans_presets.java:949
+#: build/trans_presets.java:961 build/trans_presets.java:1009
+#: build/trans_presets.java:1022
 msgid "Motorcar"
 msgstr "Автомобиль"
 
-#: trans_presets.java:316
+#: build/trans_presets.java:316
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: trans_presets.java:317
+#: build/trans_presets.java:317
 msgid "Motorboat"
 msgstr "Моторная лодка"
 
-#: trans_presets.java:318
+#: build/trans_presets.java:318
 msgid "Boat"
 msgstr "Лодка"
 
-#: trans_presets.java:320
+#. item "Streets/Road Restrictions" text "Max. speed (km/h)"
+#: build/trans_presets.java:320
 msgid "Min. speed (km/h)"
 msgstr "Мин. скорость (км/ч)"
 
-#: trans_presets.java:321 trans_presets.java:359
+#. item "Streets/Road Restrictions" text "Min. speed (km/h)"
+#. item "Streets/Bridge" text "Max. speed (km/h)"
+#: build/trans_presets.java:321 build/trans_presets.java:359
 msgid "Max. weight (tonnes)"
 msgstr "Макс. масса (т)"
 
-#: trans_presets.java:322
+#. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
+#: build/trans_presets.java:322
 msgid "Max. Height (meters)"
 msgstr ""
 
-#: trans_presets.java:323
+#. item "Streets/Road Restrictions" text "Max. Height (meters)"
+#: build/trans_presets.java:323
 msgid "Max. Width (meters)"
 msgstr ""
 
-#: trans_presets.java:324
+#. item "Streets/Road Restrictions" text "Max. Width (meters)"
+#: build/trans_presets.java:324
 msgid "Max. Length (meters)"
 msgstr ""
 
-#: trans_presets.java:326
+#. item "Streets/Road Restrictions" text "Max. Length (meters)"
+#: build/trans_presets.java:326
 msgid "Roundabout"
 msgstr "Круг"
 
-#: trans_presets.java:331
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:junction=roundabout"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:junction=roundabout"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
+#. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
+#: build/trans_presets.java:331
 msgid "Edit a Junction"
 msgstr "Править перекрёсток"
 
-#: trans_presets.java:334 trans_presets.java:631 trans_presets.java:769
-#: trans_presets.java:1118 trans_presets.java:1367 trans_presets.java:2227
-#: trans_presets.java:2703 trans_presets.java:2713 trans_presets.java:2722
+#. item "Streets/Roundabout" label "Edit a Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit a crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Wetland" text "Name"
+#. item "Car/Parking" text "Capacity"
+#. item "Man Made/Power Generator" label "Edit Power Generator"
+#. <key key="power" value="generator" />
+#. item "Land use/Tree" text "Name"
+#. item "Land use/Wood" text "Name"
+#. item "Land use/Forest" text "Name"
+#: build/trans_presets.java:334 build/trans_presets.java:631
+#: build/trans_presets.java:769 build/trans_presets.java:1115
+#: build/trans_presets.java:1364 build/trans_presets.java:2257
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2752
 msgid "Type"
 msgstr "Тип"
 
-#: trans_presets.java:334
+#. item "Streets/Roundabout" combo "Type"
+#. color horse
+#. <icon src="vehicle/restriction/horse-designated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcycle" b="no"/>
+#. <icon src="vehicle/restriction/motorbike.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcar" b="no"/>
+#. <icon src="vehicle/restriction/motorcar.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="psv" b="no"/>
+#. <icon src="vehicle/restriction/psv.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorboat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="noexit" b="yes"/>
+#. <icon src="vehicle/restriction/dead_end.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxweight"/>
+#. <icon src="vehicle/restriction/maxweight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxheight"/>
+#. <icon src="vehicle/restriction/maxheight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxwidth"/>
+#. <icon src="vehicle/restriction/maxwidth.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxlength"/>
+#. <icon src="vehicle/restriction/maxlength.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxspeed"/>
+#. <icon src="vehicle/restriction/speed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="minspeed"/>
+#. <icon src="vehicle/restriction/minspeed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxstay"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="toll"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="barrier" v="bollard"/>
+#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="gate"/>
+#. <icon annotate="true" src="vehicle/gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="speed_bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hedge"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="stile"/>
+#. <icon annotate="true" src="vehicle/stile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="fence"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="wood_fence"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="wire_fence"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cycle_barrier"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- highway tags -->
+#.
+#. <rule>
+#. <condition k="highway" v="motorway"/>
+#. color motorway
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="motorway_link"/>
+#: build/trans_presets.java:334 build/trans_style.java:417
+#: build/trans_style.java:425
+msgid "motorway"
+msgstr "Автобан"
+
+#: build/trans_presets.java:334
 msgid "motorway_link"
 msgstr "Съезд с автомагистрали"
 
-#: trans_presets.java:334
+#. color motorway
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="trunk"/>
+#. color trunk
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="trunk_link"/>
+#: build/trans_presets.java:334 build/trans_style.java:433
+#: build/trans_style.java:441
+msgid "trunk"
+msgstr "Автострада"
+
+#: build/trans_presets.java:334
 msgid "trunk_link"
 msgstr "Съезд с автострады"
 
-#: trans_presets.java:334
+#. color trunk
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="primary"/>
+#. color primary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="primary_link"/>
+#: build/trans_presets.java:334 build/trans_style.java:449
+#: build/trans_style.java:457
+msgid "primary"
+msgstr "Основная"
+
+#: build/trans_presets.java:334
 msgid "primary_link"
 msgstr "Съезд с основной"
 
-#: trans_presets.java:334
+#. color primary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="secondary"/>
+#. color secondary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>300000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="secondary_link"/>
+#: build/trans_presets.java:334 build/trans_style.java:465
+#: build/trans_style.java:473
+msgid "secondary"
+msgstr "Вторичная"
+
+#. color secondary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>300000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="tertiary"/>
+#: build/trans_presets.java:334 build/trans_style.java:481
+msgid "tertiary"
+msgstr "Третичная"
+
+#: build/trans_presets.java:334
 msgid "unclassified"
 msgstr ""
 
-#: trans_presets.java:334
+#. color green
+#. <icon src="misc/landmark/plant.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="residential"/>
+#: build/trans_presets.java:334 build/trans_style.java:2837
+msgid "residential"
+msgstr "местного значения"
+
+#: build/trans_presets.java:334
 msgid "living_street"
 msgstr "Жилая"
 
-#: trans_presets.java:334
+#. color street
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="service"/>
+#: build/trans_presets.java:334 build/trans_style.java:537
+msgid "service"
+msgstr "Служебная"
+
+#: build/trans_presets.java:334
 msgid "bus_guideway"
 msgstr ""
 
-#: trans_presets.java:352
+#. color turningcircle
+#. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="construction"/>
+#. color railland
+#. <icon src="transport/railway.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="construction"/>
+#. color construction
+#: build/trans_presets.java:334 build/trans_style.java:722
+#: build/trans_style.java:2902 build/trans_style.java:2903
+msgid "construction"
+msgstr "Строительство"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:bridge"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:bridge"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
+#. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
+#: build/trans_presets.java:352
 msgid "Edit a Bridge"
 msgstr "Править мост"
 
-#: trans_presets.java:364
+#. item
+#: build/trans_presets.java:364
 msgid "Edit a Tunnel"
 msgstr ""
 
-#: trans_presets.java:378
+#. item "Streets/Tunnel" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:378
 msgid "Ways"
 msgstr "Дороги"
 
-#: trans_presets.java:379
+#. group "Ways"
+#: build/trans_presets.java:379
 msgid "Construction"
 msgstr "Строительство"
 
-#: trans_presets.java:380
+#. item
+#: build/trans_presets.java:380
 msgid "Edit a highway under construction"
 msgstr "Править дорогу, на которой ведётся строительство"
 
-#: trans_presets.java:396
+#: build/trans_presets.java:396
 msgid "Junction"
 msgstr "Перекрёсток"
 
-#: trans_presets.java:402
+#. item "Ways/Construction" combo "Junction"
+#. color construction
+#. <icon src="misc/construction.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:396 build/trans_style.java:732
+msgid "roundabout"
+msgstr "Круг"
+
+#. item "Ways/Construction" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:402
 msgid "Bridleway"
 msgstr ""
 
-#: trans_presets.java:404
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
+#: build/trans_presets.java:404
 msgid "Edit a Bridleway"
 msgstr ""
 
-#: trans_presets.java:420
+#. item "Ways/Bridleway" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:420
 msgid "Cycleway"
 msgstr "Велодорожка"
 
-#: trans_presets.java:424
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
+#: build/trans_presets.java:424
 msgid "Edit a Cycleway"
 msgstr "Править велодорожку"
 
-#: trans_presets.java:440
+#. item "Ways/Cycleway" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:440
 msgid "Footway"
 msgstr "Тротуар"
 
-#: trans_presets.java:443
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
+#: build/trans_presets.java:443
 msgid "Edit a Footway"
 msgstr "Править тротуар"
 
-#: trans_presets.java:459
+#. item "Ways/Footway" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:459
 msgid "Pedestrian"
 msgstr "Пешеходная"
 
-#: trans_presets.java:462
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
+#: build/trans_presets.java:462
 msgid "Edit a Pedestrian Street"
 msgstr "Править пешеходную улицу"
 
-#: trans_presets.java:477
+#. item "Ways/Pedestrian" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:477
 msgid "Steps"
 msgstr "Лестница"
 
-#: trans_presets.java:481
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=steps"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
+#: build/trans_presets.java:481
 msgid "Edit a flight of Steps"
 msgstr "Править лестницу"
 
-#: trans_presets.java:498
+#. item "Ways/Steps" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:498
 msgid "Track"
 msgstr "Грунтовка"
 
-#: trans_presets.java:501
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
+#: build/trans_presets.java:501
 msgid "Edit a Track"
 msgstr "Править грунтовку"
 
-#: trans_presets.java:510 trans_presets.java:531 trans_presets.java:552
-#: trans_presets.java:573 trans_presets.java:594 trans_presets.java:615
+#: build/trans_presets.java:510 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
 msgid "gravel"
 msgstr "гравий"
 
-#: trans_presets.java:510 trans_presets.java:531 trans_presets.java:552
-#: trans_presets.java:573 trans_presets.java:594 trans_presets.java:615
+#: build/trans_presets.java:510 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
 msgid "ground"
 msgstr "грунт"
 
-#: trans_presets.java:510 trans_presets.java:531 trans_presets.java:552
-#: trans_presets.java:573 trans_presets.java:594 trans_presets.java:615
+#: build/trans_presets.java:510 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
 msgid "grass"
 msgstr "трава"
 
-#: trans_presets.java:510 trans_presets.java:531 trans_presets.java:552
-#: trans_presets.java:573 trans_presets.java:594 trans_presets.java:615
+#: build/trans_presets.java:510 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
 msgid "sand"
 msgstr "песок"
 
-#: trans_presets.java:518
+#. item "Ways/Track" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:518
 msgid "Track Grade 1"
 msgstr "Грунтовка 1 класса"
 
-#: trans_presets.java:521
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
+#: build/trans_presets.java:521
 msgid "Edit a Track of grade 1"
 msgstr "Править грунтовку 1 класса"
 
-#: trans_presets.java:539
+#. item "Ways/Track Grade 1" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:539
 msgid "Track Grade 2"
 msgstr "Грунтовка 2 класса"
 
-#: trans_presets.java:542
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
+#: build/trans_presets.java:542
 msgid "Edit a Track of grade 2"
 msgstr "Править грунтовку 2 класса"
 
-#: trans_presets.java:560
+#. item "Ways/Track Grade 2" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:560
 msgid "Track Grade 3"
 msgstr "Грунтовка 3 класса"
 
-#: trans_presets.java:563
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
+#: build/trans_presets.java:563
 msgid "Edit a Track of grade 3"
 msgstr "Править грунтовку 3 класса"
 
-#: trans_presets.java:581
+#. item "Ways/Track Grade 3" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:581
 msgid "Track Grade 4"
 msgstr "Грунтовка 4 класса"
 
-#: trans_presets.java:584
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
+#: build/trans_presets.java:584
 msgid "Edit a Track of grade 4"
 msgstr "Править грунтовку 4 класса"
 
-#: trans_presets.java:602
+#. item "Ways/Track Grade 4" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:602
 msgid "Track Grade 5"
 msgstr "Грунтовка 5 класса"
 
-#: trans_presets.java:605
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
+#: build/trans_presets.java:605
 msgid "Edit a Track of grade 5"
 msgstr "Править грунтовку 5 класса"
 
-#: trans_presets.java:624
+#. item "Ways/Track Grade 5" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:624
 msgid "Path"
 msgstr "Тропа"
 
-#: trans_presets.java:627
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
+#: build/trans_presets.java:627
 msgid "Edit Path"
 msgstr "Править тропу"
 
-#: trans_presets.java:633
+#: build/trans_presets.java:633
 msgid "Snowmobile"
 msgstr "Снегоход"
 
-#: trans_presets.java:636
+#: build/trans_presets.java:636
 msgid "Ski"
 msgstr "Лыжи"
 
-#: trans_presets.java:651
+#. item "Ways/Path" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:651
 msgid "Hiking"
 msgstr "Туризм"
 
-#: trans_presets.java:655
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
+#: build/trans_presets.java:655
 msgid "Edit Hiking"
 msgstr "Править туризм"
 
-#: trans_presets.java:664
+#. item "Ways/Hiking" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:664
 msgid "Mountain Hiking"
 msgstr "Горный туризм"
 
-#: trans_presets.java:668
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
+#: build/trans_presets.java:668
 msgid "Edit Mountain Hiking"
 msgstr "Править горный туризм"
 
-#: trans_presets.java:677
+#. item "Ways/Mountain Hiking" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:677
 msgid "Demanding Mountain Hiking"
 msgstr "Продвинутый горный туризм"
 
-#: trans_presets.java:681
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
+#: build/trans_presets.java:681
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Править продвинутый горный туризм"
 
-#: trans_presets.java:690
+#. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:690
 msgid "Alpine Hiking"
 msgstr "Альпийский туризм"
 
-#: trans_presets.java:694
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
+#: build/trans_presets.java:694
 msgid "Edit Alpine Hiking"
 msgstr "Править альпийский туризм"
 
-#: trans_presets.java:703
+#. item "Ways/Alpine Hiking" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:703
 msgid "Demanding alpine hiking"
 msgstr "Продвинутый альпийский туризм"
 
-#: trans_presets.java:707
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
+#: build/trans_presets.java:707
 msgid "Edit Demanding alpine hiking"
 msgstr "Править продвинутый альпийский туризм"
 
-#: trans_presets.java:716
+#. item "Ways/Demanding alpine hiking" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:716
 msgid "Difficult alpine hiking"
 msgstr "Сложный альпийский туризм"
 
-#: trans_presets.java:720
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
+#: build/trans_presets.java:720
 msgid "Edit Difficult alpine hiking"
 msgstr "Править сложный альпийский туризм"
 
-#: trans_presets.java:730
+#. item "Ways/Difficult alpine hiking" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:730
 msgid "Waypoints"
 msgstr "Путевые точки"
 
-#: trans_presets.java:731
+#. group "Waypoints"
+#: build/trans_presets.java:731
 msgid "Motorway Junction"
 msgstr "Развязка Автобана"
 
-#: trans_presets.java:733
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
+#: build/trans_presets.java:733
 msgid "Edit Motorway Junction"
 msgstr "Править развязку автобана"
 
-#: trans_presets.java:737
+#. item "Waypoints/Motorway Junction" text "Name"
+#: build/trans_presets.java:737
 msgid "Number"
 msgstr "Номер"
 
-#: trans_presets.java:739
+#. item "Waypoints/Motorway Junction" text "Number"
+#: build/trans_presets.java:739
 msgid "Services"
 msgstr "Службы"
 
-#: trans_presets.java:741
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
+#: build/trans_presets.java:741
 msgid "Edit Service Station"
 msgstr "Править службы"
 
-#: trans_presets.java:746 trans_presets.java:999 trans_presets.java:1358
-#: trans_presets.java:1375 trans_presets.java:1382 trans_presets.java:1388
-#: trans_presets.java:1396 trans_presets.java:1403 trans_presets.java:2235
-#: trans_presets.java:2242 trans_presets.java:2258 trans_presets.java:2269
-#: trans_presets.java:2277 trans_presets.java:2284 trans_presets.java:2334
-#: trans_presets.java:2361 trans_presets.java:2510 trans_presets.java:2950
+#. item "Waypoints/Services" text "Name"
+#. item "Barriers/Toll Booth" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Name"
+#. item "Car/Shop" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Man Made/Power Station" label "Edit power station"
+#. <key key="power" value="station" />
+#. item "Man Made/Power Sub Station" label "Edit power sub station"
+#. <key key="power" value="sub_station" />
+#. item "Man Made/Power Line" label "Edit power line"
+#. <key key="power" value="line" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=toilets"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=toilets" />
+#. <key key="amenity" value="toilets" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_box" />
+#. <key key="amenity" value="post_box" />
+#. item "Amenities/Telephone" label "Edit a Telephone"
+#. <key key="amenity" value="telephone" />
+#. item "Amenities/Baby Hatch" label "Edit a Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
+#. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
+#. <key key="amenity" value="atm" />
+#. item "Relations/Route" text "Network"
+#: build/trans_presets.java:746 build/trans_presets.java:996
+#: build/trans_presets.java:1355 build/trans_presets.java:1372
+#: build/trans_presets.java:1379 build/trans_presets.java:1385
+#: build/trans_presets.java:1393 build/trans_presets.java:1400
+#: build/trans_presets.java:2265 build/trans_presets.java:2272
+#: build/trans_presets.java:2288 build/trans_presets.java:2299
+#: build/trans_presets.java:2307 build/trans_presets.java:2314
+#: build/trans_presets.java:2364 build/trans_presets.java:2391
+#: build/trans_presets.java:2540 build/trans_presets.java:2980
 msgid "Operator"
 msgstr "Оператор"
 
-#: trans_presets.java:750
+#. item "Waypoints/Services" text "Operator"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:750
 msgid "Traffic Signal"
 msgstr "Светофор"
 
-#: trans_presets.java:754
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=traffic_signals" />
+#. <key key="highway" value="traffic_signals" />
+#. <optional>
+#: build/trans_presets.java:754
 msgid "Pedestrian crossing type"
 msgstr "Тип пешеходного перехода"
 
-#: trans_presets.java:754 trans_presets.java:769 trans_presets.java:1313
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type"
+#. item "Waypoints/Pedestrian Crossing" combo "Type"
+#. item "Railway/Crossing" combo "Crossing type"
+#: build/trans_presets.java:754 build/trans_presets.java:769
+#: build/trans_presets.java:1310
 msgid "uncontrolled"
 msgstr ""
 
-#: trans_presets.java:754 trans_presets.java:769 trans_presets.java:1313
+#: build/trans_presets.java:754 build/trans_presets.java:769
+#: build/trans_presets.java:1310
 msgid "traffic_signals"
 msgstr ""
 
-#: trans_presets.java:754 trans_presets.java:769 trans_presets.java:1313
+#: build/trans_presets.java:754 build/trans_presets.java:769
+#: build/trans_presets.java:1310
 msgid "island"
 msgstr ""
 
-#: trans_presets.java:754 trans_presets.java:769 trans_presets.java:1313
+#: build/trans_presets.java:754 build/trans_presets.java:769
+#: build/trans_presets.java:1310
 msgid "unmarked"
 msgstr ""
 
-#: trans_presets.java:755 trans_presets.java:771 trans_presets.java:1314
+#. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
+#: build/trans_presets.java:755 build/trans_presets.java:771
+#: build/trans_presets.java:1311
 msgid "Cross on horseback"
 msgstr ""
 
-#: trans_presets.java:756 trans_presets.java:770 trans_presets.java:1315
+#. item "Waypoints/Traffic Signal" check "Cross on horseback"
+#. item "Railway/Crossing" check "Cross on horseback"
+#: build/trans_presets.java:756 build/trans_presets.java:770
+#: build/trans_presets.java:1312
 msgid "Cross by bicycle"
 msgstr ""
 
-#: trans_presets.java:757 trans_presets.java:772 trans_presets.java:1316
+#. item "Waypoints/Traffic Signal" check "Cross by bicycle"
+#. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
+#. item "Railway/Crossing" check "Cross by bicycle"
+#: build/trans_presets.java:757 build/trans_presets.java:772
+#: build/trans_presets.java:1313
 msgid "Crossing attendant"
 msgstr ""
 
-#: trans_presets.java:758
+#. item "Waypoints/Traffic Signal" check "Crossing attendant"
+#: build/trans_presets.java:758
 msgid "Crossing type name (UK)"
 msgstr ""
 
-#: trans_presets.java:758 trans_presets.java:773
+#. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
+#. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
+#: build/trans_presets.java:758 build/trans_presets.java:773
 msgid "zebra"
 msgstr ""
 
-#: trans_presets.java:758 trans_presets.java:773
+#: build/trans_presets.java:758 build/trans_presets.java:773
 msgid "pelican"
 msgstr ""
 
-#: trans_presets.java:758 trans_presets.java:773
+#: build/trans_presets.java:758 build/trans_presets.java:773
 msgid "toucan"
 msgstr ""
 
-#: trans_presets.java:758 trans_presets.java:773
+#: build/trans_presets.java:758 build/trans_presets.java:773
 msgid "puffin"
 msgstr ""
 
-#: trans_presets.java:758 trans_presets.java:773
+#: build/trans_presets.java:758 build/trans_presets.java:773
 msgid "pegasus"
 msgstr ""
 
-#: trans_presets.java:758 trans_presets.java:773
+#: build/trans_presets.java:758 build/trans_presets.java:773
 msgid "tiger"
 msgstr ""
 
-#: trans_presets.java:761
+#. </optional>
+#: build/trans_presets.java:761
 msgid "Stop"
 msgstr "Стоп"
 
-#: trans_presets.java:764
+#. item
+#. <key key="highway" value="stop" />
+#: build/trans_presets.java:764
 msgid "Pedestrian Crossing"
 msgstr "Пешеходный переход"
 
-#: trans_presets.java:767
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:767
 msgid "Edit a crossing"
 msgstr ""
 
-#: trans_presets.java:773
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:773
 msgid "Type name (UK)"
 msgstr ""
 
-#: trans_presets.java:775
+#: build/trans_presets.java:775
 msgid "Mini-roundabout"
 msgstr ""
 
-#: trans_presets.java:780
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=mini_roundabout"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=mini_roundabout"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
+#. <key key="highway" value="mini_roundabout" />
+#: build/trans_presets.java:780
 msgid "Direction"
 msgstr ""
 
-#: trans_presets.java:780
+#. item "Waypoints/Mini-roundabout" combo "Direction"
+#: build/trans_presets.java:780
 msgid "clockwise"
 msgstr ""
 
-#: trans_presets.java:782
+#: build/trans_presets.java:782
 msgid "Turning Circle"
 msgstr ""
 
-#: trans_presets.java:787
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=turning_circle"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
+#. <key key="highway" value="turning_circle" />
+#: build/trans_presets.java:787
 msgid "City Limit"
 msgstr "Граница населённого пункта"
 
-#: trans_presets.java:788
+#. item
+#: build/trans_presets.java:788
 msgid "Edit a city limit sign"
 msgstr "Править границу населённого пункта"
 
-#: trans_presets.java:793
+#. item "Waypoints/City Limit" text "Name"
+#: build/trans_presets.java:793
 msgid "Second Name"
 msgstr "Второе название"
 
-#: trans_presets.java:795
-msgid "Signpost"
-msgstr "Столб с указателями"
-
-#: trans_presets.java:798
+#. item "Waypoints/City Limit" text "Second Name"
+#: build/trans_presets.java:795
 msgid "Speed Camera"
 msgstr "Автоматический радар"
 
-#: trans_presets.java:801
+#. item
+#. <key key="highway" value="speed_camera" />
+#: build/trans_presets.java:798
 msgid "Emergency Phone"
 msgstr "Телефон первой необходимости"
 
-#: trans_presets.java:805
+#. item
+#. <key key="amenity" value="emergency_phone" />
+#. <separator/>
+#: build/trans_presets.java:802
 msgid "Ford"
 msgstr "Брод"
 
-#: trans_presets.java:806
+#. item
+#: build/trans_presets.java:803
 msgid "Edit Ford"
 msgstr "Править брод"
 
-#: trans_presets.java:813
+#. item "Waypoints/Ford" text "Name"
+#. </optional>
+#: build/trans_presets.java:810
 msgid "Mountain Pass"
 msgstr "Перевал"
 
-#: trans_presets.java:815
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
+#: build/trans_presets.java:812
 msgid "Edit Mountain Pass"
 msgstr "Править перевал"
 
-#: trans_presets.java:820 trans_presets.java:1568 trans_presets.java:2647
-#: trans_presets.java:2654 trans_presets.java:2661
+#. item "Waypoints/Mountain Pass" text "Name"
+#. item "Accomodation/Alpine Hut" text "Name"
+#. item "Places/Peak" text "Name"
+#. item "Places/Glacier" text "Name"
+#. item "Places/Volcano" text "Name"
+#: build/trans_presets.java:817 build/trans_presets.java:1565
+#: build/trans_presets.java:2677 build/trans_presets.java:2684
+#: build/trans_presets.java:2691
 msgid "Elevation"
 msgstr "Возвышение"
 
-#: trans_presets.java:824
+#. item "Waypoints/Mountain Pass" text "Elevation"
+#. </optional>
+#: build/trans_presets.java:821
 msgid "Barriers"
 msgstr "Преграды"
 
-#: trans_presets.java:825
+#. group "Barriers"
+#: build/trans_presets.java:822
 msgid "Stile"
 msgstr ""
 
-#: trans_presets.java:827
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#: build/trans_presets.java:824
 msgid "Edit a Stile"
 msgstr ""
 
-#: trans_presets.java:830 trans_presets.java:839 trans_presets.java:848
-#: trans_presets.java:861 trans_presets.java:872 trans_presets.java:888
-#: trans_presets.java:899 trans_presets.java:911 trans_presets.java:922
-#: trans_presets.java:934 trans_presets.java:946 trans_presets.java:958
-#: trans_presets.java:1006 trans_presets.java:1019
+#. item "Barriers/Stile" label "Edit a Stile"
+#. <space />
+#. <key key="barrier" value="stile" />
+#. item "Barriers/Kissing Gate" label "Edit a Kissing Gate"
+#. <space />
+#. <key key="barrier" value="kissing_gate" />
+#. item "Barriers/Hampshire Gate" label "Edit a Hampshire Gate"
+#. <space />
+#. <key key="barrier" value="hampshire_gate" />
+#. item "Barriers/Bollard" label "Edit a bollard"
+#. <space />
+#. <key key="barrier" value="bollard" />
+#. item "Barriers/Drawbridge" label "Edit a Drawbridge"
+#. <space />
+#. <key key="barrier" value="drawbridge" />
+#. item "Barriers/Cattle Grid" label "Edit a Cattle Grid"
+#. <space />
+#. <key key="barrier" value="cattle_grid" />
+#. item "Barriers/Spikes" label "Edit Spikes"
+#. <space />
+#. <key key="barrier" value="spikes" />
+#. item "Barriers/Portcullis" label "Edit a Portcullis"
+#. <space />
+#. <key key="barrier" value="portcullis" />
+#. item "Barriers/Gate" label "Edit a Gate"
+#. <space />
+#. <key key="barrier" value="gate" />
+#. item "Barriers/Lift Gate" label "Edit a Lift Gate"
+#. <space />
+#. <key key="barrier" value="lift_gate" />
+#. item "Barriers/Sally Port" label "Edit a Sally Port"
+#. <space />
+#. <key key="barrier" value="sally_port" />
+#. item "Barriers/Bump Gate" label "Edit a Bump Gate"
+#. <space />
+#. <key key="barrier" value="bump_gate" />
+#. item "Barriers/Border Control" label "Edit a Border Control"
+#. <space />
+#. <key key="barrier" value="border_control" />
+#. item "Barriers/Entrance" label "Edit a Entrance"
+#. <space />
+#. <key key="barrier" value="entrance" />
+#: build/trans_presets.java:827 build/trans_presets.java:836
+#: build/trans_presets.java:845 build/trans_presets.java:858
+#: build/trans_presets.java:869 build/trans_presets.java:885
+#: build/trans_presets.java:896 build/trans_presets.java:908
+#: build/trans_presets.java:919 build/trans_presets.java:931
+#: build/trans_presets.java:943 build/trans_presets.java:955
+#: build/trans_presets.java:1003 build/trans_presets.java:1016
 msgid "Allowed traffic:"
 msgstr "Разрешено движение:"
 
-#: trans_presets.java:835
+#. item "Barriers/Stile" check "Bicycle"
+#: build/trans_presets.java:832
 msgid "Kissing Gate"
 msgstr ""
 
-#: trans_presets.java:836
+#. item
+#: build/trans_presets.java:833
 msgid "Edit a Kissing Gate"
 msgstr ""
 
-#: trans_presets.java:844
+#. item "Barriers/Kissing Gate" check "Bicycle"
+#: build/trans_presets.java:841
 msgid "Hampshire Gate"
 msgstr ""
 
-#: trans_presets.java:845
+#. item
+#: build/trans_presets.java:842
 msgid "Edit a Hampshire Gate"
 msgstr ""
 
-#: trans_presets.java:856
+#. item "Barriers/Hampshire Gate" check "Motorcar"
+#: build/trans_presets.java:853
 msgid "Bollard"
 msgstr "Столбик"
 
-#: trans_presets.java:858
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#: build/trans_presets.java:855
 msgid "Edit a bollard"
 msgstr "Править столбик"
 
-#: trans_presets.java:868
+#. item "Barriers/Bollard" check "Motorcycle"
+#: build/trans_presets.java:865
 msgid "Drawbridge"
 msgstr "Подъёмный мост"
 
-#: trans_presets.java:869
+#. item
+#: build/trans_presets.java:866
 msgid "Edit a Drawbridge"
 msgstr "Править подъёмный мост"
 
-#: trans_presets.java:880
+#. item "Barriers/Drawbridge" check "Motorcar"
+#: build/trans_presets.java:877
 msgid "Bus Trap"
 msgstr ""
 
-#: trans_presets.java:883
+#. item
+#. <key key="barrier" value="bus_trap" />
+#: build/trans_presets.java:880
 msgid "Cattle Grid"
 msgstr ""
 
-#: trans_presets.java:885
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
+#: build/trans_presets.java:882
 msgid "Edit a Cattle Grid"
 msgstr ""
 
-#: trans_presets.java:895
+#. item "Barriers/Cattle Grid" check "Motorcar"
+#: build/trans_presets.java:892
 msgid "Spikes"
 msgstr "Шипы"
 
-#: trans_presets.java:896
+#. item
+#: build/trans_presets.java:893
 msgid "Edit Spikes"
 msgstr ""
 
-#: trans_presets.java:907
+#. item "Barriers/Spikes" check "Motorcar"
+#: build/trans_presets.java:904
 msgid "Portcullis"
 msgstr "Опускающаяся решётка"
 
-#: trans_presets.java:908
+#. item
+#: build/trans_presets.java:905
 msgid "Edit a Portcullis"
 msgstr "Править опускающуюся решётку"
 
-#: trans_presets.java:917
+#. item "Barriers/Portcullis" check "Motorcar"
+#: build/trans_presets.java:914
 msgid "Gate"
 msgstr "Ворота"
 
-#: trans_presets.java:919
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
+#: build/trans_presets.java:916
 msgid "Edit a Gate"
 msgstr "Править ворота"
 
-#: trans_presets.java:930
+#. item "Barriers/Gate" check "Motorcar"
+#: build/trans_presets.java:927
 msgid "Lift Gate"
 msgstr "Шлагбаум"
 
-#: trans_presets.java:931
+#. item
+#: build/trans_presets.java:928
 msgid "Edit a Lift Gate"
 msgstr "Править шлагбаум"
 
-#: trans_presets.java:942
+#. item "Barriers/Lift Gate" check "Motorcar"
+#: build/trans_presets.java:939
 msgid "Sally Port"
 msgstr "Двойные ворота"
 
-#: trans_presets.java:943
+#. item
+#: build/trans_presets.java:940
 msgid "Edit a Sally Port"
 msgstr "Править двойные ворота"
 
-#: trans_presets.java:954
+#. item "Barriers/Sally Port" check "Motorcar"
+#: build/trans_presets.java:951
 msgid "Bump Gate"
 msgstr ""
 
-#: trans_presets.java:955
+#. item
+#: build/trans_presets.java:952
 msgid "Edit a Bump Gate"
 msgstr ""
 
-#: trans_presets.java:966
+#. item "Barriers/Bump Gate" check "Motorcar"
+#: build/trans_presets.java:963
 msgid "Cycle Barrier"
 msgstr ""
 
-#: trans_presets.java:970
+#. item
+#. unparsed line             <link href:de="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <key key="barrier" value="cycle_barrier" />
+#: build/trans_presets.java:967
 msgid "Hedge"
 msgstr "Живая изгородь"
 
-#: trans_presets.java:974
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
+#. <key key="barrier" value="hedge" />
+#: build/trans_presets.java:971
 msgid "Fence"
 msgstr "Забор"
 
-#: trans_presets.java:978
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#. <key key="barrier" value="fence" />
+#: build/trans_presets.java:975
 msgid "Block"
 msgstr "Бетонный блок"
 
-#: trans_presets.java:981
+#. item
+#. <key key="barrier" value="block" />
+#: build/trans_presets.java:978
 msgid "Wall"
 msgstr "Стена"
 
-#: trans_presets.java:984
+#. item
+#. <key key="barrier" value="wall" />
+#: build/trans_presets.java:981
 msgid "City Wall"
 msgstr "Городская стена"
 
-#: trans_presets.java:988
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
+#. <key key="barrier" value="city_wall" />
+#: build/trans_presets.java:985
 msgid "Retaining Wall"
 msgstr "Подпорная стена"
 
-#: trans_presets.java:992
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
+#. <key key="barrier" value="retaining_wall" />
+#: build/trans_presets.java:989
 msgid "Toll Booth"
 msgstr "Оплата проезда"
 
-#: trans_presets.java:994
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
+#: build/trans_presets.java:991
 msgid "Edit Toll Booth"
 msgstr "Править пункт оплаты проезда"
 
-#: trans_presets.java:1002
+#. item "Barriers/Toll Booth" text "Operator"
+#. </optional>
+#: build/trans_presets.java:999
 msgid "Border Control"
 msgstr "Пограничный контороль"
 
-#: trans_presets.java:1003
+#. item
+#: build/trans_presets.java:1000
 msgid "Edit a Border Control"
 msgstr "Править пограничный контороль"
 
-#: trans_presets.java:1015
+#. item "Barriers/Border Control" check "Motorcar"
+#. <separator/>
+#: build/trans_presets.java:1012
 msgid "Entrance"
 msgstr "Вход"
 
-#: trans_presets.java:1016
+#. item
+#: build/trans_presets.java:1013
 msgid "Edit a Entrance"
 msgstr "Править вход"
 
-#: trans_presets.java:1029 trans_presets.java:1072
+#. item "Barriers/Entrance" check "Motorcar"
+#. <separator/>
+#. item "Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1026 build/trans_presets.java:1069
 msgid "Water"
 msgstr "Вода"
 
-#: trans_presets.java:1030
+#. group "Water"
+#: build/trans_presets.java:1027
 msgid "Spring"
 msgstr "Источник"
 
-#: trans_presets.java:1032
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1029
 msgid "Edit a Spring"
 msgstr "Править источник"
 
-#: trans_presets.java:1037
+#. item "Water/Spring" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1034
 msgid "Drain"
 msgstr "Водосток"
 
-#: trans_presets.java:1039
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
+#: build/trans_presets.java:1036
 msgid "Edit a Drain"
 msgstr "Править водосток"
 
-#: trans_presets.java:1045
+#. item "Water/Drain" combo "Layer"
+#: build/trans_presets.java:1042
 msgid "Stream"
 msgstr "Ручей"
 
-#: trans_presets.java:1047
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
+#: build/trans_presets.java:1044
 msgid "Edit a Stream"
 msgstr "Править ручей"
 
-#: trans_presets.java:1053
+#. item "Water/Stream" combo "Layer"
+#: build/trans_presets.java:1050
 msgid "Canal"
 msgstr "Канал"
 
-#: trans_presets.java:1055
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
+#: build/trans_presets.java:1052
 msgid "Edit a Canal"
 msgstr "Править канал"
 
-#: trans_presets.java:1061
+#. item "Water/Canal" combo "Layer"
+#: build/trans_presets.java:1058
 msgid "River"
 msgstr "Река"
 
-#: trans_presets.java:1065
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=river"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
+#: build/trans_presets.java:1062
 msgid "Edit a River"
 msgstr "Править реку"
 
-#: trans_presets.java:1074
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
+#: build/trans_presets.java:1071
 msgid "Edit Water"
 msgstr "Править воду"
 
-#: trans_presets.java:1078
+#. item "Water/Water" text "Name"
+#: build/trans_presets.java:1075
 msgid "Land"
 msgstr "Суша"
 
-#: trans_presets.java:1079
+#. item
+#: build/trans_presets.java:1076
 msgid "Edit Land"
 msgstr "Править сушу"
 
-#: trans_presets.java:1084
+#. item "Water/Land" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1081
 msgid "Basin"
 msgstr "Бассейн"
 
-#: trans_presets.java:1085
+#. item
+#: build/trans_presets.java:1082
 msgid "Edit Basin Landuse"
 msgstr "Править резервуар"
 
-#: trans_presets.java:1090
+#. item "Water/Basin" text "Name"
+#: build/trans_presets.java:1087
 msgid "Reservoir"
 msgstr "Резервуар"
 
-#: trans_presets.java:1092
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1089
 msgid "Edit Reservoir Landuse"
 msgstr "Править резервуар"
 
-#: trans_presets.java:1097
+#. item "Water/Reservoir" text "Name"
+#: build/trans_presets.java:1094
 msgid "Covered Reservoir"
 msgstr "Крытый резервуар"
 
-#: trans_presets.java:1098
+#. item
+#: build/trans_presets.java:1095
 msgid "Edit Covered Reservoir"
 msgstr "Править крытый резервуар"
 
-#: trans_presets.java:1103
+#. item "Water/Covered Reservoir" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1100
 msgid "Riverbank"
 msgstr "Берег реки"
 
-#: trans_presets.java:1106
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
+#: build/trans_presets.java:1103
 msgid "Edit a riverbank"
 msgstr "Править берег реки"
 
-#: trans_presets.java:1110
+#. item "Water/Riverbank" text "Name"
+#: build/trans_presets.java:1107
 msgid "Wetland"
 msgstr "Заболоченная территория"
 
-#: trans_presets.java:1115
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wetland"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wetland"
+#. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
+#. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
+#: build/trans_presets.java:1112
 msgid "Edit Wetland"
 msgstr "Редактировать заболоченная территория"
 
-#: trans_presets.java:1118
+#. item "Water/Wetland" combo "Type"
+#: build/trans_presets.java:1115
 msgid "swamp"
 msgstr "болото"
 
-#: trans_presets.java:1118
+#: build/trans_presets.java:1115
 msgid "bog"
 msgstr "трясина"
 
-#: trans_presets.java:1118
+#. color wood
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="marsh"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_presets.java:1115 build/trans_style.java:3068
+msgid "marsh"
+msgstr ""
+
+#: build/trans_presets.java:1115
 msgid "reedbed"
 msgstr "плавни"
 
-#: trans_presets.java:1118
+#: build/trans_presets.java:1115
 msgid "saltmarsh"
 msgstr "солевое болото"
 
-#: trans_presets.java:1118
+#: build/trans_presets.java:1115
 msgid "tidalflat"
 msgstr "ватты"
 
-#: trans_presets.java:1118
+#: build/trans_presets.java:1115
 msgid "mangrove"
 msgstr "мангры"
 
-#: trans_presets.java:1120
+#: build/trans_presets.java:1117
 msgid "Mud"
 msgstr "Грязь"
 
-#: trans_presets.java:1121
+#. item
+#: build/trans_presets.java:1118
 msgid "Edit Mud"
 msgstr "Править грязь"
 
-#: trans_presets.java:1125
+#. item "Water/Mud" text "Name"
+#: build/trans_presets.java:1122
 msgid "Beach"
 msgstr "Пляж"
 
-#: trans_presets.java:1127
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
+#: build/trans_presets.java:1124
 msgid "Edit Beach"
 msgstr "Править пляж"
 
-#: trans_presets.java:1131
+#. item "Water/Beach" text "Name"
+#: build/trans_presets.java:1128
 msgid "Bay"
 msgstr "Бухта"
 
-#: trans_presets.java:1132
+#. item
+#: build/trans_presets.java:1129
 msgid "Edit Bay"
 msgstr "Править бухту"
 
-#: trans_presets.java:1136
+#. item "Water/Bay" text "Name"
+#: build/trans_presets.java:1133
 msgid "Cliff"
 msgstr "Скала"
 
-#: trans_presets.java:1138
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
+#: build/trans_presets.java:1135
 msgid "Edit Cliff"
 msgstr "Править скалу"
 
-#: trans_presets.java:1142
+#. item "Water/Cliff" text "Name"
+#: build/trans_presets.java:1139
 msgid "Coastline"
 msgstr "Побережье"
 
-#: trans_presets.java:1144
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1141
 msgid "Edit Coastline"
 msgstr "Править побережье"
 
-#: trans_presets.java:1149
+#. item "Water/Coastline" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1146
 msgid "Ferry Route"
 msgstr "Паромная переправа"
 
-#: trans_presets.java:1151
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
+#: build/trans_presets.java:1148
 msgid "Edit a Ferry"
 msgstr "Править переправу"
 
-#: trans_presets.java:1159
+#. item "Water/Ferry Route" text "Name"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1156
 msgid "Boatyard"
 msgstr "Лодочная мастерская"
 
-#: trans_presets.java:1161
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
+#: build/trans_presets.java:1158
 msgid "Edit a Boatyard"
 msgstr "Править лодочную мастерскую"
 
-#: trans_presets.java:1166
+#. item "Water/Boatyard" text "Name"
+#: build/trans_presets.java:1163
 msgid "Dock"
 msgstr "Причал"
 
-#: trans_presets.java:1168
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1165
 msgid "Edit a Dock"
 msgstr "Править причал"
 
-#: trans_presets.java:1174
+#. item "Water/Dock" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1171
 msgid "Dam"
 msgstr "Дамба"
 
-#: trans_presets.java:1176
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1173
 msgid "Edit a Dam"
 msgstr "Править дамбу"
 
-#: trans_presets.java:1182
+#. item "Water/Dam" text "Name"
+#: build/trans_presets.java:1179
 msgid "Waterway Point"
 msgstr "Гидротехнические сооружения"
 
-#: trans_presets.java:1183
+#. group "Waterway Point"
+#: build/trans_presets.java:1180
 msgid "Lock Gate"
 msgstr "Ворота шлюза"
 
-#: trans_presets.java:1187
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
+#. <key key="waterway" value="lock_gate" />
+#: build/trans_presets.java:1184
 msgid "Weir"
 msgstr "Водослив"
 
-#: trans_presets.java:1189
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1186
 msgid "Edit a Weir"
 msgstr "Править водослив"
 
-#: trans_presets.java:1194
+#. item "Waterway Point/Weir" text "Name"
+#: build/trans_presets.java:1191
 msgid "Waterfall"
 msgstr "Водопад"
 
-#: trans_presets.java:1195
+#. item
+#: build/trans_presets.java:1192
 msgid "Edit a Waterfall"
 msgstr "Править водопад"
 
-#: trans_presets.java:1200
+#. item "Waterway Point/Waterfall" text "Name"
+#: build/trans_presets.java:1197
 msgid "Turning Point"
 msgstr "Разворот"
 
-#: trans_presets.java:1204
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
+#. <key key="waterway" value="turning_point" />
+#: build/trans_presets.java:1201
 msgid "Marina"
 msgstr "Пристань для яхт"
 
-#: trans_presets.java:1205
+#. item
+#: build/trans_presets.java:1202
 msgid "Edit Marina"
 msgstr "Править пристань для яхт"
 
-#: trans_presets.java:1209
+#. item "Waterway Point/Marina" text "Name"
+#: build/trans_presets.java:1206
 msgid "Pier"
 msgstr "Пирс"
 
-#: trans_presets.java:1211
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1208
 msgid "Edit Pier"
 msgstr "Править пирс"
 
-#: trans_presets.java:1215
+#. item "Waterway Point/Pier" text "Name"
+#: build/trans_presets.java:1212
 msgid "Ferry Terminal"
 msgstr "Паромная станция"
 
-#: trans_presets.java:1217
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1214
 msgid "Edit Ferry Terminal"
 msgstr "Править паромную станцию"
 
-#: trans_presets.java:1221
+#. item "Waterway Point/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1218
 msgid "Slipway"
 msgstr "Слип"
 
-#: trans_presets.java:1225
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
+#: build/trans_presets.java:1222
 msgid "Edit Slipway"
 msgstr "Править слип"
 
-#: trans_presets.java:1231
+#. item "Waterway Point/Slipway" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1228
 msgid "Railway"
 msgstr "Железная дорога"
 
-#: trans_presets.java:1232
+#. group "Railway"
+#: build/trans_presets.java:1229
 msgid "Rail"
 msgstr "Железная дорога"
 
-#: trans_presets.java:1234
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
+#: build/trans_presets.java:1231
 msgid "Edit a Rail"
 msgstr "Править железную дорогу"
 
-#: trans_presets.java:1237 trans_presets.java:1243 trans_presets.java:1250
-#: trans_presets.java:1256 trans_presets.java:1262 trans_presets.java:1268
-#: trans_presets.java:1274 trans_presets.java:1299
+#. item "Railway/Rail" label "Edit a Rail"
+#. <space />
+#. <key key="railway" value="rail" />
+#. item "Railway/Narrow Gauge Rail" label "Edit a Narrow Gauge Rail"
+#. <space />
+#. <key key="railway" value="narrow_gauge" />
+#. item "Railway/Monorail" label "Edit a Monorail"
+#. <space />
+#. <key key="railway" value="monorail" />
+#. item "Railway/Preserved" label "Edit a Preserved Railway"
+#. <space />
+#. <key key="railway" value="preserved" />
+#. item "Railway/Light Rail" label "Edit a Light Rail"
+#. <space />
+#. <key key="railway" value="light_rail" />
+#. item "Railway/Subway" label "Edit a Subway"
+#. <space />
+#. <key key="railway" value="subway" />
+#. item "Railway/Tram" label "Edit a Tram"
+#. <space />
+#. <key key="railway" value="tram" />
+#. item "Railway/Disused Rail" label "Edit a Disused Railway"
+#. <space />
+#. <key key="railway" value="disused" />
+#: build/trans_presets.java:1234 build/trans_presets.java:1240
+#: build/trans_presets.java:1247 build/trans_presets.java:1253
+#: build/trans_presets.java:1259 build/trans_presets.java:1265
+#: build/trans_presets.java:1271 build/trans_presets.java:1296
 msgid "Optional Types"
 msgstr "Необязательные типы"
 
-#: trans_presets.java:1237 trans_presets.java:1243 trans_presets.java:1250
-#: trans_presets.java:1256 trans_presets.java:1262 trans_presets.java:1268
-#: trans_presets.java:1274 trans_presets.java:1299
+#. item "Railway/Rail" combo "Optional Types"
+#. item "Railway/Narrow Gauge Rail" combo "Optional Types"
+#. item "Railway/Monorail" combo "Optional Types"
+#. item "Railway/Preserved" combo "Optional Types"
+#. item "Railway/Light Rail" combo "Optional Types"
+#. item "Railway/Subway" combo "Optional Types"
+#. item "Railway/Tram" combo "Optional Types"
+#. item "Railway/Disused Rail" combo "Optional Types"
+#: build/trans_presets.java:1234 build/trans_presets.java:1240
+#: build/trans_presets.java:1247 build/trans_presets.java:1253
+#: build/trans_presets.java:1259 build/trans_presets.java:1265
+#: build/trans_presets.java:1271 build/trans_presets.java:1296
 msgid "yard"
 msgstr ""
 
-#: trans_presets.java:1237 trans_presets.java:1243 trans_presets.java:1250
-#: trans_presets.java:1256 trans_presets.java:1262 trans_presets.java:1268
-#: trans_presets.java:1274 trans_presets.java:1299
+#: build/trans_presets.java:1234 build/trans_presets.java:1240
+#: build/trans_presets.java:1247 build/trans_presets.java:1253
+#: build/trans_presets.java:1259 build/trans_presets.java:1265
+#: build/trans_presets.java:1271 build/trans_presets.java:1296
 msgid "siding"
 msgstr ""
 
-#: trans_presets.java:1237 trans_presets.java:1243 trans_presets.java:1250
-#: trans_presets.java:1256 trans_presets.java:1262 trans_presets.java:1268
-#: trans_presets.java:1274 trans_presets.java:1299
+#: build/trans_presets.java:1234 build/trans_presets.java:1240
+#: build/trans_presets.java:1247 build/trans_presets.java:1253
+#: build/trans_presets.java:1259 build/trans_presets.java:1265
+#: build/trans_presets.java:1271 build/trans_presets.java:1296
 msgid "spur"
 msgstr ""
 
-#: trans_presets.java:1239
+#: build/trans_presets.java:1236
 msgid "Narrow Gauge Rail"
 msgstr "Узкоколейка"
 
-#: trans_presets.java:1240
+#. item
+#: build/trans_presets.java:1237
 msgid "Edit a Narrow Gauge Rail"
 msgstr "Править узкоколейку"
 
-#: trans_presets.java:1245
+#: build/trans_presets.java:1242
 msgid "Monorail"
 msgstr "Монорельс"
 
-#: trans_presets.java:1247
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1244
 msgid "Edit a Monorail"
 msgstr "Править монорельс"
 
-#: trans_presets.java:1252
+#: build/trans_presets.java:1249
 msgid "Preserved"
 msgstr "Историческая"
 
-#: trans_presets.java:1253
+#. item
+#: build/trans_presets.java:1250
 msgid "Edit a Preserved Railway"
 msgstr "Править историческую дорогу"
 
-#: trans_presets.java:1258
+#: build/trans_presets.java:1255
 msgid "Light Rail"
 msgstr "Лёгкая железная дорога"
 
-#: trans_presets.java:1259
+#. item
+#: build/trans_presets.java:1256
 msgid "Edit a Light Rail"
 msgstr "Править лёгкую железную дорогу"
 
-#: trans_presets.java:1264
+#: build/trans_presets.java:1261
 msgid "Subway"
 msgstr "Метрополитен"
 
-#: trans_presets.java:1265
+#. item
+#: build/trans_presets.java:1262
 msgid "Edit a Subway"
 msgstr "Править метрополитен"
 
-#: trans_presets.java:1270
+#: build/trans_presets.java:1267
 msgid "Tram"
 msgstr "Трамвай"
 
-#: trans_presets.java:1271
+#. item
+#: build/trans_presets.java:1268
 msgid "Edit a Tram"
 msgstr "Править трамвай"
 
-#: trans_presets.java:1276
+#: build/trans_presets.java:1273
 msgid "Bus Guideway"
 msgstr "Направляемый автобус"
 
-#: trans_presets.java:1278
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1275
 msgid "Edit a Bus Guideway"
 msgstr "Править рельсовый автобус"
 
-#: trans_presets.java:1295
+#. item "Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1292
 msgid "Disused Rail"
 msgstr "Неиспользуемая"
 
-#: trans_presets.java:1296
+#. item
+#: build/trans_presets.java:1293
 msgid "Edit a Disused Railway"
 msgstr "Править неиспользуемую дорогу"
 
-#: trans_presets.java:1301
+#: build/trans_presets.java:1298
 msgid "Abandoned Rail"
 msgstr "Заброшенная"
 
-#: trans_presets.java:1305
+#. item
+#. <key key="railway" value="abandoned" />
+#. <separator/>
+#: build/trans_presets.java:1302
 msgid "Level Crossing"
 msgstr "Регулируемый переезд"
 
-#: trans_presets.java:1309
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
+#. <key key="railway" value="level_crossing" />
+#: build/trans_presets.java:1306
 msgid "Crossing"
 msgstr "Переезд"
 
-#: trans_presets.java:1313
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing" />
+#. <key key="railway" value="crossing" />
+#. <optional>
+#: build/trans_presets.java:1310
 msgid "Crossing type"
 msgstr ""
 
-#: trans_presets.java:1319
+#. item "Railway/Crossing" check "Crossing attendant"
+#. </optional>
+#: build/trans_presets.java:1316
 msgid "Turntable"
 msgstr "Поворотный стол"
 
-#: trans_presets.java:1324
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
+#. <key key="railway" value="turntable" />
+#: build/trans_presets.java:1321
 msgid "Aerialway"
 msgstr "Надземные пути"
 
-#: trans_presets.java:1325
+#. group "Aerialway"
+#: build/trans_presets.java:1322
 msgid "Chair Lift"
 msgstr "Кресельная дорога"
 
-#: trans_presets.java:1327
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
+#: build/trans_presets.java:1324
 msgid "Edit a Chair Lift"
 msgstr "Править кресельную дорогу"
 
-#: trans_presets.java:1331
+#. item "Aerialway/Chair Lift" text "Name"
+#: build/trans_presets.java:1328
 msgid "Drag Lift"
 msgstr "Бугельный подъёмник"
 
-#: trans_presets.java:1333
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
+#: build/trans_presets.java:1330
 msgid "Edit a Drag Lift"
 msgstr "Править бугельный подъёмник"
 
-#: trans_presets.java:1337
+#. item "Aerialway/Drag Lift" text "Name"
+#: build/trans_presets.java:1334
 msgid "Cable Car"
 msgstr "Канатная дорога"
 
-#: trans_presets.java:1339
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
+#: build/trans_presets.java:1336
 msgid "Edit a Cable Car"
 msgstr "Править канатную дорогу"
 
-#: trans_presets.java:1343 trans_presets.java:1430
+#. item "Aerialway/Cable Car" text "Name"
+#. group "Public Transport"
+#: build/trans_presets.java:1340 build/trans_presets.java:1427
 msgid "Station"
 msgstr "Станция"
 
-#: trans_presets.java:1344
+#. item
+#: build/trans_presets.java:1341
 msgid "Edit a Station"
 msgstr "Править станцию"
 
-#: trans_presets.java:1351
+#. group "Car"
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "Заправка"
 
-#: trans_presets.java:1355
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "Править заправку"
 
-#: trans_presets.java:1363
+#. item "Car/Fuel" text "Operator"
+#. group "Bicycle"
+#. <button label="Village/City" hotkey="V" icon="place">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="village"/>
+#. <!--
+#. <action class="SetNodeAction" params=""/>
+#. <action class="AnnotationPresetAction" params="Places"/>
+#. -->
+#. </button>
+#: build/trans_presets.java:1357 build/trans_presets.java:1404
+#: build/trans_surveyor.java:24
+msgid "Parking"
+msgstr "Стоянка"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
+#: build/trans_presets.java:1360
 msgid "Edit Parking"
 msgstr "Править стоянку"
 
-#: trans_presets.java:1366 trans_presets.java:1412
+#. item "Car/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1363 build/trans_presets.java:1409
 msgid "Capacity"
 msgstr ""
 
-#: trans_presets.java:1367
+#. item "Car/Parking" combo "Type"
+#: build/trans_presets.java:1364
 msgid "surface"
 msgstr "наземная"
 
-#: trans_presets.java:1367
+#: build/trans_presets.java:1364
 msgid "multi-storey"
 msgstr "многоуровневая"
 
-#: trans_presets.java:1367
+#: build/trans_presets.java:1364
 msgid "underground"
 msgstr "подземная"
 
-#: trans_presets.java:1367
+#: build/trans_presets.java:1364
 msgid "park_and_ride"
 msgstr "перехватывающая"
 
-#: trans_presets.java:1368
+#: build/trans_presets.java:1365
 msgid "Spaces for Disabled"
 msgstr "Места для инвалидов"
 
-#: trans_presets.java:1369
+#: build/trans_presets.java:1366
 msgid "Fee"
 msgstr ""
 
-#: trans_presets.java:1371
+#. item "Car/Parking" check "Fee"
+#: build/trans_presets.java:1368
 msgid "Wash"
 msgstr "Мойка"
 
-#: trans_presets.java:1372
+#. item
+#: build/trans_presets.java:1369
 msgid "Edit Car Wash"
 msgstr "Править автомойку"
 
-#: trans_presets.java:1377 trans_presets.java:1421
+#. item "Car/Wash" text "Operator"
+#. item "Bicycle/Rental" text "Name"
+#: build/trans_presets.java:1374 build/trans_presets.java:1418
 msgid "Shop"
 msgstr "Магазин"
 
-#: trans_presets.java:1379
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1376
 msgid "Edit Car Shop"
 msgstr "Править автомагазин"
 
-#: trans_presets.java:1384
+#. item "Car/Shop" text "Operator"
+#: build/trans_presets.java:1381
 msgid "Repair"
 msgstr "Мастерская"
 
-#: trans_presets.java:1385
+#. item
+#: build/trans_presets.java:1382
 msgid "Edit Car Repair"
 msgstr "Править автомастерскую"
 
-#: trans_presets.java:1390 trans_presets.java:1414
+#. item "Car/Repair" text "Operator"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1387 build/trans_presets.java:1411
 msgid "Rental"
 msgstr "Прокат"
 
-#: trans_presets.java:1393
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
+#: build/trans_presets.java:1390
 msgid "Edit Car Rental"
 msgstr "Править прокат авто"
 
-#: trans_presets.java:1398
+#. item "Car/Rental" text "Operator"
+#: build/trans_presets.java:1395
 msgid "Sharing"
 msgstr "Совместное использование"
 
-#: trans_presets.java:1400
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
+#: build/trans_presets.java:1397
 msgid "Edit Car Sharing"
 msgstr "Править совместное использование"
 
-#: trans_presets.java:1409
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
+#: build/trans_presets.java:1406
 msgid "Edit Bicycle Parking"
 msgstr "Править стоянку для велосипедов"
 
-#: trans_presets.java:1417
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
+#: build/trans_presets.java:1414
 msgid "Edit Bicycle Rental"
 msgstr "Править прокат велосипедов"
 
-#: trans_presets.java:1424
+#. item
+#. <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:1421
 msgid "Edit Bicycle Shop"
 msgstr "Править веломастерскую"
 
-#: trans_presets.java:1429
+#. item "Bicycle/Shop" text "Name"
+#: build/trans_presets.java:1426
 msgid "Public Transport"
 msgstr "Общественный транспорт"
 
-#: trans_presets.java:1433
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
+#: build/trans_presets.java:1430
 msgid "Edit Station"
 msgstr "Править станцию"
 
-#: trans_presets.java:1438
+#. item "Public Transport/Station" text "Name"
+#: build/trans_presets.java:1435
 msgid "UIC-Reference"
 msgstr ""
 
-#: trans_presets.java:1441
+#. item "Public Transport/Station" text "UIC-Reference"
+#. </optional>
+#: build/trans_presets.java:1438
 msgid "Railway Halt"
 msgstr "Полустанок"
 
-#: trans_presets.java:1443
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
+#: build/trans_presets.java:1440
 msgid "Edit Halt"
 msgstr "Править полустанок"
 
-#: trans_presets.java:1450
+#. item "Public Transport/Railway Halt" text "Name"
+#. </optional>
+#: build/trans_presets.java:1447
 msgid "Tram Stop"
 msgstr "Трамвайная остановка"
 
-#: trans_presets.java:1453
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
+#: build/trans_presets.java:1450
 msgid "Edit Tram Stop"
 msgstr "Править трамвайную остановку"
 
-#: trans_presets.java:1460
+#. item "Public Transport/Tram Stop" text "Name"
+#. </optional>
+#: build/trans_presets.java:1457
 msgid "Railway Platform"
 msgstr "Ж/Д платформа"
 
-#: trans_presets.java:1463
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
+#: build/trans_presets.java:1460
 msgid "Edit a railway platform"
 msgstr "Править ж/д платформу"
 
-#: trans_presets.java:1466 trans_presets.java:1507
+#. item "Public Transport/Railway Platform" label "Edit a railway platform"
+#. <key key="railway" value="platform" />
+#. <space />
+#. item "Public Transport/Bus Platform" label "Edit a bus platform"
+#. <key key="highway" value="platform" />
+#. <space />
+#: build/trans_presets.java:1463 build/trans_presets.java:1504
 msgid "Reference (track number)"
 msgstr ""
 
-#: trans_presets.java:1468 trans_presets.java:1509
+#. item "Public Transport/Railway Platform" text "Width (meters)"
+#. item "Public Transport/Bus Platform" text "Width (meters)"
+#: build/trans_presets.java:1465 build/trans_presets.java:1506
 msgid "Area"
 msgstr "Область"
 
-#: trans_presets.java:1470
+#. item "Public Transport/Railway Platform" check "Area"
+#: build/trans_presets.java:1467
 msgid "Subway Entrance"
 msgstr "Вход в метро"
 
-#: trans_presets.java:1473
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
+#. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
+#: build/trans_presets.java:1470
 msgid "Edit Subway Entrance"
 msgstr "Править вход в метро"
 
-#: trans_presets.java:1478
+#. item "Public Transport/Subway Entrance" text "Name"
+#: build/trans_presets.java:1475
 msgid "Wheelchair"
 msgstr "Кресло-каталка"
 
-#: trans_presets.java:1483
+#. item "Public Transport/Subway Entrance" check "Bicycle"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1480
 msgid "Bus Station"
 msgstr "Автовокзал"
 
-#: trans_presets.java:1486
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
+#: build/trans_presets.java:1483
 msgid "Edit a Bus Station"
 msgstr "Править автовокзал"
 
-#: trans_presets.java:1492
+#. item "Public Transport/Bus Station" text "Name"
+#. </optional>
+#: build/trans_presets.java:1489
 msgid "Bus Stop"
 msgstr "Автобусная остановка"
 
-#: trans_presets.java:1496
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_stop"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
+#. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
+#: build/trans_presets.java:1493
 msgid "Edit Bus Stop"
 msgstr "Править автобусную остановку"
 
-#: trans_presets.java:1503
+#. item "Public Transport/Bus Stop" text "Name"
+#. </optional>
+#: build/trans_presets.java:1500
 msgid "Bus Platform"
 msgstr "Автобусная платформа"
 
-#: trans_presets.java:1504
+#. item
+#: build/trans_presets.java:1501
 msgid "Edit a bus platform"
 msgstr "Править автобусную платформу"
 
-#: trans_presets.java:1512
+#. item "Public Transport/Bus Platform" check "Area"
+#. <separator/>
+#: build/trans_presets.java:1509
 msgid "Taxi"
 msgstr "Такси"
 
-#: trans_presets.java:1514
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
+#: build/trans_presets.java:1511
 msgid "Edit a Taxi station"
 msgstr "Править стоянку такси"
 
-#: trans_presets.java:1519
+#. item "Public Transport/Taxi" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1516
 msgid "Airport"
 msgstr "Аэропорт"
 
-#: trans_presets.java:1521
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
+#: build/trans_presets.java:1518
 msgid "Edit an airport"
 msgstr "Править аэропорт"
 
-#: trans_presets.java:1526
+#. item "Public Transport/Airport" text "Reference"
+#: build/trans_presets.java:1523
 msgid "IATA"
 msgstr "Международная ассоциация воздушного транспорта"
 
-#: trans_presets.java:1527
+#. item "Public Transport/Airport" text "IATA"
+#: build/trans_presets.java:1524
 msgid "ICAO"
 msgstr "Международная организация гражданской авиации"
 
-#: trans_presets.java:1532
+#. item "Public Transport/Airport" text "ICAO"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1529
 msgid "Accomodation"
 msgstr "Проживание"
 
-#: trans_presets.java:1536
+#. group "Accomodation"
+#. <button label="Fuel Station" hotkey="F" icon="fuel">
+#. <!--action class="SetNodeAction" params="amenity=fuel"/-->
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Fuel"/>
+#. </button>
+#: build/trans_presets.java:1530 build/trans_surveyor.java:43
+msgid "Hotel"
+msgstr "Гостиница"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
+#: build/trans_presets.java:1533
 msgid "Edit Hotel"
 msgstr "Править гостиницу"
 
-#: trans_presets.java:1539
+#. item "Accomodation/Hotel" text "Name"
+#: build/trans_presets.java:1536
 msgid "Stars"
 msgstr "Звёзды"
 
-#: trans_presets.java:1541
+#. item "Accomodation/Hotel" combo "Stars"
+#: build/trans_presets.java:1538
 msgid "Motel"
 msgstr "Мотель"
 
-#: trans_presets.java:1543
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
+#: build/trans_presets.java:1540
 msgid "Edit Motel"
 msgstr "Править иотель"
 
-#: trans_presets.java:1547
+#. item "Accomodation/Motel" text "Name"
+#: build/trans_presets.java:1544
 msgid "Guest House"
 msgstr ""
 
-#: trans_presets.java:1548
+#. item
+#: build/trans_presets.java:1545
 msgid "Edit Guest House"
 msgstr ""
 
-#: trans_presets.java:1552
+#. item "Accomodation/Guest House" text "Name"
+#: build/trans_presets.java:1549
 msgid "Chalet"
 msgstr ""
 
-#: trans_presets.java:1554
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
+#: build/trans_presets.java:1551
 msgid "Edit Chalet"
 msgstr ""
 
-#: trans_presets.java:1558
+#. item "Accomodation/Chalet" text "Name"
+#: build/trans_presets.java:1555
 msgid "Hostel"
 msgstr "Студенческое общежитие"
 
-#: trans_presets.java:1560
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
+#: build/trans_presets.java:1557
 msgid "Edit Hostel"
 msgstr "Править студенческое общежитие"
 
-#: trans_presets.java:1564
+#. item "Accomodation/Hostel" text "Name"
+#: build/trans_presets.java:1561
 msgid "Alpine Hut"
 msgstr ""
 
-#: trans_presets.java:1565
+#. item
+#: build/trans_presets.java:1562
 msgid "Edit Alpine Hut"
 msgstr ""
 
-#: trans_presets.java:1570
+#. item "Accomodation/Alpine Hut" text "Elevation"
+#: build/trans_presets.java:1567
 msgid "Caravan Site"
 msgstr "Площадка для домов на колёсах"
 
-#: trans_presets.java:1571
+#. item
+#: build/trans_presets.java:1568
 msgid "Edit Caravan Site"
 msgstr "Править площадку для домов на колёсах"
 
-#: trans_presets.java:1575
+#. item "Accomodation/Caravan Site" text "Name"
+#: build/trans_presets.java:1572
 msgid "Camping Site"
 msgstr "Кэмпинг"
 
-#: trans_presets.java:1577
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
+#: build/trans_presets.java:1574
 msgid "Edit Camping Site"
 msgstr "Править кэмпинг"
 
-#: trans_presets.java:1582
+#. item "Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1579
 msgid "Food+Drinks"
 msgstr "Питание"
 
-#: trans_presets.java:1585
+#. group "Food+Drinks"
+#. <button label="Hotel" hotkey="H" icon="bed">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Hotel"/>
+#. </button>
+#: build/trans_presets.java:1580 build/trans_surveyor.java:47
+msgid "Restaurant"
+msgstr "Ресторан"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
+#: build/trans_presets.java:1582
 msgid "Edit Restaurant"
 msgstr "Править ресторан"
 
-#: trans_presets.java:1588 trans_presets.java:1595
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#: build/trans_presets.java:1585 build/trans_presets.java:1592
 msgid "Cuisine"
 msgstr "Кухня"
 
-#: trans_presets.java:1588 trans_presets.java:1595
+#. item "Food+Drinks/Restaurant" combo "Cuisine"
+#. item "Food+Drinks/Fast Food" combo "Cuisine"
+#: build/trans_presets.java:1585 build/trans_presets.java:1592
 msgid "italian"
 msgstr "итальянская"
 
-#: trans_presets.java:1588 trans_presets.java:1595
+#: build/trans_presets.java:1585 build/trans_presets.java:1592
 msgid "chinese"
 msgstr "китайская"
 
-#: trans_presets.java:1588 trans_presets.java:1595
+#: build/trans_presets.java:1585 build/trans_presets.java:1592
 msgid "pizza"
 msgstr "пицца"
 
-#: trans_presets.java:1588 trans_presets.java:1595
+#: build/trans_presets.java:1585 build/trans_presets.java:1592
 msgid "burger"
 msgstr "бургеры"
 
-#: trans_presets.java:1588 trans_presets.java:1595
+#: build/trans_presets.java:1585 build/trans_presets.java:1592
 msgid "greek"
 msgstr "греческая"
 
-#: trans_presets.java:1588 trans_presets.java:1595
+#: build/trans_presets.java:1585 build/trans_presets.java:1592
 msgid "german"
 msgstr "немецкая"
 
-#: trans_presets.java:1588 trans_presets.java:1595
+#: build/trans_presets.java:1585 build/trans_presets.java:1592
 msgid "indian"
 msgstr "индийская"
 
-#: trans_presets.java:1588 trans_presets.java:1595
+#: build/trans_presets.java:1585 build/trans_presets.java:1592
 msgid "regional"
 msgstr "местная"
 
-#: trans_presets.java:1588 trans_presets.java:1595
+#: build/trans_presets.java:1585 build/trans_presets.java:1592
 msgid "kebab"
 msgstr "кебаб"
 
-#: trans_presets.java:1588 trans_presets.java:1595
+#: build/trans_presets.java:1585 build/trans_presets.java:1592
 msgid "turkish"
 msgstr "турецкая"
 
-#: trans_presets.java:1588 trans_presets.java:1595
+#: build/trans_presets.java:1585 build/trans_presets.java:1592
 msgid "asian"
 msgstr "азиатская"
 
-#: trans_presets.java:1588 trans_presets.java:1595
+#: build/trans_presets.java:1585 build/trans_presets.java:1592
 msgid "thai"
 msgstr "тайская"
 
-#: trans_presets.java:1588 trans_presets.java:1595
+#: build/trans_presets.java:1585 build/trans_presets.java:1592
 msgid "mexican"
 msgstr "мексиканская"
 
-#: trans_presets.java:1588 trans_presets.java:1595
+#: build/trans_presets.java:1585 build/trans_presets.java:1592
 msgid "japanese"
 msgstr "японская"
 
-#: trans_presets.java:1590
+#: build/trans_presets.java:1587
 msgid "Fast Food"
 msgstr "Фастфуд"
 
-#: trans_presets.java:1592
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
+#: build/trans_presets.java:1589
 msgid "Edit Fast Food Restaurant"
 msgstr "Правка фастфуда"
 
-#: trans_presets.java:1597
+#: build/trans_presets.java:1594
 msgid "Cafe"
 msgstr "Кафе"
 
-#: trans_presets.java:1599
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
+#: build/trans_presets.java:1596
 msgid "Edit Cafe"
 msgstr "Править кафе"
 
-#: trans_presets.java:1603
+#. item "Food+Drinks/Cafe" text "Name"
+#: build/trans_presets.java:1600
 msgid "Pub"
 msgstr "Бар"
 
-#: trans_presets.java:1605
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
+#: build/trans_presets.java:1602
 msgid "Edit Pub"
 msgstr "Править бар"
 
-#: trans_presets.java:1609
+#. item "Food+Drinks/Pub" text "Name"
+#: build/trans_presets.java:1606
 msgid "Biergarten"
 msgstr "Пивная"
 
-#: trans_presets.java:1610
+#. item
+#: build/trans_presets.java:1607
 msgid "Edit Biergarten"
 msgstr "Править пивную"
 
-#: trans_presets.java:1614
+#. item "Food+Drinks/Biergarten" text "Name"
+#: build/trans_presets.java:1611
+#, fuzzy
+msgid "Bar"
+msgstr "Булочная"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
+#: build/trans_presets.java:1613
+#, fuzzy
+msgid "Edit a Bar"
+msgstr "Править лодочную мастерскую"
+
+#. item "Food+Drinks/Bar" text "Name"
+#: build/trans_presets.java:1617
 msgid "Nightclub"
 msgstr "Ночной клуб"
 
-#: trans_presets.java:1616
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
+#: build/trans_presets.java:1619
 msgid "Edit Nightclub"
 msgstr "Править ночной клуб"
 
-#: trans_presets.java:1621
+#. item "Food+Drinks/Nightclub" text "Name"
+#: build/trans_presets.java:1624
 msgid "Tourism"
 msgstr "Туризм"
 
-#: trans_presets.java:1622
+#. group "Tourism"
+#: build/trans_presets.java:1625
 msgid "Attraction"
 msgstr "Достопримечательность"
 
-#: trans_presets.java:1623
+#. item
+#: build/trans_presets.java:1626
 msgid "Edit Attraction"
 msgstr "Править достопримечательность"
 
-#: trans_presets.java:1627
-msgid "Information point"
-msgstr "Информационный пункт"
-
-#: trans_presets.java:1629
-msgid "Edit Information Point"
+#. item "Tourism/Attraction" text "Name"
+#. item "Tourism/Information Office" text "Name"
+#. item "Amenities/Baby Hatch" text "Operator"
+#: build/trans_presets.java:1629 build/trans_presets.java:1637
+#: build/trans_presets.java:2365
+msgid "Opening Hours"
+msgstr "Часы работы"
+
+#. item "Tourism/Attraction" text "Opening Hours"
+#: build/trans_presets.java:1631
+#, fuzzy
+msgid "Information Office"
+msgstr "Информация"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
+#: build/trans_presets.java:1633
+#, fuzzy
+msgid "Edit Information Office"
 msgstr "Править информационный пункт"
 
-#: trans_presets.java:1631
-msgid "office"
-msgstr "офис"
-
-#: trans_presets.java:1631
+#. item "Tourism/Information Office" text "Opening Hours"
+#: build/trans_presets.java:1639
+msgid "Museum"
+msgstr "Музей"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
+#: build/trans_presets.java:1641
+msgid "Edit Museum"
+msgstr "Править музей"
+
+#. item "Tourism/Museum" text "Name"
+#: build/trans_presets.java:1645
+msgid "Zoo"
+msgstr "Зоопарк"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
+#: build/trans_presets.java:1648
+msgid "Edit Zoo"
+msgstr "Править зоопарк"
+
+#. item "Tourism/Zoo" text "Name"
+#: build/trans_presets.java:1652
+msgid "Viewpoint"
+msgstr "Смотровая площадка"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
+#: build/trans_presets.java:1654
+msgid "Edit Viewpoint"
+msgstr "Править смотровую площадку"
+
+#. item "Tourism/Viewpoint" text "Name"
+#: build/trans_presets.java:1657
+msgid "Look-Out Tower"
+msgstr "Каланча"
+
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1659
+msgid "Theme Park"
+msgstr "Парк развлечений"
+
+#. item
+#: build/trans_presets.java:1660
+msgid "Edit Theme Park"
+msgstr "Править парк развлечений"
+
+#. item "Tourism/Theme Park" text "Name"
+#: build/trans_presets.java:1664
+msgid "Artwork"
+msgstr "Рисунки"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1666
+msgid "Edit Artwork"
+msgstr "Редактировать рисунки"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1671
+#, fuzzy
+msgid "Guidepost (Hiking)"
+msgstr "Править туризм"
+
+#. item "Tourism/Map" text "Name"
+#: build/trans_presets.java:1680
+#, fuzzy
+msgid "Map Type"
+msgstr "Тип"
+
+#. item "Tourism/Map" combo "Map Type"
+#: build/trans_presets.java:1680
 msgid "map"
 msgstr "карта"
 
-#: trans_presets.java:1631
+#: build/trans_presets.java:1680
 msgid "citymap"
 msgstr "карта города"
 
-#: trans_presets.java:1631
+#: build/trans_presets.java:1680
 msgid "hikingmap"
 msgstr "карта туристических маршрутов"
 
-#: trans_presets.java:1631
+#: build/trans_presets.java:1680
 msgid "bicyclemap"
 msgstr "карта велодорожек"
 
-#: trans_presets.java:1631
+#. item "Tourism/Other Information Points" text "Name"
+#: build/trans_presets.java:1681 build/trans_presets.java:1688
+#: build/trans_presets.java:1694
+#, fuzzy
+msgid "Closer Description"
+msgstr "Описание"
+
+#. item "Tourism/Map" text "Closer Description"
+#: build/trans_presets.java:1683
+#, fuzzy
+msgid "Information Board"
+msgstr "Информация"
+
+#. item "Tourism/Information Board" text "Name"
+#: build/trans_presets.java:1687
+msgid "Board Type"
+msgstr ""
+
+#. item "Tourism/Information Board" combo "Board Type"
+#: build/trans_presets.java:1687
 msgid "board"
 msgstr "доска информации"
 
-#: trans_presets.java:1631
+#: build/trans_presets.java:1687
 msgid "history"
 msgstr "история"
 
-#: trans_presets.java:1631
+#: build/trans_presets.java:1687
 msgid "nature"
 msgstr "природа"
 
-#: trans_presets.java:1631
+#: build/trans_presets.java:1687
 msgid "wildlife"
 msgstr "животный мир"
 
-#: trans_presets.java:1631
-msgid "guidepost"
-msgstr "указатель"
-
-#: trans_presets.java:1634
-msgid "Museum"
-msgstr "Музей"
-
-#: trans_presets.java:1636
-msgid "Edit Museum"
-msgstr "Править музей"
-
-#: trans_presets.java:1640
-msgid "Zoo"
-msgstr "Зоопарк"
-
-#: trans_presets.java:1643
-msgid "Edit Zoo"
-msgstr "Править зоопарк"
-
-#: trans_presets.java:1647
-msgid "Viewpoint"
-msgstr "Смотровая площадка"
-
-#: trans_presets.java:1649
-msgid "Edit Viewpoint"
-msgstr "Править смотровую площадку"
-
-#: trans_presets.java:1652
-msgid "Look-Out Tower"
-msgstr "Каланча"
-
-#: trans_presets.java:1654
-msgid "Theme Park"
-msgstr "Парк развлечений"
-
-#: trans_presets.java:1655
-msgid "Edit Theme Park"
-msgstr "Править парк развлечений"
-
-#: trans_presets.java:1659
-msgid "Artwork"
-msgstr "Рисунки"
-
-#: trans_presets.java:1661
-msgid "Edit Artwork"
-msgstr "Редактировать рисунки"
-
-#: trans_presets.java:1666 trans_presets.java:2311
+#. item "Tourism/Information Board" text "Closer Description"
+#: build/trans_presets.java:1690
+#, fuzzy
+msgid "Other Information Points"
+msgstr "Править информационный пункт"
+
+#. item "Tourism/Other Information Points" text "Closer Description"
+#. item "Amenities/Hunting Stand" label "Edit a Hunting Stand"
+#. <key key="amenity" value="hunting_stand" />
+#: build/trans_presets.java:1696 build/trans_presets.java:2341
 msgid "Shelter"
 msgstr "Навес"
 
-#: trans_presets.java:1667
+#. item
+#: build/trans_presets.java:1697
 msgid "Edit Shelter"
 msgstr "Править навес"
 
-#: trans_presets.java:1670 trans_presets.java:1676
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:1700 build/trans_presets.java:1706
 msgid "Fireplace"
 msgstr "Очаг"
 
-#: trans_presets.java:1672
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:1702
 msgid "Picnic Site"
 msgstr "Место для пикника"
 
-#: trans_presets.java:1673
+#. item
+#: build/trans_presets.java:1703
 msgid "Edit Picnic Site"
 msgstr "Править место для пикника"
 
-#: trans_presets.java:1679
+#. item "Tourism/Picnic Site" check "Fireplace"
+#: build/trans_presets.java:1709
 msgid "Historic Places"
 msgstr "Исторические места"
 
-#: trans_presets.java:1680
+#. group "Historic Places"
+#: build/trans_presets.java:1710
 msgid "Castle"
 msgstr "Замок"
 
-#: trans_presets.java:1683
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
+#: build/trans_presets.java:1713
 msgid "Edit Castle"
 msgstr "Править замок"
 
-#: trans_presets.java:1687
+#. item "Historic Places/Castle" text "Name"
+#: build/trans_presets.java:1717
 msgid "Ruins"
 msgstr "Руины"
 
-#: trans_presets.java:1688
+#. item
+#: build/trans_presets.java:1718
 msgid "Edit Ruins"
 msgstr "Править руины"
 
-#: trans_presets.java:1692
+#. item "Historic Places/Ruins" text "Name"
+#: build/trans_presets.java:1722
 msgid "Archaeological Site"
 msgstr "Место раскопок"
 
-#: trans_presets.java:1695
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
+#: build/trans_presets.java:1725
 msgid "Edit Archaeological Site"
 msgstr "Править место раскопок"
 
-#: trans_presets.java:1699
+#. item "Historic Places/Archaeological Site" text "Name"
+#: build/trans_presets.java:1729
 msgid "Monument"
 msgstr "Монумент"
 
-#: trans_presets.java:1700
+#. item
+#: build/trans_presets.java:1730
 msgid "Edit Monument"
 msgstr "Править монумент"
 
-#: trans_presets.java:1704
+#. item "Historic Places/Monument" text "Name"
+#: build/trans_presets.java:1734
 msgid "Memorial"
 msgstr "Памятник"
 
-#: trans_presets.java:1706
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
+#: build/trans_presets.java:1736
 msgid "Edit Memorial"
 msgstr "Править памятник"
 
-#: trans_presets.java:1710
+#. item "Historic Places/Memorial" text "Name"
+#: build/trans_presets.java:1740
 msgid "Battlefield"
 msgstr "Поле битвы"
 
-#: trans_presets.java:1712
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
+#: build/trans_presets.java:1742
 msgid "Edit Battlefield"
 msgstr "Править поле битвы"
 
-#: trans_presets.java:1716
+#. item "Historic Places/Battlefield" text "Name"
+#: build/trans_presets.java:1746
 msgid "Wayside Cross"
 msgstr "Придорожный крест"
 
-#: trans_presets.java:1717
+#. item
+#: build/trans_presets.java:1747
 msgid "Edit a Wayside Cross"
 msgstr "Править придорожный крест"
 
-#: trans_presets.java:1721
+#. item "Historic Places/Wayside Cross" text "Name"
+#: build/trans_presets.java:1751
 msgid "Wayside Shrine"
 msgstr "Придорожная святыня"
 
-#: trans_presets.java:1722
+#. item
+#: build/trans_presets.java:1752
 msgid "Edit a Wayside Shrine"
 msgstr "Править придорожную святыню"
 
-#: trans_presets.java:1727
+#. item "Historic Places/Wayside Shrine" text "Name"
+#: build/trans_presets.java:1757
 msgid "Leisure"
 msgstr "Досуг"
 
-#: trans_presets.java:1728
+#. group "Leisure"
+#: build/trans_presets.java:1758
 msgid "Water Park"
 msgstr "Аквапарк"
 
-#: trans_presets.java:1729
+#. item
+#: build/trans_presets.java:1759
 msgid "Edit Water Park"
 msgstr "Править аквапарк"
 
-#: trans_presets.java:1733
+#. item "Leisure/Water Park" text "Name"
+#: build/trans_presets.java:1763
 msgid "Playground"
 msgstr "Игровая площадка"
 
-#: trans_presets.java:1735
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
+#: build/trans_presets.java:1765
 msgid "Edit Playground"
 msgstr "Править игровую площадку"
 
-#: trans_presets.java:1739
+#. item "Leisure/Playground" text "Name"
+#: build/trans_presets.java:1769
 msgid "Fishing"
 msgstr "Рыбалка"
 
-#: trans_presets.java:1740
+#. item
+#: build/trans_presets.java:1770
 msgid "Edit Fishing"
 msgstr "Править рыбалку"
 
-#: trans_presets.java:1746
+#. item "Leisure/Fishing" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1776
 msgid "Sport Facilities"
 msgstr "Спортивные учреждения"
 
-#: trans_presets.java:1747
+#. group "Sport Facilities"
+#: build/trans_presets.java:1777
 msgid "Stadium"
 msgstr "Стадион"
 
-#: trans_presets.java:1748
+#. item
+#: build/trans_presets.java:1778
 msgid "Edit Stadium"
 msgstr "Править стадион"
 
-#: trans_presets.java:1752 trans_presets.java:1761 trans_presets.java:1770
-#: trans_presets.java:1779
+#. item "Sport Facilities/Stadium" text "Name"
+#. <space />
+#. item "Sport Facilities/Sports Centre" text "Name"
+#. <space />
+#. item "Sport Facilities/Pitch" text "Name"
+#. <space />
+#. item "Sport Facilities/Racetrack" text "Name"
+#. <space />
+#: build/trans_presets.java:1782 build/trans_presets.java:1791
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
 msgid "select sport:"
 msgstr "вид спорта:"
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#. item "Sport Facilities/Stadium" label "select sport:"
+#. <space />
+#. item "Sport Facilities/Sports Centre" label "select sport:"
+#. <space />
+#. item "Sport Facilities/Pitch" label "select sport:"
+#. <space />
+#. item "Sport Facilities/Racetrack" label "select sport:"
+#. <space />
+#. color boundary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--sport tags -->
+#.
+#. <rule>
+#. <condition k="sport" v="10pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="athletics"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="australian_football"/>
+#. color sport
+#. <icon src="sport/football.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="baseball"/>
+#. color sport
+#. <icon src="sport/baseball.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="basketball"/>
+#. color sport
+#. <icon src="sport/basketball.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="boules"/>
+#. color sport
+#. <icon src="sport/boule.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="bowls"/>
+#. color sport
+#. <icon src="sport/boule.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="climbing"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="cricket"/>
+#. color sport
+#. <icon src="sport/cricket.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="cricket_nets"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="croquet"/>
+#. color sport
+#. <icon src="sport/croquet.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="cycling"/>
+#. color sport
+#. <icon src="sport/cycling.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="dog_racing"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="equestrian"/>
+#. color sport
+#. <icon src="sport/riding.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <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
+#. <icon src="sport/golf.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="gymnastics"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="hockey"/>
+#. color sport
+#. <icon src="sport/hockey.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="horse_racing"/>
+#. color sport
+#. <icon src="sport/riding.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="motor"/>
+#. color sport
+#. <icon src="vehicle/motorbike.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="multi"/>
+#. color sport
+#. <icon src="sport/multi.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="pelota"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="racquet"/>
+#. color sport
+#. <icon src="sport/racquetball.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <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
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="skateboard"/>
+#. color sport
+#. <icon src="misc/no_icon.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>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="swimming"/>
+#. color sport
+#. <icon src="sport/pool.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="skiing"/>
+#. color sport
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="table_tennis"/>
+#. color sport
+#. <icon src="sport/table_tennis.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="tennis"/>
+#. color sport
+#. <icon src="sport/tennis.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="paintball"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="squash"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="shooting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="volleyball"/>
+#. color sport
+#. <icon annotate="true" src="sport/volleyball.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="beachvolleyball"/>
+#. color sport
+#. <icon annotate="true" src="sport/volleyball.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="bowling"/>
+#. color sport
+#. <icon annotate="true" src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="handball"/>
+#. color sport
+#. <icon annotate="true" src="sport/handball.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rowing"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="sailing"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="diving"/>
+#. color sport
+#. <icon annotate="true" src="sport/diving.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="badminton"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="archery"/>
+#. color sport
+#. <icon annotate="true" src="sport/archery.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="fishing"/>
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_style.java:3248 build/trans_style.java:3256
+#: build/trans_style.java:3264 build/trans_style.java:3272
+#: build/trans_style.java:3280 build/trans_style.java:3288
+#: build/trans_style.java:3296 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
+#: build/trans_style.java:3344 build/trans_style.java:3352
+#: build/trans_style.java:3360 build/trans_style.java:3368
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392 build/trans_style.java:3400
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3520 build/trans_style.java:3528
+#: build/trans_style.java:3536 build/trans_style.java:3544
+#: build/trans_style.java:3552 build/trans_style.java:3560
+#: build/trans_style.java:3568 build/trans_style.java:3576
+#: build/trans_style.java:3584 build/trans_style.java:3592
+msgid "sport"
+msgstr "спорт"
+
+#. item "Sport Facilities/Stadium" combo "sport"
+#. item "Sport Facilities/Sports Centre" combo "sport"
+#. item "Sport Facilities/Pitch" combo "sport"
+#. item "Sport Facilities/Racetrack" combo "sport"
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "multi"
 msgstr "несколько"
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "archery"
 msgstr "стрельба из лука"
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "athletics"
 msgstr "атлетика"
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "australian_football"
 msgstr "австралийский футбол"
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "baseball"
 msgstr "бейсбол"
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "basketball"
 msgstr "баскетбол"
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "boules"
 msgstr ""
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "bowls"
 msgstr ""
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "canoe"
 msgstr "каноэ"
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "climbing"
 msgstr "альпинизм"
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "cricket"
 msgstr "крикет"
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "cricket_nets"
 msgstr ""
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "croquet"
 msgstr ""
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "cycling"
 msgstr "велоспорт"
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "dog_racing"
 msgstr "собачьи бега"
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "equestrian"
 msgstr ""
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "football"
 msgstr "футбол"
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "golf"
 msgstr "гольф"
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "gymnastics"
 msgstr "гимнастика"
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "hockey"
 msgstr "хоккей"
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "horse_racing"
 msgstr "лошадиные бега"
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "motor"
 msgstr ""
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "pelota"
 msgstr ""
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "racquet"
 msgstr ""
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "rugby"
 msgstr "рэгби"
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "shooting"
 msgstr "стрельба"
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "skateboard"
 msgstr "скейтборд"
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "skating"
 msgstr "фигурное катание"
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "skiing"
 msgstr "лыжный спорт"
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "soccer"
 msgstr "футбол"
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "swimming"
 msgstr "плаванье"
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "table_tennis"
 msgstr "настольный теннис"
 
-#: trans_presets.java:1754 trans_presets.java:1763 trans_presets.java:1772
-#: trans_presets.java:1781
+#: build/trans_presets.java:1784 build/trans_presets.java:1793
+#: build/trans_presets.java:1802 build/trans_presets.java:1811
 msgid "tennis"
 msgstr "теннис"
 
-#: trans_presets.java:1756
+#: build/trans_presets.java:1786
 msgid "Sports Centre"
 msgstr "Спортивный центр"
 
-#: trans_presets.java:1757
+#. item
+#: build/trans_presets.java:1787
 msgid "Edit Sports Centre"
 msgstr "Править спортивный центр"
 
-#: trans_presets.java:1765
+#: build/trans_presets.java:1795
 msgid "Pitch"
 msgstr ""
 
-#: trans_presets.java:1766
+#. item
+#: build/trans_presets.java:1796
 msgid "Edit Pitch"
 msgstr ""
 
-#: trans_presets.java:1774
+#: build/trans_presets.java:1804
 msgid "Racetrack"
 msgstr "Трэк"
 
-#: trans_presets.java:1775
+#. item
+#: build/trans_presets.java:1805
 msgid "Edit Racetrack"
 msgstr "Править трэк"
 
-#: trans_presets.java:1783
+#: build/trans_presets.java:1813
 msgid "Golf Course"
 msgstr "Поле для гольфа"
 
-#: trans_presets.java:1784
+#. item
+#: build/trans_presets.java:1814
 msgid "Edit Golf Course"
 msgstr "Править поле для гольфа"
 
-#: trans_presets.java:1788
+#. item "Sport Facilities/Golf Course" text "Name"
+#: build/trans_presets.java:1818
 msgid "Miniature Golf"
 msgstr "Минигольф"
 
-#: trans_presets.java:1789
+#. item
+#: build/trans_presets.java:1819
 msgid "Edit Miniature Golf"
 msgstr "Править минигольф"
 
-#: trans_presets.java:1794
+#. item "Sport Facilities/Miniature Golf" text "Name"
+#: build/trans_presets.java:1824
 msgid "Sport"
 msgstr "Спорт"
 
-#: trans_presets.java:1795
+#. group "Sport"
+#: build/trans_presets.java:1825
 msgid "Multi"
 msgstr "Несколько"
 
-#: trans_presets.java:1796
+#. item
+#: build/trans_presets.java:1826
 msgid "Edit Multi"
 msgstr "Править несколько видов спорта"
 
-#: trans_presets.java:1799 trans_presets.java:1805 trans_presets.java:1811
-#: trans_presets.java:1817 trans_presets.java:1823 trans_presets.java:1829
-#: trans_presets.java:1835 trans_presets.java:1841 trans_presets.java:1847
-#: trans_presets.java:1853 trans_presets.java:1859 trans_presets.java:1865
-#: trans_presets.java:1871 trans_presets.java:1877 trans_presets.java:1883
-#: trans_presets.java:1892 trans_presets.java:1899 trans_presets.java:1907
-#: trans_presets.java:1913 trans_presets.java:1919 trans_presets.java:1925
-#: trans_presets.java:1931 trans_presets.java:1937 trans_presets.java:1943
-#: trans_presets.java:1949 trans_presets.java:1955 trans_presets.java:1961
-#: trans_presets.java:1967 trans_presets.java:1973 trans_presets.java:1979
-#: trans_presets.java:1985 trans_presets.java:1991 trans_presets.java:1997
-#: trans_presets.java:2003
+#. item "Sport/Multi" combo "type"
+#. item "Sport/10pin" combo "type"
+#. item "Sport/Athletics" combo "type"
+#. item "Sport/Archery" combo "type"
+#. item "Sport/Climbing" combo "type"
+#. item "Sport/Canoeing" combo "type"
+#. item "Sport/Cycling" combo "type"
+#. item "Sport/Dog Racing" combo "type"
+#. item "Sport/Equestrian" combo "type"
+#. item "Sport/Horse Racing" combo "type"
+#. item "Sport/Gymnastics" combo "type"
+#. item "Sport/Motor Sports" combo "type"
+#. item "Sport/Skating" combo "type"
+#. item "Sport/Skateboard" combo "type"
+#. item "Sport/Swimming" combo "type"
+#. item "Sport/Skiing" combo "type"
+#. 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)/Baseball" combo "type"
+#. item "Sport (Ball)/Basketball" combo "type"
+#. item "Sport (Ball)/Boule" combo "type"
+#. item "Sport (Ball)/Bowls" combo "type"
+#. item "Sport (Ball)/Cricket" combo "type"
+#. item "Sport (Ball)/Cricket Nets" combo "type"
+#. item "Sport (Ball)/Croquet" combo "type"
+#. item "Sport (Ball)/Hockey" combo "type"
+#. 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"
+#: build/trans_presets.java:1829 build/trans_presets.java:1835
+#: build/trans_presets.java:1841 build/trans_presets.java:1847
+#: build/trans_presets.java:1853 build/trans_presets.java:1859
+#: build/trans_presets.java:1865 build/trans_presets.java:1871
+#: build/trans_presets.java:1877 build/trans_presets.java:1883
+#: build/trans_presets.java:1889 build/trans_presets.java:1895
+#: build/trans_presets.java:1901 build/trans_presets.java:1907
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1929 build/trans_presets.java:1937
+#: build/trans_presets.java:1943 build/trans_presets.java:1949
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
 msgid "pitch"
 msgstr ""
 
-#: trans_presets.java:1799 trans_presets.java:1805 trans_presets.java:1811
-#: trans_presets.java:1817 trans_presets.java:1823 trans_presets.java:1829
-#: trans_presets.java:1835 trans_presets.java:1841 trans_presets.java:1847
-#: trans_presets.java:1853 trans_presets.java:1859 trans_presets.java:1865
-#: trans_presets.java:1871 trans_presets.java:1877 trans_presets.java:1883
-#: trans_presets.java:1892 trans_presets.java:1899 trans_presets.java:1907
-#: trans_presets.java:1913 trans_presets.java:1919 trans_presets.java:1925
-#: trans_presets.java:1931 trans_presets.java:1937 trans_presets.java:1943
-#: trans_presets.java:1949 trans_presets.java:1955 trans_presets.java:1961
-#: trans_presets.java:1967 trans_presets.java:1973 trans_presets.java:1979
-#: trans_presets.java:1985 trans_presets.java:1991 trans_presets.java:1997
-#: trans_presets.java:2003
+#: build/trans_presets.java:1829 build/trans_presets.java:1835
+#: build/trans_presets.java:1841 build/trans_presets.java:1847
+#: build/trans_presets.java:1853 build/trans_presets.java:1859
+#: build/trans_presets.java:1865 build/trans_presets.java:1871
+#: build/trans_presets.java:1877 build/trans_presets.java:1883
+#: build/trans_presets.java:1889 build/trans_presets.java:1895
+#: build/trans_presets.java:1901 build/trans_presets.java:1907
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1929 build/trans_presets.java:1937
+#: build/trans_presets.java:1943 build/trans_presets.java:1949
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
 msgid "sports_centre"
 msgstr "спортивный центр"
 
-#: trans_presets.java:1799 trans_presets.java:1805 trans_presets.java:1811
-#: trans_presets.java:1817 trans_presets.java:1823 trans_presets.java:1829
-#: trans_presets.java:1835 trans_presets.java:1841 trans_presets.java:1847
-#: trans_presets.java:1853 trans_presets.java:1859 trans_presets.java:1865
-#: trans_presets.java:1871 trans_presets.java:1877 trans_presets.java:1883
-#: trans_presets.java:1892 trans_presets.java:1899 trans_presets.java:1907
-#: trans_presets.java:1913 trans_presets.java:1919 trans_presets.java:1925
-#: trans_presets.java:1931 trans_presets.java:1937 trans_presets.java:1943
-#: trans_presets.java:1949 trans_presets.java:1955 trans_presets.java:1961
-#: trans_presets.java:1967 trans_presets.java:1973 trans_presets.java:1979
-#: trans_presets.java:1985 trans_presets.java:1991 trans_presets.java:1997
-#: trans_presets.java:2003
+#: build/trans_presets.java:1829 build/trans_presets.java:1835
+#: build/trans_presets.java:1841 build/trans_presets.java:1847
+#: build/trans_presets.java:1853 build/trans_presets.java:1859
+#: build/trans_presets.java:1865 build/trans_presets.java:1871
+#: build/trans_presets.java:1877 build/trans_presets.java:1883
+#: build/trans_presets.java:1889 build/trans_presets.java:1895
+#: build/trans_presets.java:1901 build/trans_presets.java:1907
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1929 build/trans_presets.java:1937
+#: build/trans_presets.java:1943 build/trans_presets.java:1949
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
 msgid "stadium"
 msgstr "стадион"
 
-#: trans_presets.java:1801
+#: build/trans_presets.java:1831
 msgid "10pin"
 msgstr "10штырьковый"
 
-#: trans_presets.java:1802
+#. item
+#: build/trans_presets.java:1832
 msgid "Edit 10pin"
 msgstr ""
 
-#: trans_presets.java:1807
+#: build/trans_presets.java:1837
 msgid "Athletics"
 msgstr "Атлетика"
 
-#: trans_presets.java:1808
+#. item
+#: build/trans_presets.java:1838
 msgid "Edit Athletics"
 msgstr "Править атлетику"
 
-#: trans_presets.java:1813
+#: build/trans_presets.java:1843
 msgid "Archery"
 msgstr "Стрельба из лука"
 
-#: trans_presets.java:1814
+#. item
+#: build/trans_presets.java:1844
 msgid "Edit Archery"
 msgstr "Править стрельбу из лука"
 
-#: trans_presets.java:1819
+#: build/trans_presets.java:1849
 msgid "Climbing"
 msgstr "Скалолазанье"
 
-#: trans_presets.java:1820
+#. item
+#: build/trans_presets.java:1850
 msgid "Edit Climbing"
 msgstr "Править скалолазанье"
 
-#: trans_presets.java:1825
+#: build/trans_presets.java:1855
 msgid "Canoeing"
 msgstr "Каноэ"
 
-#: trans_presets.java:1826
+#. item
+#: build/trans_presets.java:1856
 msgid "Edit Canoeing"
 msgstr "Править каноэ"
 
-#: trans_presets.java:1831
+#: build/trans_presets.java:1861
 msgid "Cycling"
 msgstr "Велоспорт"
 
-#: trans_presets.java:1832
+#. item
+#: build/trans_presets.java:1862
 msgid "Edit Cycling"
 msgstr "Править велоспорт"
 
-#: trans_presets.java:1837
+#: build/trans_presets.java:1867
 msgid "Dog Racing"
 msgstr "Собачьи бега"
 
-#: trans_presets.java:1838
+#. item
+#: build/trans_presets.java:1868
 msgid "Edit Dog Racing"
 msgstr "Править собачьи бега"
 
-#: trans_presets.java:1843
+#: build/trans_presets.java:1873
 msgid "Equestrian"
 msgstr ""
 
-#: trans_presets.java:1844
+#. item
+#: build/trans_presets.java:1874
 msgid "Edit Equestrian"
 msgstr ""
 
-#: trans_presets.java:1849
+#: build/trans_presets.java:1879
 msgid "Horse Racing"
 msgstr "Лошадиные бега"
 
-#: trans_presets.java:1850
+#. item
+#: build/trans_presets.java:1880
 msgid "Edit Horse Racing"
 msgstr "Править лошадиные бега"
 
-#: trans_presets.java:1855
+#: build/trans_presets.java:1885
 msgid "Gymnastics"
 msgstr "Гимнастика"
 
-#: trans_presets.java:1856
+#. item
+#: build/trans_presets.java:1886
 msgid "Edit Gymnastics"
 msgstr "Править гимнастику"
 
-#: trans_presets.java:1861
+#: build/trans_presets.java:1891
 msgid "Motor Sports"
 msgstr "Моторные виды спорта"
 
-#: trans_presets.java:1862
+#. item
+#: build/trans_presets.java:1892
 msgid "Edit Motor Sports"
 msgstr "Править моторные виды спорта"
 
-#: trans_presets.java:1867
+#: build/trans_presets.java:1897
 msgid "Skating"
 msgstr "Фигурное катание"
 
-#: trans_presets.java:1868
+#. item
+#: build/trans_presets.java:1898
 msgid "Edit Skating"
 msgstr "Править фигурное катание"
 
-#: trans_presets.java:1873
+#: build/trans_presets.java:1903
 msgid "Skateboard"
 msgstr "Скейтборд"
 
-#: trans_presets.java:1874
+#. item
+#: build/trans_presets.java:1904
 msgid "Edit Skateboard"
 msgstr "Править скейтборд"
 
-#: trans_presets.java:1879
+#: build/trans_presets.java:1909
 msgid "Swimming"
 msgstr "Плаванье"
 
-#: trans_presets.java:1880
+#. item
+#: build/trans_presets.java:1910
 msgid "Edit Swimming"
 msgstr "Править плаванье"
 
-#: trans_presets.java:1885
+#: build/trans_presets.java:1915
 msgid "Skiing"
 msgstr "Лыжный спорт"
 
-#: trans_presets.java:1887
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
+#: build/trans_presets.java:1917
 msgid "Edit Skiing"
 msgstr "Править лыжный сопрт"
 
-#: trans_presets.java:1890
+#. item "Sport/Skiing" text "Name"
+#: build/trans_presets.java:1920
 msgid "Piste type"
 msgstr ""
 
-#: trans_presets.java:1890
+#. item "Sport/Skiing" combo "Piste type"
+#: build/trans_presets.java:1920
 msgid "downhill"
 msgstr ""
 
-#: trans_presets.java:1890
+#: build/trans_presets.java:1920
 msgid "nordic"
 msgstr ""
 
-#: trans_presets.java:1890
+#: build/trans_presets.java:1920
 msgid "snow_park"
 msgstr ""
 
-#: trans_presets.java:1891
+#: build/trans_presets.java:1921
 msgid "Difficulty"
 msgstr "Сложность"
 
-#: trans_presets.java:1891
+#. item "Sport/Skiing" combo "Difficulty"
+#: build/trans_presets.java:1921
 msgid "novice"
 msgstr "новичок"
 
-#: trans_presets.java:1891
+#: build/trans_presets.java:1921
 msgid "easy"
 msgstr "лёгкий"
 
-#: trans_presets.java:1891
+#: build/trans_presets.java:1921
 msgid "intermedia"
 msgstr "средний"
 
-#: trans_presets.java:1891
+#: build/trans_presets.java:1921
 msgid "advance"
 msgstr "продвинутый"
 
-#: trans_presets.java:1891
+#: build/trans_presets.java:1921
 msgid "expert"
 msgstr "эксперт"
 
-#: trans_presets.java:1891
+#: build/trans_presets.java:1921
 msgid "freeride"
 msgstr "свободный"
 
-#: trans_presets.java:1894
+#: build/trans_presets.java:1924
 msgid "Shooting"
 msgstr "Стрельба"
 
-#: trans_presets.java:1896
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
+#: build/trans_presets.java:1926
 msgid "Edit Shooting"
 msgstr "Править стрельбу"
 
-#: trans_presets.java:1902
+#: build/trans_presets.java:1932
 msgid "Sport (Ball)"
 msgstr "Спорт (с мячом)"
 
-#: trans_presets.java:1903
+#. group "Sport (Ball)"
+#: build/trans_presets.java:1933
 msgid "Soccer"
 msgstr "Футбол"
 
-#: trans_presets.java:1904
+#. item
+#: build/trans_presets.java:1934
 msgid "Edit Soccer"
 msgstr "Править футбол"
 
-#: trans_presets.java:1909
+#: build/trans_presets.java:1939
 msgid "Football"
 msgstr "Американский футбол"
 
-#: trans_presets.java:1910
+#. item
+#: build/trans_presets.java:1940
 msgid "Edit Football"
 msgstr "Править американский футбол"
 
-#: trans_presets.java:1915
+#: build/trans_presets.java:1945
 msgid "Australian Football"
 msgstr "Австралийский футбол"
 
-#: trans_presets.java:1916
+#. item
+#: build/trans_presets.java:1946
 msgid "Edit Australian Football"
 msgstr "Править австралийский футбол"
 
-#: trans_presets.java:1921
+#: build/trans_presets.java:1951
 msgid "Baseball"
 msgstr "Бейсбол"
 
-#: trans_presets.java:1922
+#. item
+#: build/trans_presets.java:1952
 msgid "Edit Baseball"
 msgstr "Править бейсбол"
 
-#: trans_presets.java:1927
+#: build/trans_presets.java:1957
 msgid "Basketball"
 msgstr "Баскетбол"
 
-#: trans_presets.java:1928
+#. item
+#: build/trans_presets.java:1958
 msgid "Edit Basketball"
 msgstr "Править баскетбол"
 
-#: trans_presets.java:1933
+#: build/trans_presets.java:1963
 msgid "Golf"
 msgstr "Гольф"
 
-#: trans_presets.java:1934
+#. item
+#: build/trans_presets.java:1964
 msgid "Edit Golf"
 msgstr "Править гольф"
 
-#: trans_presets.java:1937
+#. item "Sport (Ball)/Golf" combo "type"
+#: build/trans_presets.java:1967
 msgid "golf_course"
 msgstr "поле для гольфа"
 
-#: trans_presets.java:1939
+#: build/trans_presets.java:1969
 msgid "Boule"
 msgstr ""
 
-#: trans_presets.java:1940
+#. item
+#: build/trans_presets.java:1970
 msgid "Edit Boule"
 msgstr ""
 
-#: trans_presets.java:1945
+#: build/trans_presets.java:1975
 msgid "Bowls"
 msgstr ""
 
-#: trans_presets.java:1946
+#. item
+#: build/trans_presets.java:1976
 msgid "Edit Bowls"
 msgstr ""
 
-#: trans_presets.java:1951
+#: build/trans_presets.java:1981
 msgid "Cricket"
 msgstr ""
 
-#: trans_presets.java:1952
+#. item
+#: build/trans_presets.java:1982
 msgid "Edit Cricket"
 msgstr ""
 
-#: trans_presets.java:1957
+#: build/trans_presets.java:1987
 msgid "Cricket Nets"
 msgstr ""
 
-#: trans_presets.java:1958
+#. item
+#: build/trans_presets.java:1988
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: trans_presets.java:1963
+#: build/trans_presets.java:1993
 msgid "Croquet"
 msgstr ""
 
-#: trans_presets.java:1964
+#. item
+#: build/trans_presets.java:1994
 msgid "Edit Croquet"
 msgstr ""
 
-#: trans_presets.java:1969
+#: build/trans_presets.java:1999
 msgid "Hockey"
 msgstr "Хоккей"
 
-#: trans_presets.java:1970
+#. item
+#: build/trans_presets.java:2000
 msgid "Edit Hockey"
 msgstr "Править хоккей"
 
-#: trans_presets.java:1975
+#: build/trans_presets.java:2005
 msgid "Pelota"
 msgstr ""
 
-#: trans_presets.java:1976
+#. item
+#: build/trans_presets.java:2006
 msgid "Edit Pelota"
 msgstr ""
 
-#: trans_presets.java:1981
+#: build/trans_presets.java:2011
 msgid "Racquet"
 msgstr ""
 
-#: trans_presets.java:1982
+#. item
+#: build/trans_presets.java:2012
 msgid "Edit Racquet"
 msgstr ""
 
-#: trans_presets.java:1987
+#: build/trans_presets.java:2017
 msgid "Rugby"
 msgstr "Регби"
 
-#: trans_presets.java:1988
+#. item
+#: build/trans_presets.java:2018
 msgid "Edit Rugby"
 msgstr "Править рэгби"
 
-#: trans_presets.java:1993
+#: build/trans_presets.java:2023
 msgid "Table Tennis"
 msgstr "Настольный теннис"
 
-#: trans_presets.java:1994
+#. item
+#: build/trans_presets.java:2024
 msgid "Edit Table Tennis"
 msgstr "Править настольный теннис"
 
-#: trans_presets.java:1999
+#: build/trans_presets.java:2029
 msgid "Tennis"
 msgstr "Теннис"
 
-#: trans_presets.java:2000
+#. item
+#: build/trans_presets.java:2030
 msgid "Edit Tennis"
 msgstr "Править теннис"
 
-#: trans_presets.java:2007
+#. <separator/>
+#: build/trans_presets.java:2037
 msgid "Buildings"
 msgstr "Здания"
 
-#: trans_presets.java:2008
+#. group "Buildings"
+#: build/trans_presets.java:2038
 msgid "Building"
 msgstr "Здание"
 
-#: trans_presets.java:2011
+#. item
+#. <key key="building" value="yes" />
+#: build/trans_presets.java:2041
 msgid "Public Building"
 msgstr "Общественное здание"
 
-#: trans_presets.java:2013
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
+#: build/trans_presets.java:2043
 msgid "Edit Public Building"
 msgstr "Править общественное здание"
 
-#: trans_presets.java:2017
+#. item "Buildings/Public Building" text "Name"
+#: build/trans_presets.java:2047
 msgid "Town hall"
 msgstr "Муниципалитет"
 
-#: trans_presets.java:2019
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
+#: build/trans_presets.java:2049
 msgid "Edit Town hall"
 msgstr "Править здание муниципалитета"
 
-#: trans_presets.java:2023
+#. item "Buildings/Town hall" text "Name"
+#: build/trans_presets.java:2053
 msgid "Embassy"
 msgstr "Посольство"
 
-#: trans_presets.java:2025
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
+#: build/trans_presets.java:2055
 msgid "Edit Embassy"
 msgstr "Править посольство"
 
-#: trans_presets.java:2029
+#. item "Buildings/Embassy" text "Name"
+#: build/trans_presets.java:2059
 msgid "Courthouse"
 msgstr "Здание суда"
 
-#: trans_presets.java:2032
+#. item
+#. <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:2062
 msgid "Edit Courthouse"
 msgstr "Править здание суда"
 
-#: trans_presets.java:2036
+#. item "Buildings/Courthouse" text "Name"
+#: build/trans_presets.java:2066
 msgid "Prison"
 msgstr "Тюрьма"
 
-#: trans_presets.java:2039
+#. item
+#. <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:2069
 msgid "Edit Prison"
 msgstr "Править тюрьму"
 
-#: trans_presets.java:2043
+#. item "Buildings/Prison" text "Name"
+#: build/trans_presets.java:2073
 msgid "Police"
 msgstr "Полиция/Милиция"
 
-#: trans_presets.java:2047
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=police"
+#. 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:2077
 msgid "Edit Police"
 msgstr "Править полицию"
 
-#: trans_presets.java:2051
+#. item "Buildings/Police" text "Name"
+#: build/trans_presets.java:2081
 msgid "Fire Station"
 msgstr "Пожарное депо"
 
-#: trans_presets.java:2054
+#. item
+#. <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:2084
 msgid "Edit Fire Station"
 msgstr "Править пожарное депо"
 
-#: trans_presets.java:2058
+#. item "Buildings/Fire Station" text "Name"
+#: build/trans_presets.java:2088
 msgid "Post Office"
 msgstr "Почтовое отделение"
 
-#: trans_presets.java:2060
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
+#: build/trans_presets.java:2090
 msgid "Edit Post Office"
 msgstr "Править почтовое отделение"
 
-#: trans_presets.java:2065
+#. item "Buildings/Post Office" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2095
 msgid "Kindergarten"
 msgstr "Детский сад"
 
-#: trans_presets.java:2066
+#. item
+#: build/trans_presets.java:2096
 msgid "Edit Kindergarten"
 msgstr "Править детсад"
 
-#: trans_presets.java:2070
+#. item "Buildings/Kindergarten" text "Name"
+#: build/trans_presets.java:2100
 msgid "School"
 msgstr "Школа"
 
-#: trans_presets.java:2072
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
+#: build/trans_presets.java:2102
 msgid "Edit School"
 msgstr "Править школу"
 
-#: trans_presets.java:2076
+#. item "Buildings/School" text "Name"
+#: build/trans_presets.java:2106
 msgid "University"
 msgstr "Университет"
 
-#: trans_presets.java:2078
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
+#: build/trans_presets.java:2108
 msgid "Edit University"
 msgstr "Править университет"
 
-#: trans_presets.java:2082
+#. item "Buildings/University" text "Name"
+#: build/trans_presets.java:2112
 msgid "College"
 msgstr "Колледж"
 
-#: trans_presets.java:2084
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
+#: build/trans_presets.java:2114
 msgid "Edit College"
 msgstr "Править колледж"
 
-#: trans_presets.java:2089
+#. item "Buildings/College" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2119
 msgid "Cinema"
 msgstr "Кинотеатр"
 
-#: trans_presets.java:2092
+#. item
+#. <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:2122
 msgid "Edit Cinema"
 msgstr "Править кинотеатр"
 
-#: trans_presets.java:2096
+#. item "Buildings/Cinema" text "Name"
+#: build/trans_presets.java:2126
 msgid "Library"
 msgstr "Библиотека"
 
-#: trans_presets.java:2099
+#. item
+#. <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:2129
 msgid "Edit Library"
 msgstr "Править библиотеку"
 
-#: trans_presets.java:2103
+#. item "Buildings/Library" text "Name"
+#: build/trans_presets.java:2133
 msgid "Arts Centre"
 msgstr "Центр искусств"
 
-#: trans_presets.java:2105
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
+#: build/trans_presets.java:2135
 msgid "Edit Arts Centre"
 msgstr "Править центр искусств"
 
-#: trans_presets.java:2109
+#. item "Buildings/Arts Centre" text "Name"
+#: build/trans_presets.java:2139
 msgid "Theatre"
 msgstr "Театр"
 
-#: trans_presets.java:2112
+#. item
+#. <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:2142
 msgid "Edit Theatre"
 msgstr "Править театр"
 
-#: trans_presets.java:2116
+#. item "Buildings/Theatre" text "Name"
+#: build/trans_presets.java:2146
 msgid "Place of Worship"
 msgstr "Место поклонения"
 
-#: trans_presets.java:2120
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
+#. 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:2150
 msgid "Edit Place of Worship"
 msgstr "Править место поклонения"
 
-#: trans_presets.java:2123 trans_presets.java:2809 trans_presets.java:2818
+#. item "Buildings/Place of Worship" text "Name"
+#. item "Land use/Graveyard" text "Name"
+#. item "Land use/Cemetery" text "Name"
+#: build/trans_presets.java:2153 build/trans_presets.java:2839
+#: build/trans_presets.java:2848
 msgid "Religion"
 msgstr "Религия"
 
-#: trans_presets.java:2123 trans_presets.java:2809 trans_presets.java:2818
+#. item "Buildings/Place of Worship" combo "Religion"
+#. item "Land use/Graveyard" combo "Religion"
+#. item "Land use/Cemetery" combo "Religion"
+#: build/trans_presets.java:2153 build/trans_presets.java:2839
+#: build/trans_presets.java:2848
 msgid "bahai"
 msgstr "Бахаи"
 
-#: trans_presets.java:2123 trans_presets.java:2809 trans_presets.java:2818
+#: build/trans_presets.java:2153 build/trans_presets.java:2839
+#: build/trans_presets.java:2848
 msgid "buddhist"
 msgstr "Буддизм"
 
-#: trans_presets.java:2123 trans_presets.java:2809 trans_presets.java:2818
+#: build/trans_presets.java:2153 build/trans_presets.java:2839
+#: build/trans_presets.java:2848
 msgid "christian"
 msgstr "Христианство"
 
-#: trans_presets.java:2123 trans_presets.java:2809 trans_presets.java:2818
+#: build/trans_presets.java:2153 build/trans_presets.java:2839
+#: build/trans_presets.java:2848
 msgid "hindu"
 msgstr "Индуизм"
 
-#: trans_presets.java:2123 trans_presets.java:2809 trans_presets.java:2818
+#: build/trans_presets.java:2153 build/trans_presets.java:2839
+#: build/trans_presets.java:2848
 msgid "jain"
 msgstr "Джайнизм"
 
-#: trans_presets.java:2123 trans_presets.java:2809 trans_presets.java:2818
+#: build/trans_presets.java:2153 build/trans_presets.java:2839
+#: build/trans_presets.java:2848
 msgid "jewish"
 msgstr "Иудаизм"
 
-#: trans_presets.java:2123 trans_presets.java:2809 trans_presets.java:2818
+#: build/trans_presets.java:2153 build/trans_presets.java:2839
+#: build/trans_presets.java:2848
 msgid "muslim"
 msgstr "Мусульманство"
 
-#: trans_presets.java:2123 trans_presets.java:2809 trans_presets.java:2818
+#: build/trans_presets.java:2153 build/trans_presets.java:2839
+#: build/trans_presets.java:2848
 msgid "sikh"
 msgstr "сикхизм"
 
-#: trans_presets.java:2123 trans_presets.java:2809 trans_presets.java:2818
+#: build/trans_presets.java:2153 build/trans_presets.java:2839
+#: build/trans_presets.java:2848
 msgid "spiritualist"
 msgstr "Спиритуализм"
 
-#: trans_presets.java:2123 trans_presets.java:2809 trans_presets.java:2818
+#: build/trans_presets.java:2153 build/trans_presets.java:2839
+#: build/trans_presets.java:2848
 msgid "taoist"
 msgstr "Даосизм"
 
-#: trans_presets.java:2123 trans_presets.java:2809 trans_presets.java:2818
+#: build/trans_presets.java:2153 build/trans_presets.java:2839
+#: build/trans_presets.java:2848
 msgid "unitarianist"
 msgstr "унитаризм"
 
-#: trans_presets.java:2123 trans_presets.java:2809 trans_presets.java:2818
+#: build/trans_presets.java:2153 build/trans_presets.java:2839
+#: build/trans_presets.java:2848
 msgid "zoroastrian"
 msgstr "зороастризм"
 
-#: trans_presets.java:2124 trans_presets.java:2810 trans_presets.java:2819
+#: build/trans_presets.java:2154 build/trans_presets.java:2840
+#: build/trans_presets.java:2849
 msgid "Denomination"
 msgstr "Конфессия"
 
-#: trans_presets.java:2124 trans_presets.java:2810 trans_presets.java:2819
+#. item "Buildings/Place of Worship" combo "Denomination"
+#. item "Land use/Graveyard" combo "Denomination"
+#. item "Land use/Cemetery" combo "Denomination"
+#: build/trans_presets.java:2154 build/trans_presets.java:2840
+#: build/trans_presets.java:2849
 msgid "anglican"
 msgstr "Англиканская"
 
-#: trans_presets.java:2124 trans_presets.java:2810 trans_presets.java:2819
+#: build/trans_presets.java:2154 build/trans_presets.java:2840
+#: build/trans_presets.java:2849
 msgid "baptist"
 msgstr "Баптизм"
 
-#: trans_presets.java:2124 trans_presets.java:2810 trans_presets.java:2819
+#: build/trans_presets.java:2154 build/trans_presets.java:2840
+#: build/trans_presets.java:2849
 msgid "catholic"
 msgstr "Католическая"
 
-#: trans_presets.java:2124 trans_presets.java:2810 trans_presets.java:2819
+#: build/trans_presets.java:2154 build/trans_presets.java:2840
+#: build/trans_presets.java:2849
 msgid "evangelical"
 msgstr "Евангельская"
 
-#: trans_presets.java:2124 trans_presets.java:2810 trans_presets.java:2819
+#: build/trans_presets.java:2154 build/trans_presets.java:2840
+#: build/trans_presets.java:2849
 msgid "jehovahs_witness"
 msgstr "Свидетели Иеговы"
 
-#: trans_presets.java:2124 trans_presets.java:2810 trans_presets.java:2819
+#: build/trans_presets.java:2154 build/trans_presets.java:2840
+#: build/trans_presets.java:2849
 msgid "lutheran"
 msgstr "Лютеранство"
 
-#: trans_presets.java:2124 trans_presets.java:2810 trans_presets.java:2819
+#: build/trans_presets.java:2154 build/trans_presets.java:2840
+#: build/trans_presets.java:2849
 msgid "methodist"
 msgstr "Методизм"
 
-#: trans_presets.java:2124 trans_presets.java:2810 trans_presets.java:2819
+#: build/trans_presets.java:2154 build/trans_presets.java:2840
+#: build/trans_presets.java:2849
 msgid "mormon"
 msgstr "Мормон"
 
-#: trans_presets.java:2124 trans_presets.java:2810 trans_presets.java:2819
+#: build/trans_presets.java:2154 build/trans_presets.java:2840
+#: build/trans_presets.java:2849
 msgid "orthodox"
 msgstr "Православие"
 
-#: trans_presets.java:2124 trans_presets.java:2810 trans_presets.java:2819
+#: build/trans_presets.java:2154 build/trans_presets.java:2840
+#: build/trans_presets.java:2849
 msgid "pentecostal"
 msgstr ""
 
-#: trans_presets.java:2124 trans_presets.java:2810 trans_presets.java:2819
+#: build/trans_presets.java:2154 build/trans_presets.java:2840
+#: build/trans_presets.java:2849
 msgid "presbyterian"
 msgstr ""
 
-#: trans_presets.java:2124 trans_presets.java:2810 trans_presets.java:2819
+#: build/trans_presets.java:2154 build/trans_presets.java:2840
+#: build/trans_presets.java:2849
 msgid "protestant"
 msgstr "Протестантизм"
 
-#: trans_presets.java:2124 trans_presets.java:2810 trans_presets.java:2819
+#: build/trans_presets.java:2154 build/trans_presets.java:2840
+#: build/trans_presets.java:2849
 msgid "quaker"
 msgstr ""
 
-#: trans_presets.java:2124 trans_presets.java:2810 trans_presets.java:2819
+#: build/trans_presets.java:2154 build/trans_presets.java:2840
+#: build/trans_presets.java:2849
 msgid "shia"
 msgstr "шиизм"
 
-#: trans_presets.java:2124 trans_presets.java:2810 trans_presets.java:2819
+#: build/trans_presets.java:2154 build/trans_presets.java:2840
+#: build/trans_presets.java:2849
 msgid "sunni"
 msgstr "суннизм"
 
-#: trans_presets.java:2127
+#. <separator/>
+#: build/trans_presets.java:2157
 msgid "Addresses"
 msgstr "Адреса"
 
-#: trans_presets.java:2130
+#. item
+#. <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:2160
 msgid "Edit address information"
 msgstr "Править адреса"
 
-#: trans_presets.java:2132
+#. item "Buildings/Addresses" label "Edit address information"
+#. <space />
+#: build/trans_presets.java:2162
 msgid "House number"
 msgstr "Номер дома"
 
-#: trans_presets.java:2134
+#. item "Buildings/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:2164
 msgid "House name"
 msgstr "Название дома"
 
-#: trans_presets.java:2135
+#. item "Buildings/Addresses" text "House name"
+#: build/trans_presets.java:2165
 msgid "Street name"
 msgstr "Название улицы"
 
-#: trans_presets.java:2136
+#. item "Buildings/Addresses" text "Street name"
+#: build/trans_presets.java:2166
 msgid "City name"
 msgstr "Название города"
 
-#: trans_presets.java:2137
+#. item "Buildings/Addresses" text "City name"
+#: build/trans_presets.java:2167
 msgid "Post code"
 msgstr "Почтовый индекс"
 
-#: trans_presets.java:2138
+#. item "Buildings/Addresses" text "Post code"
+#: build/trans_presets.java:2168
 msgid "Country code"
 msgstr "Код страны"
 
-#: trans_presets.java:2141
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: build/trans_presets.java:2171
 msgid "Address Interpolation"
 msgstr "Интерполяция адресов"
 
-#: trans_presets.java:2144
+#. item
+#. <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:2174
 msgid "Edit address interpolation"
 msgstr "Править интерполяцию адресов"
 
-#: trans_presets.java:2146
+#. item "Buildings/Address Interpolation" label "Edit address interpolation"
+#. <space />
+#: build/trans_presets.java:2176
 msgid "Numbering scheme"
 msgstr "Схема нумерации"
 
-#: trans_presets.java:2146
+#. item "Buildings/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:2176
 msgid "odd"
 msgstr "нечётные"
 
-#: trans_presets.java:2146
+#: build/trans_presets.java:2176
 msgid "even"
 msgstr "чётные"
 
-#: trans_presets.java:2146
+#: build/trans_presets.java:2176
 msgid "all"
 msgstr "все"
 
-#: trans_presets.java:2149
+#: build/trans_presets.java:2179
 msgid "Man Made"
 msgstr "Рукотворное"
 
-#: trans_presets.java:2150
+#. group "Man Made"
+#: build/trans_presets.java:2180
 msgid "Works"
 msgstr "Цеха"
 
-#: trans_presets.java:2151
+#. item
+#: build/trans_presets.java:2181
 msgid "Edit Works"
 msgstr "Править цеха"
 
-#: trans_presets.java:2155
+#. item "Man Made/Works" text "Name"
+#: build/trans_presets.java:2185
 msgid "Tower"
 msgstr "Башня"
 
-#: trans_presets.java:2156
+#. item
+#: build/trans_presets.java:2186
 msgid "Edit Tower"
 msgstr "Править башню"
 
-#: trans_presets.java:2160
+#. item "Man Made/Tower" text "Name"
+#: build/trans_presets.java:2190
 msgid "Water Tower"
 msgstr "Водонапорная башня"
 
-#: trans_presets.java:2161
+#. item
+#: build/trans_presets.java:2191
 msgid "Edit Water Tower"
 msgstr "Править водонапорную башню"
 
-#: trans_presets.java:2165
+#. item "Man Made/Water Tower" text "Name"
+#: build/trans_presets.java:2195
 msgid "Gasometer"
 msgstr "Газгольдер"
 
-#: trans_presets.java:2166
+#. item
+#: build/trans_presets.java:2196
 msgid "Edit Gasometer"
 msgstr "Править газгольдер"
 
-#: trans_presets.java:2170
+#. item "Man Made/Gasometer" text "Name"
+#: build/trans_presets.java:2200
 msgid "Lighthouse"
 msgstr "Маяк"
 
-#: trans_presets.java:2172
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
+#: build/trans_presets.java:2202
 msgid "Edit Lighthouse"
 msgstr "Править маяк"
 
-#: trans_presets.java:2176
+#. item "Man Made/Lighthouse" text "Name"
+#: build/trans_presets.java:2206
 msgid "Windmill"
 msgstr "Ветряная мельница"
 
-#: trans_presets.java:2178
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
+#: build/trans_presets.java:2208
 msgid "Edit Windmill"
 msgstr "Править ветряную мельницу"
 
-#: trans_presets.java:2182
+#. item "Man Made/Windmill" text "Name"
+#: build/trans_presets.java:2212
 msgid "Pipeline"
 msgstr "Трубопровод"
 
-#: trans_presets.java:2184
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
+#: build/trans_presets.java:2214
 msgid "Edit Pipeline"
 msgstr "Править трубопровод"
 
-#: trans_presets.java:2188
+#. item "Man Made/Pipeline" text "Name"
+#: build/trans_presets.java:2218
 msgid "Wastewater Plant"
 msgstr "Очистные сооружения"
 
-#: trans_presets.java:2192
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=wastewater_plant"
+#. 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:2222
 msgid "Edit Wastewater Plant"
 msgstr "Править очистные сооружения"
 
-#: trans_presets.java:2196
+#. item "Man Made/Wastewater Plant" text "Name"
+#: build/trans_presets.java:2226
 msgid "Crane"
 msgstr "Кран"
 
-#: trans_presets.java:2198
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
+#: build/trans_presets.java:2228
 msgid "Edit Crane"
 msgstr "Править кран"
 
-#: trans_presets.java:2202
+#. item "Man Made/Crane" text "Name"
+#: build/trans_presets.java:2232
 msgid "Beacon"
 msgstr "Буй"
 
-#: trans_presets.java:2204
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
+#: build/trans_presets.java:2234
 msgid "Edit Beacon"
 msgstr "Править буй"
 
-#: trans_presets.java:2208
+#. item "Man Made/Beacon" text "Name"
+#: build/trans_presets.java:2238
 msgid "Survey Point"
 msgstr "Точка наблюдений"
 
-#: trans_presets.java:2210
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
+#: build/trans_presets.java:2240
 msgid "Edit Survey Point"
 msgstr "Править точку наблюдений"
 
-#: trans_presets.java:2214
+#. item "Man Made/Survey Point" text "Name"
+#: build/trans_presets.java:2244
 msgid "Surveillance"
 msgstr "Видеонаблюдение"
 
-#: trans_presets.java:2216
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
+#: build/trans_presets.java:2246
 msgid "Edit Surveillance Camera"
 msgstr "Править видеонаблюдение"
 
-#: trans_presets.java:2221
+#. item "Man Made/Surveillance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2251
 msgid "Power Generator"
 msgstr "Генератор энергии"
 
-#: trans_presets.java:2225
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=generator"
+#. 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:2255
 msgid "Edit Power Generator"
 msgstr "Править генератор энергии"
 
-#: trans_presets.java:2227
+#. item "Man Made/Power Generator" combo "Type"
+#: build/trans_presets.java:2257
 msgid "wind"
 msgstr "энергия ветра"
 
-#: trans_presets.java:2227
+#: build/trans_presets.java:2257
 msgid "hydro"
 msgstr "энергия воды"
 
-#: trans_presets.java:2227
+#: build/trans_presets.java:2257
 msgid "fossil"
 msgstr "энергия сгорания топлива"
 
-#: trans_presets.java:2227
+#: build/trans_presets.java:2257
 msgid "nuclear"
 msgstr "атомный"
 
-#: trans_presets.java:2227
+#: build/trans_presets.java:2257
 msgid "coal"
 msgstr "уголь"
 
-#: trans_presets.java:2227
+#: build/trans_presets.java:2257
 msgid "photovoltaic"
 msgstr "энергия солнца"
 
-#: trans_presets.java:2227
+#: build/trans_presets.java:2257
 msgid "gas"
 msgstr "газ"
 
-#: trans_presets.java:2230
+#. item "Man Made/Power Generator" text "Name"
+#: build/trans_presets.java:2260
 msgid "Power Station"
 msgstr "Электростанция"
 
-#: trans_presets.java:2233
+#. item
+#. <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:2263
 msgid "Edit power station"
 msgstr "Править электростанцию"
 
-#: trans_presets.java:2237
+#. item "Man Made/Power Station" text "Operator"
+#: build/trans_presets.java:2267
 msgid "Power Sub Station"
 msgstr "Электроподстанция"
 
-#: trans_presets.java:2240
+#. item
+#. <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:2270
 msgid "Edit power sub station"
 msgstr "Править подстанцию"
 
-#: trans_presets.java:2243 trans_presets.java:2259
+#. item "Man Made/Power Sub Station" text "Operator"
+#. item "Man Made/Power Line" text "Operator"
+#: build/trans_presets.java:2273 build/trans_presets.java:2289
 msgid "Line reference"
 msgstr ""
 
-#: trans_presets.java:2245
+#. item "Man Made/Power Sub Station" text "Line reference"
+#: build/trans_presets.java:2275
 msgid "Power Tower"
 msgstr "Опора ЛЭП"
 
-#: trans_presets.java:2250
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=tower"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=tower"
+#. 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:2280
 msgid "Edit Power Tower"
 msgstr "Править опору ЛЭП"
 
-#: trans_presets.java:2253
+#. item "Man Made/Power Tower" label "Edit Power Tower"
+#. <key key="power" value="tower" />
+#: build/trans_presets.java:2283
 msgid "Power Line"
 msgstr "Линия электропередач"
 
-#: trans_presets.java:2256
+#. item
+#. <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:2286
 msgid "Edit power line"
 msgstr "Править линию электропередач"
 
-#: trans_presets.java:2260
+#. item "Man Made/Power Line" text "Line reference"
+#: build/trans_presets.java:2290
 msgid "Voltage"
 msgstr "Напряжение"
 
-#: trans_presets.java:2261
+#. item "Man Made/Power Line" text "Voltage"
+#: build/trans_presets.java:2291
 msgid "Amount of Wires"
 msgstr "Количество кабелей"
 
-#: trans_presets.java:2264
+#. item "Man Made/Power Line" text "Amount of Wires"
+#: build/trans_presets.java:2294
 msgid "Amenities"
 msgstr "Удобства"
 
-#: trans_presets.java:2265
+#. group "Amenities"
+#: build/trans_presets.java:2295
 msgid "Toilets"
 msgstr "Туалеты"
 
-#: trans_presets.java:2270 trans_presets.java:2362
+#. item "Amenities/Toilets" text "Operator"
+#. item "Shops/Vending machine" text "Operator"
+#: build/trans_presets.java:2300 build/trans_presets.java:2392
 msgid "Reference number"
 msgstr ""
 
-#: trans_presets.java:2271
+#. item "Amenities/Toilets" text "Reference number"
+#: build/trans_presets.java:2301
 msgid "Charge"
 msgstr ""
 
-#: trans_presets.java:2272 trans_presets.java:2363
+#. item "Shops/Vending machine" text "Reference number"
+#: build/trans_presets.java:2302 build/trans_presets.java:2393
 msgid "Note"
 msgstr "Примечание"
 
-#: trans_presets.java:2274
+#. item "Amenities/Toilets" text "Note"
+#: build/trans_presets.java:2304
 msgid "Post Box"
 msgstr "Почтовый ящик"
 
-#: trans_presets.java:2279
+#. item "Amenities/Post Box" text "Operator"
+#: build/trans_presets.java:2309
 msgid "Telephone"
 msgstr "Телефон"
 
-#: trans_presets.java:2282
+#. item
+#. <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:2312
 msgid "Edit a Telephone"
 msgstr "Править телефон"
 
-#: trans_presets.java:2285 trans_presets.java:2364
+#. item "Amenities/Telephone" text "Operator"
+#. item "Shops/Vending machine" text "Note"
+#: build/trans_presets.java:2315 build/trans_presets.java:2394
 msgid "Coins"
 msgstr "Монеты"
 
-#: trans_presets.java:2286 trans_presets.java:2365
+#. item "Amenities/Telephone" check "Coins"
+#. item "Shops/Vending machine" check "Coins"
+#: build/trans_presets.java:2316 build/trans_presets.java:2395
 msgid "Notes"
 msgstr "Банкноты"
 
-#: trans_presets.java:2287 trans_presets.java:2366
+#. item "Amenities/Telephone" check "Notes"
+#. item "Shops/Vending machine" check "Notes"
+#: build/trans_presets.java:2317 build/trans_presets.java:2396
 msgid "Electronic purses and Charge cards"
 msgstr "Электронные средства оплаты"
 
-#: trans_presets.java:2288 trans_presets.java:2367
+#. item "Amenities/Telephone" check "Electronic purses and Charge cards"
+#. item "Shops/Vending machine" check "Electronic purses and Charge cards"
+#: build/trans_presets.java:2318 build/trans_presets.java:2397
 msgid "Debit cards"
 msgstr "Дебитные карты"
 
-#: trans_presets.java:2289 trans_presets.java:2368
+#. item "Amenities/Telephone" check "Debit cards"
+#. item "Shops/Vending machine" check "Debit cards"
+#: build/trans_presets.java:2319 build/trans_presets.java:2398
 msgid "Credit cards"
 msgstr "Кредитные карты"
 
-#: trans_presets.java:2290
+#. item "Amenities/Telephone" check "Credit cards"
+#: build/trans_presets.java:2320
 msgid "Telephone cards"
 msgstr "Телефонные карты"
 
-#: trans_presets.java:2292
+#. item "Amenities/Telephone" check "Telephone cards"
+#: build/trans_presets.java:2322
 msgid "Recycling"
 msgstr "Переработка отходов"
 
-#: trans_presets.java:2295
+#. item
+#. <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:2325
 msgid "Edit a Recycling station"
 msgstr "Править переработку отходов"
 
-#: trans_presets.java:2297
+#. item "Amenities/Recycling" label "Edit a Recycling station"
+#. <key key="amenity" value="recycling" />
+#: build/trans_presets.java:2327
 msgid "Batteries"
 msgstr "Батарейки"
 
-#: trans_presets.java:2298
+#. item "Amenities/Recycling" check "Batteries"
+#: build/trans_presets.java:2328
 msgid "Cans"
 msgstr "Консервные банки"
 
-#: trans_presets.java:2299
+#. item "Amenities/Recycling" check "Cans"
+#: build/trans_presets.java:2329
 msgid "Clothes"
 msgstr "Одежда"
 
-#: trans_presets.java:2300
+#. item "Amenities/Recycling" check "Clothes"
+#: build/trans_presets.java:2330
 msgid "Glass"
 msgstr "Стекло"
 
-#: trans_presets.java:2301
+#. item "Amenities/Recycling" check "Glass"
+#: build/trans_presets.java:2331
 msgid "Paper"
 msgstr "Бумага"
 
-#: trans_presets.java:2302
+#. item "Amenities/Recycling" check "Paper"
+#: build/trans_presets.java:2332
 msgid "Scrap Metal"
 msgstr "Металлолом"
 
-#: trans_presets.java:2304
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2334
 msgid "Bench"
 msgstr "Скамейка"
 
-#: trans_presets.java:2308
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
+#. <key key="amenity" value="bench" />
+#: build/trans_presets.java:2338
 msgid "Hunting Stand"
 msgstr "Охотничий стенд"
 
-#: trans_presets.java:2309
+#. item
+#: build/trans_presets.java:2339
 msgid "Edit a Hunting Stand"
 msgstr "Править охотничий стенд"
 
-#: trans_presets.java:2312
+#. item "Amenities/Hunting Stand" check "Shelter"
+#: build/trans_presets.java:2342
 msgid "Hide"
 msgstr ""
 
-#: trans_presets.java:2313
+#. item "Amenities/Hunting Stand" check "Hide"
+#: build/trans_presets.java:2343
 msgid "Lock"
 msgstr ""
 
-#: trans_presets.java:2314 trans_presets.java:2704
+#. item "Amenities/Hunting Stand" check "Lock"
+#. item "Land use/Tree" text "Type"
+#: build/trans_presets.java:2344 build/trans_presets.java:2734
 msgid "Height"
 msgstr "Высота"
 
-#: trans_presets.java:2314
+#. item "Amenities/Hunting Stand" combo "Height"
+#: build/trans_presets.java:2344
 msgid "low"
 msgstr "низкий"
 
-#: trans_presets.java:2314
+#: build/trans_presets.java:2344
 msgid "half"
 msgstr "средний"
 
-#: trans_presets.java:2314
+#: build/trans_presets.java:2344
 msgid "full"
 msgstr "полный"
 
-#: trans_presets.java:2316
+#: build/trans_presets.java:2346
 msgid "Fountain"
 msgstr "Фонтан"
 
-#: trans_presets.java:2319
+#. item
+#. <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:2349
 msgid "Edit a Fountain"
 msgstr "Править фонтан"
 
-#: trans_presets.java:2323
+#. item "Amenities/Fountain" text "Name"
+#: build/trans_presets.java:2353
 msgid "Drinking Water"
 msgstr "Питьевая вода"
 
-#: trans_presets.java:2326
+#. item
+#. <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:2356
 msgid "Edit Drinking Water"
 msgstr "Править источник воды"
 
-#: trans_presets.java:2330
+#. item "Amenities/Drinking Water" text "Name"
+#: build/trans_presets.java:2360
 msgid "Baby Hatch"
 msgstr ""
 
-#: trans_presets.java:2332
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
+#: build/trans_presets.java:2362
 msgid "Edit a Baby Hatch"
 msgstr ""
 
-#: trans_presets.java:2335
-msgid "Opening Hours"
-msgstr "Часы работы"
-
-#: trans_presets.java:2338
+#. item "Amenities/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:2368
 msgid "Shops"
 msgstr "Магазины"
 
-#: trans_presets.java:2339
+#. group "Shops"
+#: build/trans_presets.java:2369
 msgid "Supermarket"
 msgstr "Супермаркет"
 
-#: trans_presets.java:2340
+#. item
+#: build/trans_presets.java:2370
 msgid "Edit Supermarket"
 msgstr "Править супермаркет"
 
-#: trans_presets.java:2344
+#. item "Shops/Supermarket" text "Name"
+#: build/trans_presets.java:2374
 msgid "Convenience Store"
 msgstr "Продуктовый магазин"
 
-#: trans_presets.java:2346
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2376
 msgid "Edit Convenience Store"
 msgstr "Править продуктовый магазин"
 
-#: trans_presets.java:2350
+#. item "Shops/Convenience Store" text "Name"
+#: build/trans_presets.java:2380
 msgid "Kiosk"
 msgstr "Киоск"
 
-#: trans_presets.java:2352
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2382
 msgid "Edit Kiosk"
 msgstr "Править киоск"
 
-#: trans_presets.java:2356
+#. item "Shops/Kiosk" text "Name"
+#: build/trans_presets.java:2386
 msgid "Vending machine"
 msgstr "Торговый автомат"
 
-#: trans_presets.java:2358
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
+#: build/trans_presets.java:2388
 msgid "Edit a Vending machine"
 msgstr "Править торговый автомат"
 
-#: trans_presets.java:2360
+#. item "Shops/Vending machine" label "Edit a Vending machine"
+#. <key key="amenity" value="vending_machine" />
+#: build/trans_presets.java:2390
 msgid "Vending products"
 msgstr "Реализуемая продукция"
 
-#: trans_presets.java:2360
+#. item "Shops/Vending machine" combo "Vending products"
+#: build/trans_presets.java:2390
 msgid "public_transport_tickets"
 msgstr "билеты на общественный транспорт"
 
-#: trans_presets.java:2360
+#: build/trans_presets.java:2390
 msgid "public_transport_plans"
 msgstr ""
 
-#: trans_presets.java:2360
+#: build/trans_presets.java:2390
 msgid "parking_tickets"
 msgstr "билеты на парковку"
 
-#: trans_presets.java:2360
+#: build/trans_presets.java:2390
 msgid "food"
 msgstr "еда"
 
-#: trans_presets.java:2360
+#: build/trans_presets.java:2390
 msgid "drinks"
 msgstr "напитки"
 
-#: trans_presets.java:2360
+#: build/trans_presets.java:2390
 msgid "sweets"
 msgstr "сладости"
 
-#: trans_presets.java:2360
+#: build/trans_presets.java:2390
 msgid "cigarettes"
 msgstr "сигареты"
 
-#: trans_presets.java:2360
+#: build/trans_presets.java:2390
 msgid "photos"
 msgstr "фотографии"
 
-#: trans_presets.java:2360
+#: build/trans_presets.java:2390
 msgid "animal_food"
 msgstr "еда для животных"
 
-#: trans_presets.java:2360
+#: build/trans_presets.java:2390
 msgid "news_papers"
 msgstr "газеты"
 
-#: trans_presets.java:2360
+#: build/trans_presets.java:2390
 msgid "toys"
 msgstr "игрушки"
 
-#: trans_presets.java:2360
+#: build/trans_presets.java:2390
 msgid "stamps"
 msgstr "марки"
 
-#: trans_presets.java:2360
+#: build/trans_presets.java:2390
 msgid "SIM-cards"
 msgstr "SIM-карты"
 
-#: trans_presets.java:2360
+#: build/trans_presets.java:2390
 msgid "telephone_vouchers"
 msgstr ""
 
-#: trans_presets.java:2360
+#: build/trans_presets.java:2390
 msgid "vouchers"
 msgstr ""
 
-#: trans_presets.java:2360
+#: build/trans_presets.java:2390
 msgid "condoms"
 msgstr "презервативы"
 
-#: trans_presets.java:2360
+#: build/trans_presets.java:2390
 msgid "tampons"
 msgstr "тампоны"
 
-#: trans_presets.java:2360
+#: build/trans_presets.java:2390
 msgid "excrement_bags"
 msgstr "пакеты для экскрементов"
 
-#: trans_presets.java:2369
+#. item "Shops/Vending machine" check "Credit cards"
+#: build/trans_presets.java:2399
 msgid "Account or loyalty cards"
 msgstr ""
 
-#: trans_presets.java:2371
+#. item "Shops/Vending machine" check "Account or loyalty cards"
+#: build/trans_presets.java:2401
 msgid "Butcher"
 msgstr "Мясная лавка"
 
-#: trans_presets.java:2373
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2403
 msgid "Edit Butcher"
 msgstr "Править мясную лавку"
 
-#: trans_presets.java:2377
+#. item "Shops/Butcher" text "Name"
+#: build/trans_presets.java:2407
 msgid "Baker"
 msgstr "Булочная"
 
-#: trans_presets.java:2379
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2409
 msgid "Edit Baker"
 msgstr "Править булочную"
 
-#: trans_presets.java:2383
+#. item "Shops/Baker" text "Name"
+#: build/trans_presets.java:2413
 msgid "Florist"
 msgstr "Флорист"
 
-#: trans_presets.java:2385
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2415
 msgid "Edit Florist"
 msgstr "Редактировать флориста"
 
-#: trans_presets.java:2389
+#. item "Shops/Florist" text "Name"
+#: build/trans_presets.java:2419
 msgid "Organic"
 msgstr ""
 
-#: trans_presets.java:2390
+#. item
+#: build/trans_presets.java:2420
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: trans_presets.java:2394
+#. item "Shops/Organic" text "Name"
+#: build/trans_presets.java:2424
 msgid "Beverages"
 msgstr "Напитки"
 
-#: trans_presets.java:2395
+#. item
+#: build/trans_presets.java:2425
 msgid "Edit Beverages  Shop"
 msgstr "Редактировать магазин напитков"
 
-#: trans_presets.java:2399
+#. item "Shops/Beverages" text "Name"
+#: build/trans_presets.java:2429
 msgid "Computer"
 msgstr "Компьютер"
 
-#: trans_presets.java:2400
+#. item
+#: build/trans_presets.java:2430
 msgid "Edit Computer Shop"
 msgstr "Редактировать магазин компьютеров"
 
-#: trans_presets.java:2404
+#. item "Shops/Computer" text "Name"
+#: build/trans_presets.java:2434
 msgid "Electronics"
 msgstr "Электроника"
 
-#: trans_presets.java:2405
+#. item
+#: build/trans_presets.java:2435
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: trans_presets.java:2409
+#. item "Shops/Electronics" text "Name"
+#: build/trans_presets.java:2439
 msgid "Hifi"
 msgstr ""
 
-#: trans_presets.java:2410
+#. item
+#: build/trans_presets.java:2440
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: trans_presets.java:2414
+#. item "Shops/Hifi" text "Name"
+#: build/trans_presets.java:2444
 msgid "Furniture"
 msgstr "Мебельный"
 
-#: trans_presets.java:2415
+#. item
+#: build/trans_presets.java:2445
 msgid "Edit Furniture Shop"
 msgstr "Править мебельный магазин"
 
-#: trans_presets.java:2419
+#. item "Shops/Furniture" text "Name"
+#: build/trans_presets.java:2449
 msgid "Garden Centre"
 msgstr ""
 
-#: trans_presets.java:2421
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2451
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: trans_presets.java:2425
+#. item "Shops/Garden Centre" text "Name"
+#: build/trans_presets.java:2455
 msgid "Hardware"
 msgstr ""
 
-#: trans_presets.java:2427
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2457
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: trans_presets.java:2431
+#. item "Shops/Hardware" text "Name"
+#: build/trans_presets.java:2461
 msgid "Do-it-yourself-store"
 msgstr "Строительный магазин"
 
-#: trans_presets.java:2433
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2463
 msgid "Edit Do-it-yourself-store"
 msgstr "Править строительный магазин"
 
-#: trans_presets.java:2437
+#. item "Shops/Do-it-yourself-store" text "Name"
+#: build/trans_presets.java:2467
 msgid "Stationery"
 msgstr ""
 
-#: trans_presets.java:2438
+#. item
+#: build/trans_presets.java:2468
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: trans_presets.java:2442
+#. item "Shops/Stationery" text "Name"
+#: build/trans_presets.java:2472
 msgid "Hairdresser"
 msgstr "Парикмахерская"
 
-#: trans_presets.java:2443
+#. item
+#: build/trans_presets.java:2473
 msgid "Edit Hairdresser"
 msgstr "Править парихмахерскую"
 
-#: trans_presets.java:2447
+#. item "Shops/Hairdresser" text "Name"
+#: build/trans_presets.java:2477
 msgid "Shoes"
 msgstr "Обувь"
 
-#: trans_presets.java:2448
+#. item
+#: build/trans_presets.java:2478
 msgid "Edit Shoe Shop"
 msgstr "Редактировать обувной магазин"
 
-#: trans_presets.java:2452
+#. item "Shops/Shoes" text "Name"
+#: build/trans_presets.java:2482
 msgid "Toys"
 msgstr "Игрушки"
 
-#: trans_presets.java:2453
+#. item
+#: build/trans_presets.java:2483
 msgid "Edit Toy Shop"
 msgstr "Редактировать магазин игрушек"
 
-#: trans_presets.java:2457
+#. item "Shops/Toys" text "Name"
+#: build/trans_presets.java:2487
 msgid "Video"
 msgstr ""
 
-#: trans_presets.java:2458
+#. item
+#: build/trans_presets.java:2488
 msgid "Edit Video Shop"
 msgstr ""
 
-#: trans_presets.java:2462
+#. item "Shops/Video" text "Name"
+#: build/trans_presets.java:2492
 msgid "Dry Cleaning"
 msgstr "Химчистка"
 
-#: trans_presets.java:2464
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2494
 msgid "Edit Dry Cleaning"
 msgstr "Править химчистку"
 
-#: trans_presets.java:2468
+#. item "Shops/Dry Cleaning" text "Name"
+#: build/trans_presets.java:2498
 msgid "Laundry"
 msgstr "Прачечная"
 
-#: trans_presets.java:2470
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2500
 msgid "Edit Laundry"
 msgstr "Править прачечную"
 
-#: trans_presets.java:2474
+#. item "Shops/Laundry" text "Name"
+#: build/trans_presets.java:2504
 msgid "Outdoor"
 msgstr "Товары для активного отдыха"
 
-#: trans_presets.java:2476
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2506
 msgid "Edit Outdoor Shop"
 msgstr "Править магазин товаров для активного отдыха"
 
-#: trans_presets.java:2480
+#. item "Shops/Outdoor" text "Name"
+#: build/trans_presets.java:2510
 msgid "sports"
 msgstr ""
 
-#: trans_presets.java:2481
+#. item
+#: build/trans_presets.java:2511
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: trans_presets.java:2485
+#. item "Shops/sports" text "Name"
+#: build/trans_presets.java:2515
 msgid "optician"
 msgstr "оптика"
 
-#: trans_presets.java:2486
+#. item
+#: build/trans_presets.java:2516
 msgid "Edit Optician"
 msgstr "Править оптику"
 
-#: trans_presets.java:2492
+#. item "Shops/optician" text "Name"
+#: build/trans_presets.java:2522
 msgid "Cash"
 msgstr "Наличные"
 
-#: trans_presets.java:2493
+#. group "Cash"
+#: build/trans_presets.java:2523
 msgid "Bank"
 msgstr "Банк"
 
-#: trans_presets.java:2495
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+#: build/trans_presets.java:2525
 msgid "Edit Bank"
 msgstr "Править банк"
 
-#: trans_presets.java:2498 trans_presets.java:2506
+#. item "Cash/Bank" text "Name"
+#. item "Cash/Money Exchange" text "Name"
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
 msgid "Automated Teller Machine"
 msgstr "Банкомат"
 
-#: trans_presets.java:2500
+#. item "Cash/Bank" check "Automated Teller Machine"
+#: build/trans_presets.java:2530
 msgid "Money Exchange"
 msgstr "Обмен валют"
 
-#: trans_presets.java:2502
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
+#: build/trans_presets.java:2532
 msgid "Edit Money Exchange"
 msgstr "Править обмен валют"
 
-#: trans_presets.java:2508
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
+#: build/trans_presets.java:2538
 msgid "Edit Automated Teller Machine"
 msgstr "Править банкомат"
 
-#: trans_presets.java:2513
+#. item "Cash/Automated Teller Machine" text "Operator"
+#: build/trans_presets.java:2543
 msgid "Health"
 msgstr "Здоровье"
 
-#: trans_presets.java:2514
+#. group "Health"
+#: build/trans_presets.java:2544
 msgid "Doctors"
 msgstr "Врач"
 
-#: trans_presets.java:2516
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
+#: build/trans_presets.java:2546
 msgid "Edit Doctors"
 msgstr "Править врача"
 
-#: trans_presets.java:2520
+#. item "Health/Doctors" text "Name"
+#: build/trans_presets.java:2550
 msgid "Dentist"
 msgstr "Стоматолог"
 
-#: trans_presets.java:2521
+#. item
+#: build/trans_presets.java:2551
 msgid "Edit Dentist"
 msgstr "Править стоматологию"
 
-#: trans_presets.java:2525
+#. item "Health/Dentist" text "Name"
+#: build/trans_presets.java:2555
 msgid "Pharmacy"
 msgstr "Аптека"
 
-#: trans_presets.java:2527
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
+#: build/trans_presets.java:2557
 msgid "Edit Pharmacy"
 msgstr "Править аптеку"
 
-#: trans_presets.java:2529
+#. item "Health/Pharmacy" label "Edit Pharmacy"
+#. <key key="amenity" value="pharmacy" />
+#: build/trans_presets.java:2559
 msgid "Dispensing"
 msgstr "Отпуск лекарств по рецептам"
 
-#: trans_presets.java:2532
+#. item "Health/Pharmacy" text "Name"
+#: build/trans_presets.java:2562
 msgid "Hospital"
 msgstr "Больница"
 
-#: trans_presets.java:2534
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+#: build/trans_presets.java:2564
 msgid "Edit Hospital"
 msgstr "Править больницу"
 
-#: trans_presets.java:2538
+#. item "Health/Hospital" text "Name"
+#: build/trans_presets.java:2568
 msgid "Emergency Access Point"
 msgstr "Пункт вызова экстренной помощи"
 
-#: trans_presets.java:2541
+#. item
+#. <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:2571
 msgid "Edit Emergency Access Point"
 msgstr "Править пункт вызова экстренной помощи"
 
-#: trans_presets.java:2544
+#. item "Health/Emergency Access Point" label "Edit Emergency Access Point"
+#. <space />
+#. <key key="highway" value="emergency_access_point" />
+#: build/trans_presets.java:2574
 msgid "Point Number"
 msgstr "Номер пункта"
 
-#: trans_presets.java:2545
+#. item "Health/Emergency Access Point" text "Point Number"
+#: build/trans_presets.java:2575
 msgid "Phone Number"
 msgstr "Номер телефона"
 
-#: trans_presets.java:2546
+#. item "Health/Emergency Access Point" text "Phone Number"
+#: build/trans_presets.java:2576
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Используйте международный код, как например +12-345-67890)"
 
-#: trans_presets.java:2549
+#. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
+#. <space />
+#: build/trans_presets.java:2579
 msgid "Veterinary"
 msgstr "Ветеринар"
 
-#: trans_presets.java:2552
+#. item
+#. <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:2582
 msgid "Edit Veterinary"
 msgstr "Править ветеринара"
 
-#: trans_presets.java:2559
+#. group "Places"
+#: build/trans_presets.java:2589
 msgid "Continent"
 msgstr "Континент"
 
-#: trans_presets.java:2560
+#. item
+#: build/trans_presets.java:2590
 msgid "Edit a Continent"
 msgstr "Править континент"
 
-#: trans_presets.java:2565
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:2595
 msgid "Country"
 msgstr "Страна"
 
-#: trans_presets.java:2566
+#. item
+#: build/trans_presets.java:2596
 msgid "Edit Country"
 msgstr "Править страну"
 
-#: trans_presets.java:2571 trans_presets.java:2951
+#. item "Places/Country" text "Name"
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:2601 build/trans_presets.java:2981
 msgid "State"
 msgstr "Штат"
 
-#: trans_presets.java:2572
+#. item
+#: build/trans_presets.java:2602
 msgid "Edit State"
 msgstr "Править штат"
 
-#: trans_presets.java:2577
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:2607
 msgid "Region"
 msgstr "Область"
 
-#: trans_presets.java:2578
+#. item
+#: build/trans_presets.java:2608
 msgid "Edit Region"
 msgstr "Править область"
 
-#: trans_presets.java:2583
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:2613
 msgid "County"
 msgstr "Графство"
 
-#: trans_presets.java:2584
+#. item
+#: build/trans_presets.java:2614
 msgid "Edit County"
 msgstr "Править графство"
 
-#: trans_presets.java:2589
+#. item "Places/County" text "Name"
+#: build/trans_presets.java:2619
 msgid "City"
 msgstr "Город (более 100 000)"
 
-#: trans_presets.java:2590
+#. item
+#: build/trans_presets.java:2620
 msgid "Edit City"
 msgstr "Править город"
 
-#: trans_presets.java:2595
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:2625
 msgid "Town"
 msgstr "Город (до 100 000)"
 
-#: trans_presets.java:2597
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
+#: build/trans_presets.java:2627
 msgid "Edit Town"
 msgstr "Править город"
 
-#: trans_presets.java:2602
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:2632
 msgid "Suburb"
 msgstr "Пригород"
 
-#: trans_presets.java:2604
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
+#: build/trans_presets.java:2634
 msgid "Edit Suburb"
 msgstr "Править пригород"
 
-#: trans_presets.java:2609
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:2639
 msgid "Village"
 msgstr "Село"
 
-#: trans_presets.java:2610
+#. item
+#: build/trans_presets.java:2640
 msgid "Edit Village"
 msgstr "Править село"
 
-#: trans_presets.java:2615
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:2645
 msgid "Hamlet"
 msgstr "Деревня"
 
-#: trans_presets.java:2616
+#. item
+#: build/trans_presets.java:2646
 msgid "Edit Hamlet"
 msgstr "Править деревню"
 
-#: trans_presets.java:2621
+#. item "Places/Hamlet" text "Name"
+#: build/trans_presets.java:2651
 msgid "Locality"
 msgstr "Местность"
 
-#: trans_presets.java:2623
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
+#: build/trans_presets.java:2653
 msgid "Edit Locality"
 msgstr "Править местность"
 
-#: trans_presets.java:2628
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:2658
 msgid "Island"
 msgstr "Остров"
 
-#: trans_presets.java:2630
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
+#: build/trans_presets.java:2660
 msgid "Edit Island"
 msgstr "Править остров"
 
-#: trans_presets.java:2636
+#. item "Places/Island" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2666
 msgid "Cave Entrance"
 msgstr "Вход в пещеру"
 
-#: trans_presets.java:2638
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:2668
 msgid "Edit Cave Entrance"
 msgstr "Править вход в пещеру"
 
-#: trans_presets.java:2642
+#. item "Places/Cave Entrance" text "Name"
+#: build/trans_presets.java:2672
 msgid "Peak"
 msgstr "Вершина"
 
-#: trans_presets.java:2644
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:2674
 msgid "Edit Peak"
 msgstr "Править вершину"
 
-#: trans_presets.java:2649
+#. item "Places/Peak" text "Elevation"
+#: build/trans_presets.java:2679
 msgid "Glacier"
 msgstr "Ледник"
 
-#: trans_presets.java:2651
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:2681
 msgid "Edit Glacier"
 msgstr "Править ледник"
 
-#: trans_presets.java:2656
+#. item "Places/Glacier" text "Elevation"
+#: build/trans_presets.java:2686
 msgid "Volcano"
 msgstr "Вулкан"
 
-#: trans_presets.java:2658
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:2688
 msgid "Edit Volcano"
 msgstr "Править вулкан"
 
-#: trans_presets.java:2664
+#. item "Places/Volcano" text "Elevation"
+#: build/trans_presets.java:2694
 msgid "Boundaries"
 msgstr "Границы"
 
-#: trans_presets.java:2665
+#. group "Boundaries"
+#: build/trans_presets.java:2695
 msgid "National"
 msgstr "Государственная"
 
-#: trans_presets.java:2666
+#. item
+#: build/trans_presets.java:2696
 msgid "Edit National Boundary"
 msgstr "Править государственную границу"
 
-#: trans_presets.java:2671
+#. item "Boundaries/National" text "Name"
+#: build/trans_presets.java:2701
 msgid "Administrative"
 msgstr "Административная"
 
-#: trans_presets.java:2672
+#. item
+#: build/trans_presets.java:2702
 msgid "Edit Administrative Boundary"
 msgstr "Править административную границу"
 
-#: trans_presets.java:2677
+#. item "Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:2707
 msgid "Civil"
 msgstr "Гражданская"
 
-#: trans_presets.java:2678
+#. item
+#: build/trans_presets.java:2708
 msgid "Edit Civil Boundary"
 msgstr "Править гражданскую границу"
 
-#: trans_presets.java:2683
+#. item "Boundaries/Civil" text "Name"
+#: build/trans_presets.java:2713
 msgid "political"
 msgstr "Политическая"
 
-#: trans_presets.java:2684
+#. item
+#: build/trans_presets.java:2714
 msgid "Edit Political Boundary"
 msgstr "Править политическую границу"
 
-#: trans_presets.java:2689
+#. item "Boundaries/political" text "Name"
+#: build/trans_presets.java:2719
 msgid "National_park"
 msgstr "Национальный парк"
 
-#: trans_presets.java:2690
+#. item
+#: build/trans_presets.java:2720
 msgid "Edit National Park Boundary"
 msgstr "Править национальный парк"
 
-#: trans_presets.java:2696
+#. item "Boundaries/National_park" text "Name"
+#: build/trans_presets.java:2726
 msgid "Land use"
 msgstr "Землепользование"
 
-#: trans_presets.java:2697
+#. group "Land use"
+#: build/trans_presets.java:2727
 msgid "Tree"
 msgstr "Дерево"
 
-#: trans_presets.java:2700
+#. item
+#. <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:2730
 msgid "Edit a Tree"
 msgstr "Править дерево"
 
-#: trans_presets.java:2705
+#. item "Land use/Tree" text "Height"
+#: build/trans_presets.java:2735
 msgid "Botanical Name"
 msgstr "Научное название"
 
-#: trans_presets.java:2707
+#. item "Land use/Tree" text "Botanical Name"
+#: build/trans_presets.java:2737
 msgid "Wood"
 msgstr "Лесистая местность"
 
-#: trans_presets.java:2710
+#. item
+#. <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:2740
 msgid "Edit Wood"
 msgstr "Править лесистую местность"
 
-#: trans_presets.java:2713 trans_presets.java:2722
+#. item "Land use/Wood" combo "Type"
+#. item "Land use/Forest" combo "Type"
+#: build/trans_presets.java:2743 build/trans_presets.java:2752
 msgid "coniferous"
 msgstr "Хвойный"
 
-#: trans_presets.java:2713 trans_presets.java:2722
+#: build/trans_presets.java:2743 build/trans_presets.java:2752
 msgid "deciduous"
 msgstr "Лиственный"
 
-#: trans_presets.java:2713 trans_presets.java:2722
+#: build/trans_presets.java:2743 build/trans_presets.java:2752
 msgid "mixed"
 msgstr "Смешанный"
 
-#: trans_presets.java:2715
+#: build/trans_presets.java:2745
 msgid "Forest"
 msgstr "Лес"
 
-#: trans_presets.java:2718
+#. item
+#. <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:2748
 msgid "Edit Forest Landuse"
 msgstr "Править лес"
 
-#: trans_presets.java:2724
+#: build/trans_presets.java:2754
 msgid "Nature Reserve"
 msgstr "Заповедник"
 
-#: trans_presets.java:2725
+#. item
+#: build/trans_presets.java:2755
 msgid "Edit Nature Reserve"
 msgstr "Править заповедник"
 
-#: trans_presets.java:2729
+#. item "Land use/Nature Reserve" text "Name"
+#: build/trans_presets.java:2759
 msgid "Farmyard"
 msgstr "Двор фермы"
 
-#: trans_presets.java:2732
+#. item
+#. <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:2762
 msgid "Edit Farmyard Landuse"
 msgstr "Править двор фермы"
 
-#: trans_presets.java:2737
+#. item "Land use/Farmyard" text "Name"
+#: build/trans_presets.java:2767
 msgid "Farmland"
 msgstr "Обрабатываемая земля"
 
-#: trans_presets.java:2738
+#. item
+#: build/trans_presets.java:2768
 msgid "Edit Farmland Landuse"
 msgstr "Править обрабатываемую землю"
 
-#: trans_presets.java:2743
+#. item "Land use/Farmland" text "Name"
+#: build/trans_presets.java:2773
 msgid "Meadow"
 msgstr ""
 
-#: trans_presets.java:2744
+#. item
+#: build/trans_presets.java:2774
 msgid "Edit Meadow Landuse"
 msgstr ""
 
-#: trans_presets.java:2749
+#. item "Land use/Meadow" text "Name"
+#: build/trans_presets.java:2779
 msgid "Vineyard"
 msgstr "Виноградник"
 
-#: trans_presets.java:2750
+#. item
+#: build/trans_presets.java:2780
 msgid "Edit Vineyard Landuse"
 msgstr "Править виноградник"
 
-#: trans_presets.java:2755
+#. item "Land use/Vineyard" text "Name"
+#: build/trans_presets.java:2785
 msgid "Allotments"
 msgstr "Огороды"
 
-#: trans_presets.java:2756
+#. item
+#: build/trans_presets.java:2786
 msgid "Edit Allotments Landuse"
 msgstr "Править огороды"
 
-#: trans_presets.java:2761
+#. item "Land use/Allotments" text "Name"
+#: build/trans_presets.java:2791
 msgid "Garden"
 msgstr "Сад"
 
-#: trans_presets.java:2762
+#. item
+#: build/trans_presets.java:2792
 msgid "Edit Garden"
 msgstr "Править сад"
 
-#: trans_presets.java:2766
+#. item "Land use/Garden" text "Name"
+#: build/trans_presets.java:2796
 msgid "Grass"
 msgstr "Трава"
 
-#: trans_presets.java:2767
+#. item
+#: build/trans_presets.java:2797
 msgid "Edit Grass Landuse"
 msgstr "Править траву"
 
-#: trans_presets.java:2772
+#. item "Land use/Grass" text "Name"
+#: build/trans_presets.java:2802
 msgid "Village Green"
 msgstr ""
 
-#: trans_presets.java:2774
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
+#: build/trans_presets.java:2804
 msgid "Edit Village Green Landuse"
 msgstr ""
 
-#: trans_presets.java:2779
+#. item "Land use/Village Green" text "Name"
+#: build/trans_presets.java:2809
 msgid "Common"
 msgstr "Общее"
 
-#: trans_presets.java:2781
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
+#: build/trans_presets.java:2811
 msgid "Edit Common"
 msgstr "Править общее"
 
-#: trans_presets.java:2785
+#. item "Land use/Common" text "Name"
+#: build/trans_presets.java:2815
 msgid "Park"
 msgstr "Парк"
 
-#: trans_presets.java:2786
+#. item
+#: build/trans_presets.java:2816
 msgid "Edit Park"
 msgstr "Править парк"
 
-#: trans_presets.java:2790
+#. item "Land use/Park" text "Name"
+#: build/trans_presets.java:2820
 msgid "Recreation Ground"
 msgstr "Спортплощадка"
 
-#: trans_presets.java:2792
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
+#: build/trans_presets.java:2822
 msgid "Edit Recreation Ground Landuse"
 msgstr "Править спортплощадку"
 
-#: trans_presets.java:2798
+#. item "Land use/Recreation Ground" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2828
 msgid "Residential area"
 msgstr "Жилая зона"
 
-#: trans_presets.java:2799
+#. item
+#: build/trans_presets.java:2829
 msgid "Edit Residential Landuse"
 msgstr "Править жилую зону"
 
-#: trans_presets.java:2804
+#. item "Land use/Residential area" text "Name"
+#: build/trans_presets.java:2834
 msgid "Graveyard"
 msgstr "Церковное кладбище"
 
-#: trans_presets.java:2806
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
+#: build/trans_presets.java:2836
 msgid "Edit Graveyard"
 msgstr "Править церковное кладбище"
 
-#: trans_presets.java:2812
+#: build/trans_presets.java:2842
 msgid "Cemetery"
 msgstr "Кладбище"
 
-#: trans_presets.java:2814
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
+#: build/trans_presets.java:2844
 msgid "Edit Cemetery Landuse"
 msgstr "Править кладбище"
 
-#: trans_presets.java:2821
+#: build/trans_presets.java:2851
 msgid "Retail"
 msgstr "Розничная торговля"
 
-#: trans_presets.java:2822
+#. item
+#: build/trans_presets.java:2852
 msgid "Edit Retail Landuse"
 msgstr "Править розничную торговлю"
 
-#: trans_presets.java:2827
+#. item "Land use/Retail" text "Name"
+#: build/trans_presets.java:2857
 msgid "Commercial"
 msgstr "Коммерция"
 
-#: trans_presets.java:2828
+#. item
+#: build/trans_presets.java:2858
 msgid "Edit Commercial Landuse"
 msgstr "Править коммерцию"
 
-#: trans_presets.java:2833
+#. item "Land use/Commercial" text "Name"
+#: build/trans_presets.java:2863
 msgid "Industrial"
 msgstr "Промышленность"
 
-#: trans_presets.java:2834
+#. item
+#: build/trans_presets.java:2864
 msgid "Edit Industrial Landuse"
 msgstr "Править промышленность"
 
-#: trans_presets.java:2839
+#. item "Land use/Industrial" text "Name"
+#: build/trans_presets.java:2869
 msgid "Railway land"
 msgstr "Железная дорога"
 
-#: trans_presets.java:2841
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
+#: build/trans_presets.java:2871
 msgid "Edit Railway Landuse"
 msgstr "Править ж/д пути"
 
-#: trans_presets.java:2847
+#. item "Land use/Railway land" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2877
 msgid "Brownfield"
 msgstr "Пустырь с развалинами"
 
-#: trans_presets.java:2848
+#. item
+#: build/trans_presets.java:2878
 msgid "Edit Brownfield Landuse"
 msgstr "Править пустырь с развалинами"
 
-#: trans_presets.java:2853
+#. item "Land use/Brownfield" text "Name"
+#: build/trans_presets.java:2883
 msgid "Greenfield"
 msgstr "Пустырь"
 
-#: trans_presets.java:2854
+#. item
+#: build/trans_presets.java:2884
 msgid "Edit Greenfield Landuse"
 msgstr "Править пустырь"
 
-#: trans_presets.java:2859
+#. item "Land use/Greenfield" text "Name"
+#: build/trans_presets.java:2889
 msgid "Construction area"
 msgstr "Стройплощадка"
 
-#: trans_presets.java:2860
+#. item
+#: build/trans_presets.java:2890
 msgid "Edit Construction Landuse"
 msgstr "Править стройплощадку"
 
-#: trans_presets.java:2865
+#. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:2895
 msgid "Landfill"
 msgstr "Свалка"
 
-#: trans_presets.java:2866
+#. item
+#: build/trans_presets.java:2896
 msgid "Edit Landfill Landuse"
 msgstr "Править свалку"
 
-#: trans_presets.java:2871
+#. item "Land use/Landfill" text "Name"
+#: build/trans_presets.java:2901
 msgid "Quarry"
 msgstr "Карьер"
 
-#: trans_presets.java:2872
+#. item
+#: build/trans_presets.java:2902
 msgid "Edit Quarry Landuse"
 msgstr "Править карьер"
 
-#: trans_presets.java:2877
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:2907
 msgid "Military"
 msgstr "Военное"
 
-#: trans_presets.java:2878
+#. item
+#: build/trans_presets.java:2908
 msgid "Edit Military Landuse"
 msgstr "Править военное"
 
-#: trans_presets.java:2884
+#. item "Land use/Military" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2914
 msgid "Scree"
 msgstr ""
 
-#: trans_presets.java:2885
+#. item
+#: build/trans_presets.java:2915
 msgid "Edit Scree"
 msgstr ""
 
-#: trans_presets.java:2889
+#. item "Land use/Scree" text "Name"
+#: build/trans_presets.java:2919
 msgid "Scrub"
 msgstr ""
 
-#: trans_presets.java:2890
+#. item
+#: build/trans_presets.java:2920
 msgid "Edit Scrub"
 msgstr ""
 
-#: trans_presets.java:2894
+#. item "Land use/Scrub" text "Name"
+#: build/trans_presets.java:2924
 msgid "Fell"
 msgstr ""
 
-#: trans_presets.java:2896
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:2926
 msgid "Edit Fell"
 msgstr ""
 
-#: trans_presets.java:2900
+#. item "Land use/Fell" text "Name"
+#: build/trans_presets.java:2930
 msgid "Heath"
 msgstr "Пустошь"
 
-#: trans_presets.java:2902
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:2932
 msgid "Edit Heath"
 msgstr ""
 
-#: trans_presets.java:2909
+#. group "Relations"
+#: build/trans_presets.java:2939
 msgid "Multipolygon"
 msgstr "Мультиполигональное"
 
-#: trans_presets.java:2913
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Relation:multipolygon"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
+#. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
+#: build/trans_presets.java:2943
 msgid "Edit a Multipolygon"
 msgstr "Править мультиполигональное отношение"
 
-#: trans_presets.java:2919
+#. item "Relations/Multipolygon" text "Name"
+#. </optional>
+#. <roles>
+#: build/trans_presets.java:2949
 msgid "outer segment"
 msgstr ""
 
-#: trans_presets.java:2920
+#. item "Relations/Multipolygon" role "outer segment"
+#: build/trans_presets.java:2950
 msgid "inner segment"
 msgstr ""
 
-#: trans_presets.java:2923
+#. item "Relations/Multipolygon" role "inner segment"
+#. </roles>
+#: build/trans_presets.java:2953
 msgid "Turn restriction"
 msgstr "Ограничение на поворот"
 
-#: trans_presets.java:2926
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
+#: build/trans_presets.java:2956
 msgid "Edit a Turn Restriction"
 msgstr "Править ограничение на поворот"
 
-#: trans_presets.java:2928
+#. item "Relations/Turn restriction" label "Edit a Turn Restriction"
+#. <key key="type" value="restriction" />
+#: build/trans_presets.java:2958
 msgid "Restriction"
 msgstr ""
 
-#: trans_presets.java:2928
+#. item "Relations/Turn restriction" combo "Restriction"
+#: build/trans_presets.java:2958
 msgid "no_left_turn"
 msgstr ""
 
-#: trans_presets.java:2928
+#: build/trans_presets.java:2958
 msgid "no_right_turn"
 msgstr ""
 
-#: trans_presets.java:2928
+#: build/trans_presets.java:2958
 msgid "no_straight_on"
 msgstr ""
 
-#: trans_presets.java:2928
+#: build/trans_presets.java:2958
 msgid "no_u_turn"
 msgstr ""
 
-#: trans_presets.java:2928
+#: build/trans_presets.java:2958
 msgid "only_right_turn"
 msgstr ""
 
-#: trans_presets.java:2928
+#: build/trans_presets.java:2958
 msgid "only_left_turn"
 msgstr ""
 
-#: trans_presets.java:2928
+#: build/trans_presets.java:2958
 msgid "only_straight_on"
 msgstr ""
 
-#: trans_presets.java:2933
+#. item "Relations/Turn restriction" text "Name"
+#. </optional>
+#. <roles>
+#: build/trans_presets.java:2963
 msgid "from way"
 msgstr ""
 
-#: trans_presets.java:2934
+#. item "Relations/Turn restriction" role "from way"
+#: build/trans_presets.java:2964
 msgid "via node or way"
 msgstr ""
 
-#: trans_presets.java:2935
+#. item "Relations/Turn restriction" role "via node or way"
+#: build/trans_presets.java:2965
 msgid "to way"
 msgstr ""
 
-#: trans_presets.java:2938
+#. item "Relations/Turn restriction" role "to way"
+#. </roles>
+#: build/trans_presets.java:2968
 msgid "Route"
 msgstr ""
 
-#: trans_presets.java:2941
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
+#: build/trans_presets.java:2971
 msgid "Edit a Route"
 msgstr ""
 
-#: trans_presets.java:2943
+#. item "Relations/Route" label "Edit a Route"
+#. <key key="type" value="route" />
+#: build/trans_presets.java:2973
 msgid "Route type"
 msgstr ""
 
-#: trans_presets.java:2943
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:2973 build/trans_style.java:206
+#: build/trans_style.java:553 build/trans_style.java:743
+#: build/trans_style.java:751 build/trans_style.java:759
+#: build/trans_style.java:767 build/trans_style.java:775
+msgid "bicycle"
+msgstr ""
+
+#: build/trans_presets.java:2973
 msgid "bus"
 msgstr ""
 
-#: trans_presets.java:2943
+#: build/trans_presets.java:2973
 msgid "road"
 msgstr ""
 
-#: trans_presets.java:2943
+#: build/trans_presets.java:2973
 msgid "ferry"
 msgstr ""
 
-#: trans_presets.java:2943
+#: build/trans_presets.java:2973
 msgid "ski"
 msgstr ""
 
-#: trans_presets.java:2943
+#. color bicycle
+#. <icon annotate="true" src="vehicle/restriction/bicycle-designated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="foot" b="no"/>
+#. <icon src="vehicle/restriction/foot.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="footway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="pedestrian"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="steps"/>
+#: build/trans_presets.java:2973 build/trans_style.java:220
+#: build/trans_style.java:561 build/trans_style.java:569
+#: build/trans_style.java:577 build/trans_style.java:585
+msgid "foot"
+msgstr ""
+
+#: build/trans_presets.java:2973
 msgid "hiking"
 msgstr ""
 
-#: trans_presets.java:2943
+#: build/trans_presets.java:2973
 msgid "tram"
 msgstr ""
 
-#: trans_presets.java:2943
+#: build/trans_presets.java:2973
 msgid "detour"
 msgstr ""
 
-#: trans_presets.java:2946
+#. color otherrail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="subway"/>
+#: build/trans_presets.java:2973 build/trans_style.java:1042
+msgid "subway"
+msgstr ""
+
+#. item "Relations/Route" text "Reference"
+#: build/trans_presets.java:2976
 msgid "Symbol description"
 msgstr ""
 
-#: trans_presets.java:2949
+#. item "Relations/Route" text "Description"
+#. <optional>
+#: build/trans_presets.java:2979
 msgid "Network"
 msgstr ""
 
-#: trans_presets.java:2951
+#. item "Relations/Route" combo "State"
+#: build/trans_presets.java:2981
 msgid "proposed"
 msgstr ""
 
-#: trans_presets.java:2951
+#: build/trans_presets.java:2981
 msgid "alternate"
 msgstr ""
 
-#: trans_presets.java:2951
+#: build/trans_presets.java:2981
 msgid "temporary"
 msgstr ""
 
-#: trans_presets.java:2951
+#: build/trans_presets.java:2981
 msgid "connection"
 msgstr ""
 
-#: trans_presets.java:2952
+#: build/trans_presets.java:2982
 msgid "Color (hex)"
 msgstr ""
 
-#: trans_presets.java:2955
+#. item "Relations/Route" text "Color (hex)"
+#. </optional>
+#. <roles>
+#: build/trans_presets.java:2985
 msgid "route segment"
 msgstr ""
 
-#: trans_presets.java:2956
+#. item "Relations/Route" role "route segment"
+#: build/trans_presets.java:2986
 msgid "forward segment"
 msgstr ""
 
-#: trans_presets.java:2957
+#. item "Relations/Route" role "forward segment"
+#: build/trans_presets.java:2987
 msgid "backward segment"
 msgstr ""
 
-#: trans_presets.java:2958
+#. item "Relations/Route" role "backward segment"
+#: build/trans_presets.java:2988
 msgid "halt point"
 msgstr ""
 
-#: trans_presets.java:2959
+#. item "Relations/Route" role "halt point"
+#: build/trans_presets.java:2989
 msgid "forward halt point"
 msgstr ""
 
-#: trans_presets.java:2960
+#. item "Relations/Route" role "forward halt point"
+#: build/trans_presets.java:2990
 msgid "backward halt point"
 msgstr ""
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Although the value flags v/b for the condition are optional, using at
+#. least one of them is highly recommended!
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. 6. icon attributes
+#. - icon path to icon, relative to the icon path (default: subdirectory icons in
+#. directory where this file is)
+#. - priority
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the rbest matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus havin 8 hex digits instead of 6).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#. -->
+#.
+#: build/trans_style.java:49
+msgid "standard"
+msgstr ""
+
+#. mappaint style named "standard"
+#.
+#. <rule>
+#. <condition k="restriction" v="no_left_turn"/>
+#. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="restriction" v="no_right_turn"/>
+#. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="restriction" v="no_straight_on"/>
+#. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="restriction" v="no_u_turn"/>
+#. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="restriction" v="only_left_turn"/>
+#. <icon annotate="true" src="vehicle/restriction/turn_restrictions/only_left_turn.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="restriction" v="only_right_turn"/>
+#. <icon annotate="true" src="vehicle/restriction/turn_restrictions/only_right_turn.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="restriction" v="only_straight_on"/>
+#. <icon annotate="true" src="vehicle/restriction/turn_restrictions/only_straight_on.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#.
+#. <!-- mark some specials that should be fixed - they are already the default and therefore shouldn't be tagged -->
+#. <rule>
+#. <condition k="oneway"/>
+#. <!-- no line or area, as this is a highway=xy, railway=xy, .... -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bridge" b="yes"/>
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bridge" v="viaduct"/>
+#. color bridge
+#. <icon annotate="true" src="vehicle/viaduct.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bridge" v="aqueduct"/>
+#. color bridge
+#. <icon annotate="true" src="nautical/aqueduct.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bridge" v="swing"/>
+#. color bridge
+#. <icon annotate="true" src="vehicle/viaduct.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="tunnel" b="yes"/>
+#: build/trans_style.java:105 build/trans_style.java:119
+#: build/trans_style.java:126 build/trans_style.java:133
+#: build/trans_style.java:140
+msgid "bridge"
+msgstr ""
+
+#. color bridge
+#. <icon annotate="true" src="vehicle/viaduct.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bridge" b="no"/>
+#. color bridge
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="tunnel" b="no"/>
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="cutting" b="no"/>
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="embankment" b="no"/>
+#. color street
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="road"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <!-- deprecated; use information=guidepost instead -->
+#. <condition k="amenity" v="signpost"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--"deprecated" tags -->
+#.
+#. <!-- historic=museum -> tourism=museum -->
+#. <rule>
+#. <condition k="historic" v="museum"/>
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- man_made=power_wind -> power=generator and power_source=wind -->
+#. <rule>
+#. <condition k="man_made" v="power_wind"/>
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- man_made=power_hydro -> power=generator and power_source=hydro -->
+#. <rule>
+#. <condition k="man_made" v="power_hydro"/>
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- man_made=power_fossil -> power=generator and power_source=fossil -->
+#. <rule>
+#. <condition k="man_made" v="power_fossil"/>
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- man_made=power_nuclear -> power=generator and power_source=nuclear -->
+#. <rule>
+#. <condition k="man_made" v="power_nuclear"/>
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- highway classification now more detailed -->
+#. <rule>
+#. <condition k="highway" v="minor"/>
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!-- amenity=park_bench -> amenity=bench -->
+#. <rule>
+#. <condition k="amenity" v="park_bench"/>
+#. color deprecated
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- highway=stile -> barrier=stile -->
+#. <rule>
+#. <condition k="highway" v="stile"/>
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- there's a bit confusion about this tag, the proposal says leisure, map features say tourism ?!? -->
+#. <rule>
+#. <condition k="leisure" v="zoo"/>
+#: build/trans_style.java:112 build/trans_style.java:147
+#: build/trans_style.java:154 build/trans_style.java:161
+#: build/trans_style.java:497 build/trans_style.java:2150
+#: build/trans_style.java:3876 build/trans_style.java:3885
+#: build/trans_style.java:3894 build/trans_style.java:3903
+#: build/trans_style.java:3912 build/trans_style.java:3921
+#: build/trans_style.java:3930 build/trans_style.java:3931
+#: build/trans_style.java:3940 build/trans_style.java:3949
+msgid "deprecated"
+msgstr ""
+
+#. color foot
+#. <icon annotate="true" src="vehicle/restriction/foot-designated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="goods" b="no"/>
+#. <icon src="vehicle/restriction/goods.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="hgv" b="no"/>
+#. <icon src="vehicle/restriction/goods.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="horse" b="no"/>
+#. <icon src="vehicle/restriction/horse.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="horse" v="designated"/>
+#. color service
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>20000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="bridleway"/>
+#: build/trans_style.java:248 build/trans_style.java:545
+msgid "horse"
+msgstr ""
+
+#. color tertiary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="unclassified"/>
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="unsurfaced"/>
+#. color highway_track
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>20000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="residential"/>
+#. color street
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="living_street"/>
+#: build/trans_style.java:489 build/trans_style.java:505
+#: build/trans_style.java:521 build/trans_style.java:529
+msgid "street"
+msgstr ""
+
+#. color street
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- tracktype tags -->
+#.
+#. <rule>
+#. <condition k="tracktype" v="grade1"/>
+#. color highway_track
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tracktype" v="grade2"/>
+#. color highway_track
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tracktype" v="grade3"/>
+#. color highway_track
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tracktype" v="grade4"/>
+#. color highway_track
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tracktype" v="grade5"/>
+#: build/trans_style.java:513 build/trans_style.java:785
+#: build/trans_style.java:793 build/trans_style.java:801
+#: build/trans_style.java:809 build/trans_style.java:817
+msgid "highway_track"
+msgstr ""
+
+#. color foot
+#. <icon annotate="true" src="transport/steps.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="bus_guideway"/>
+#. color railwaypoint
+#. <icon annotate="true" src="vehicle/crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="rail"/>
+#. color oldrail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="narrow_gauge"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="monorail"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="turntable"/>
+#. <icon annotate="true" src="transport/turntable.png"/>
+#: build/trans_style.java:593 build/trans_style.java:1016
+#: build/trans_style.java:1074 build/trans_style.java:1082
+#: build/trans_style.java:1091
+msgid "rail"
+msgstr ""
+
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="mini_roundabout"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="stop"/>
+#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="traffic_signals"/>
+#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="speed_camera"/>
+#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_sign" v="city_limit"/>
+#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="crossing"/>
+#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="gate"/>
+#. <icon annotate="true" src="vehicle/gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cattle_grid"/>
+#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="toll_booth"/>
+#. <icon annotate="true" src="vehicle/toll_booth.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline_steep"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="viaduct"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/underground.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="viaduct"/>
+#: build/trans_style.java:678 build/trans_style.java:992
+msgid "viaduct"
+msgstr ""
+
+#. color viaduct
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="motorway_junction"/>
+#. <icon annotate="true" src="vehicle/exit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="services"/>
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="ford"/>
+#. <icon annotate="true" src="vehicle/ford.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="bus_stop"/>
+#. <icon annotate="true" src="transport/bus_small.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="turning_circle"/>
+#: build/trans_style.java:714
+msgid "turningcircle"
+msgstr ""
+
+#. color water
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="riverbank"/>
+#. color riverbank
+#: build/trans_style.java:835 build/trans_style.java:836
+msgid "riverbank"
+msgstr "берег реки"
+
+#. color water
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="stream"/>
+#: build/trans_style.java:852
+msgid "stream"
+msgstr ""
+
+#. color water
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="dock"/>
+#: build/trans_style.java:868
+msgid "dock"
+msgstr ""
+
+#. color dock
+#. <icon annotate="true" src="nautical/boatyard.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="lock_gate"/>
+#. <icon annotate="true" src="nautical/lock_gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="turning_point"/>
+#. <icon annotate="true" src="nautical/turning.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="aqueduct"/>
+#: build/trans_style.java:890
+msgid "aqueduct"
+msgstr ""
+
+#. color aqueduct
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="boatyard"/>
+#. <icon annotate="true" src="nautical/boatyard.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="water_point"/>
+#. <icon annotate="true" src="accommodation/camping/water.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="waste_disposal"/>
+#. <icon annotate="true" src="accommodation/camping/wastewater.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="mooring"/>
+#. <icon annotate="true" src="nautical/marina.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="weir"/>
+#. <icon annotate="true" src="nautical/weir.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="dam"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color manmade
+#. <!-- it's not possible to have both line and area, line seems more likely -->
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="waterfall"/>
+#. <icon annotate="true" src="nautical/waterfall.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--man_made tags -->
+#.
+#. <rule>
+#. <condition k="man_made" v="beacon"/>
+#. <icon annotate="true" src="misc/landmark/beacon.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="crane"/>
+#. color manmade
+#. <icon annotate="true" src="misc/landmark/crane.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="gasometer"/>
+#. <icon annotate="true" src="misc/landmark/gasometer.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="lighthouse"/>
+#. <icon annotate="true" src="misc/landmark/lighthouse.png"/>
+#. color pipeline
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="reservoir_covered"/>
+#. <icon annotate="true" src="misc/landmark/reservoir_covered.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="surveillance"/>
+#. <icon annotate="true" src="misc/surveillance.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="survey_point"/>
+#. <icon annotate="true" src="misc/landmark/survey_point.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="tower"/>
+#. <icon annotate="true" src="misc/landmark/tower.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="wastewater_plant"/>
+#. color manmade
+#. <icon annotate="true" src="misc/landmark/wastewater_plant.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="watermill"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="water_tower"/>
+#. <icon annotate="true" src="misc/landmark/water_tower.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="windmill"/>
+#. <icon annotate="true" src="misc/landmark/windmill.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="works"/>
+#. <icon annotate="true" src="misc/landmark/works.png"/>
+#: build/trans_style.java:927 build/trans_style.java:935
+#: build/trans_style.java:944 build/trans_style.java:1323
+#: build/trans_style.java:1330 build/trans_style.java:1339
+#: build/trans_style.java:1347 build/trans_style.java:1371
+#: build/trans_style.java:1379 build/trans_style.java:1387
+#: build/trans_style.java:1395 build/trans_style.java:1402
+#: build/trans_style.java:1411 build/trans_style.java:1419
+#: build/trans_style.java:1427 build/trans_style.java:1435
+msgid "manmade"
+msgstr ""
+
+#. color manmade
+#. <!-- it's not possible to have both line and area, line seems more likely -->
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- railway tags -->
+#.
+#. <rule>
+#. <condition k="railway" v="station"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/railway.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="halt"/>
+#. <icon annotate="true" src="transport/railway_small.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="tram_station"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/railway.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="tram_stop"/>
+#. <icon annotate="true" src="transport/railway_small.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="subway_entrance"/>
+#. color viaduct
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="crossing"/>
+#. color railwaypoint
+#. <icon annotate="true" src="vehicle/crossing_small.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="level_crossing"/>
+#: build/trans_style.java:954 build/trans_style.java:969
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:1008
+msgid "railwaypoint"
+msgstr ""
+
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="tram"/>
+#. <!-- prefer way types over tram - draw tram as overlay in joined cases -->
+#. color railover
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="light_rail"/>
+#: build/trans_style.java:1025 build/trans_style.java:1034
+msgid "otherrail"
+msgstr ""
+
+#. color otherrail
+#: build/trans_style.java:1026
+msgid "railover"
+msgstr ""
+
+#. color subway
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="preserved"/>
+#. color oldrail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="disused"/>
+#. color oldrail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="abandoned"/>
+#: build/trans_style.java:1050 build/trans_style.java:1058
+#: build/trans_style.java:1066
+msgid "oldrail"
+msgstr ""
+
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="service" v="yard"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="service" v="siding"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="service" v="spur"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--aeroway tags -->
+#.
+#. <rule>
+#. <condition k="aeroway" v="aerodrome"/>
+#. color aeroway
+#. color aeroway_dark
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="taxiway"/>
+#: build/trans_style.java:1121 build/trans_style.java:1122
+#: build/trans_style.java:1154
+msgid "aeroway"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_style.java:1130
+msgid "terminal"
+msgstr ""
+
+#. color terminal
+#. <icon annotate="true" src="transport/airport/terminal.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="helipad"/>
+#. color aeroway_dark
+#. <icon annotate="true" src="transport/airport/helipad.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="runway"/>
+#: build/trans_style.java:1138 build/trans_style.java:1146
+msgid "aeroway_dark"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="apron"/>
+#: build/trans_style.java:1162
+msgid "aeroway_light"
+msgstr ""
+
+#. color aeroway_light
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--aerialway tags -->
+#.
+#. <rule>
+#. <condition k="aerialway" v="cable_car"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aerialway" v="chair_lift"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/chair_lift.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aerialway" v="drag_lift"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/drag_lift.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aerialway" v="station"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/station.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aerialway" v="gondola"/>
+#: build/trans_style.java:1172 build/trans_style.java:1180
+#: build/trans_style.java:1188 build/trans_style.java:1196
+#: build/trans_style.java:1204
+msgid "aerialway"
+msgstr ""
+
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- piste tags -->
+#.
+#. <rule>
+#. <condition k="piste:difficulty" v="easy"/>
+#: build/trans_style.java:1214
+msgid "piste_easy"
+msgstr ""
+
+#. color piste_easy
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="piste:difficulty" v="intermediate"/>
+#: build/trans_style.java:1222
+msgid "piste_intermediate"
+msgstr ""
+
+#. color piste_intermediate
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="piste:difficulty" v="advanced"/>
+#: build/trans_style.java:1230
+msgid "piste_advanced"
+msgstr ""
+
+#. color piste_advanced
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="piste:difficulty" v="freeride"/>
+#: build/trans_style.java:1238
+msgid "piste_freeride"
+msgstr ""
+
+#. color piste_freeride
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="piste:difficulty" v="novice"/>
+#: build/trans_style.java:1246
+msgid "piste_novice"
+msgstr ""
+
+#. color piste_novice
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>300000</scale_max>
+#. </rule>
+#.
+#. <!--power tags -->
+#.
+#. <rule>
+#. <condition k="power" v="tower"/>
+#. <icon annotate="true" src="misc/landmark/power/tower_small.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power" v="line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power" v="sub_station"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="wind"/>
+#. <icon annotate="true" src="misc/landmark/power/wind.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="hydro"/>
+#. <icon annotate="true" src="misc/landmark/power/hydro.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="fossil"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="nuclear"/>
+#. <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power" v="generator"/>
+#. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
+#: build/trans_style.java:1257 build/trans_style.java:1264
+#: build/trans_style.java:1273 build/trans_style.java:1281
+#: build/trans_style.java:1289 build/trans_style.java:1297
+#: build/trans_style.java:1305 build/trans_style.java:1313
+msgid "power"
+msgstr ""
+
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="pier"/>
+#: build/trans_style.java:1354
+msgid "pier"
+msgstr ""
+
+#. color pier
+#. <icon annotate="true" src="nautical/pier.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="pipeline"/>
+#: build/trans_style.java:1362
+msgid "pipeline"
+msgstr ""
+
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--leisure tags -->
+#.
+#. <rule>
+#. <condition k="leisure" v="sports_centre"/>
+#. <icon annotate="true" src="sport/centre.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="golf_course"/>
+#. <icon annotate="true" src="sport/golf.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="stadium"/>
+#. <icon annotate="true" src="sport/stadium.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="track"/>
+#. <icon annotate="true" src="sport/track.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="pitch"/>
+#. <icon annotate="true" src="sport/pitch.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="water_park"/>
+#. <icon annotate="true" src="leisure/water_park.png"/>
+#. color marina
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="slipway"/>
+#. <icon annotate="true" src="nautical/slipway.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="fishing"/>
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="nature_reserve"/>
+#. <icon annotate="true" src="leisure/nature_reserve.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="park"/>
+#. <icon annotate="true" src="leisure/park.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="playground"/>
+#. <icon annotate="true" src="leisure/playground.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="garden"/>
+#. <icon annotate="true" src="leisure/garden.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="common"/>
+#. <icon annotate="true" src="leisure/common.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="swimming_pool"/>
+#. <icon annotate="true" src="sport/pool.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="miniature_golf"/>
+#. <icon annotate="true" src="sport/golf.png"/>
+#: build/trans_style.java:1445 build/trans_style.java:1453
+#: build/trans_style.java:1461 build/trans_style.java:1469
+#: build/trans_style.java:1477 build/trans_style.java:1485
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517 build/trans_style.java:1525
+#: build/trans_style.java:1533 build/trans_style.java:1541
+#: build/trans_style.java:1549 build/trans_style.java:1557
+#: build/trans_style.java:1565
+msgid "leisure"
+msgstr ""
+
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="marina"/>
+#. <icon annotate="true" src="nautical/marina.png"/>
+#: build/trans_style.java:1493
+msgid "marina"
+msgstr ""
+
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--amenity tags -->
+#.
+#. <rule>
+#. <condition k="amenity" v="pub"/>
+#. <icon annotate="true" src="food/pub.png"/>
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="biergarten"/>
+#. <icon annotate="true" src="food/biergarten.png"/>
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="nightclub"/>
+#. <icon annotate="true" src="leisure/nightclub.png"/>
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="cafe"/>
+#. <icon annotate="true" src="food/cafe.png"/>
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="restaurant"/>
+#. <icon annotate="true" src="food/restaurant.png"/>
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="fast_food"/>
+#. <icon annotate="true" src="food/fastfood.png"/>
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="bar"/>
+#. <icon annotate="true" src="food/bar.png"/>
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="ice_cream"/>
+#. <icon annotate="true" src="food/icecream.png"/>
+#: build/trans_style.java:1575 build/trans_style.java:1583
+#: build/trans_style.java:1591 build/trans_style.java:1599
+#: build/trans_style.java:1607 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+msgid "amenity"
+msgstr ""
+
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="parking" v="multi-storey"/>
+#. <icon annotate="true" src="vehicle/parking/multi-storey.png" priority="10000"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="parking" v="underground"/>
+#. <icon annotate="true" src="vehicle/parking/underground.png" priority="10000"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="parking" v="park_and_ride"/>
+#. <icon annotate="true" src="vehicle/parking/park_ride.png" priority="10000"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="parking"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="bicycle_parking"/>
+#. <icon annotate="true" src="vehicle/parking/bicycle.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="bicycle_rental"/>
+#. <icon annotate="true" src="vehicle/rental/bicycle.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="car_rental"/>
+#. <icon annotate="true" src="vehicle/rental/car.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="car_sharing"/>
+#. <icon annotate="true" src="vehicle/car_sharing.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="car_wash"/>
+#. color amenity_traffic
+#. <icon annotate="true" src="vehicle/car_wash.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="taxi"/>
+#. <icon annotate="true" src="transport/taxi.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="fuel"/>
+#. <icon annotate="true" src="vehicle/fuel.png"/>
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687 build/trans_style.java:1695
+#: build/trans_style.java:1702 build/trans_style.java:1711
+#: build/trans_style.java:1719
+msgid "amenity_traffic"
+msgstr ""
+
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="telephone"/>
+#. <icon annotate="true" src="service/telephone.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="emergency_phone"/>
+#. <icon annotate="true" src="vehicle/emergency_phone.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="toilets"/>
+#. <icon annotate="true" src="service/toilets.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="recycling"/>
+#. <icon annotate="true" src="service/recycling.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="public_building"/>
+#. <icon annotate="true" src="service.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="embassy"/>
+#. <icon annotate="true" src="service.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="townhall"/>
+#. <icon annotate="true" src="service.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="community_centre"/>
+#. <icon annotate="true" src="service.png"/>
+#. color light_water
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="bahai"/>
+#. <icon annotate="true" src="religion/church/bahai.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="buddhist"/>
+#. <icon annotate="true" src="religion/church/buddhism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="christian"/>
+#. <icon annotate="true" src="religion/church.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="hindu"/>
+#. <icon annotate="true" src="religion/church/hinduism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="jain"/>
+#. <icon annotate="true" src="religion/church/jainism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="jewish"/>
+#. <icon annotate="true" src="religion/church/synagogue.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="muslim"/>
+#. <icon annotate="true" src="religion/church/mosque.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="sikh"/>
+#. <icon annotate="true" src="religion/church/sikhism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="shinto"/>
+#. <icon annotate="true" src="religion/church/shinto.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="taoist"/>
+#. <icon annotate="true" src="religion/church/taoism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="place_of_worship"/>
+#. <icon annotate="true" src="religion.png" priority="-10000"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grave_yard"/>
+#. <icon annotate="true" src="religion/cemetery.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="crematorium"/>
+#. color amenity_light
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="post_office"/>
+#. <icon annotate="true" src="service/post_office.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="post_box"/>
+#. <icon annotate="true" src="service/post_box.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="school"/>
+#. <icon annotate="true" src="education/school.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="university"/>
+#. <icon annotate="true" src="education/university.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="college"/>
+#. <icon annotate="true" src="education/college.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="kindergarten"/>
+#. <icon annotate="true" src="education/kindergarten.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="driving_school"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color health
+#. <icon annotate="true" src="health/veterinary.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="library"/>
+#. color amenity_light
+#. <icon annotate="true" src="shop/rental/library.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="police"/>
+#. color amenity_light
+#. <icon annotate="true" src="service/police.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="fire_station"/>
+#. color amenity_light
+#. <icon annotate="true" src="service/firebrigade.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="bus_station"/>
+#. <icon annotate="true" src="transport/bus.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="ferry_terminal"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="theatre"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/theater.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="cinema"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/cinema.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="arts_centre"/>
+#. color amenity_light
+#. <icon annotate="true" src="service/arts_centre.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="courthouse"/>
+#. color amenity_light
+#. <icon annotate="true" src="service/administration/court_of_law.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="prison"/>
+#. color amenity_light
+#. <icon annotate="true" src="service/administration/prison.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="bank"/>
+#. color amenity_light
+#. <icon annotate="true" src="money/bank.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="bureau_de_change"/>
+#. color amenity_light
+#. <icon annotate="true" src="money/exchange.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="atm"/>
+#. color amenity_light
+#. <icon annotate="true" src="money/atm.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="bench"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bench.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="shelter"/>
+#. color amenity_light
+#. <icon annotate="true" src="accommodation/shelter.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="hunting_stand"/>
+#. color amenity_light
+#. <icon annotate="true" src="hunting_stand.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="wlan"/>
+#. <icon annotate="true" src="wlan.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="vending_machine"/>
+#. <icon src="transport/ticket-machine.png"/>
+#: build/trans_style.java:1727 build/trans_style.java:1735
+#: build/trans_style.java:1743 build/trans_style.java:1751
+#: build/trans_style.java:1759 build/trans_style.java:1767
+#: build/trans_style.java:1775 build/trans_style.java:1783
+#: build/trans_style.java:1877 build/trans_style.java:1885
+#: build/trans_style.java:1892 build/trans_style.java:1901
+#: build/trans_style.java:1909 build/trans_style.java:1917
+#: build/trans_style.java:1925 build/trans_style.java:1933
+#: build/trans_style.java:1941 build/trans_style.java:1949
+#: build/trans_style.java:2004 build/trans_style.java:2012
+#: build/trans_style.java:2020 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2044
+#: build/trans_style.java:2052 build/trans_style.java:2060
+#: build/trans_style.java:2068 build/trans_style.java:2076
+#: build/trans_style.java:2084 build/trans_style.java:2092
+#: build/trans_style.java:2100 build/trans_style.java:2108
+#: build/trans_style.java:2116 build/trans_style.java:2124
+#: build/trans_style.java:2133 build/trans_style.java:2141
+msgid "amenity_light"
+msgstr ""
+
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="drinking_water"/>
+#. <icon annotate="true" src="food/drinking_water.png"/>
+#. color light_water
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="fountain"/>
+#. <icon annotate="true" src="misc/landmark/spring.png"/>
+#. color military
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--natural tags -->
+#.
+#. <rule>
+#. <condition k="natural" v="spring"/>
+#. <icon annotate="true" src="misc/landmark/spring.png"/>
+#: build/trans_style.java:1791 build/trans_style.java:1799
+#: build/trans_style.java:2988
+msgid "light_water"
+msgstr ""
+
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="pharmacy"/>
+#. color health
+#. <icon annotate="true" src="health/pharmacy.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="hospital"/>
+#. color health
+#. <icon annotate="true" src="health/hospital.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="nursery"/>
+#. color health
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="doctors"/>
+#. color health
+#. <icon annotate="true" src="health/doctor.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="dentist"/>
+#. color health
+#. <icon annotate="true" src="health/dentist.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="veterinary"/>
+#: build/trans_style.java:1956 build/trans_style.java:1964
+#: build/trans_style.java:1972 build/trans_style.java:1980
+#: build/trans_style.java:1988 build/trans_style.java:1996
+msgid "health"
+msgstr ""
+
+#. color deprecated
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--shop tags -->
+#.
+#. <rule>
+#. <condition k="shop" v="supermarket"/>
+#. <icon annotate="true" src="shop/supermarket.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="convenience"/>
+#. <icon annotate="true" src="shop/supermarket.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="bakery"/>
+#. <icon annotate="true" src="shop/groceries/bakery.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="butcher"/>
+#. <icon annotate="true" src="shop/groceries/butcher.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="bicycle"/>
+#. <icon annotate="true" src="sport/bicycle.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="doityourself"/>
+#. <icon annotate="true" src="shop/diy_store.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="dry_cleaning"/>
+#. <icon annotate="true" src="shop/laundry.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="laundry"/>
+#. <icon annotate="true" src="shop/laundry.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="outdoor"/>
+#. <icon annotate="true" src="shop/sports/outdoor.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="kiosk"/>
+#. <icon annotate="true" src="shop/kiosk.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="beverages"/>
+#. <icon annotate="true" src="shop/beverages.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="books"/>
+#. <icon annotate="true" src="shop/rental/library.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="car"/>
+#. <icon annotate="true" src="transport/car.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="car_dealer"/>
+#. <icon annotate="true" src="transport/car.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="car_repair"/>
+#. <icon annotate="true" src="transport/car.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="chemist"/>
+#. <icon annotate="true" src="shop/chemist.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="clothes"/>
+#. <icon annotate="true" src="shop/clothes.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="computer"/>
+#. <icon annotate="true" src="shop/computer.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="cycle_repair"/>
+#. <icon annotate="true" src="sport/bicycle.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="department_store"/>
+#. <icon annotate="true" src="shop/mall.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="electronics"/>
+#. <icon annotate="true" src="shop/electronics.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="furniture"/>
+#. <icon annotate="true" src="shop/furniture.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="florist"/>
+#. <icon annotate="true" src="shop/florist.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="groceries"/>
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="garden_centre"/>
+#. <icon annotate="true" src="shop/garden_centre.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="hairdresser"/>
+#. <icon annotate="true" src="shop/hairdresser.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="hardware"/>
+#. <icon annotate="true" src="shop/diy_store.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="hifi"/>
+#. <icon annotate="true" src="shop/hifi.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="jewelry"/>
+#. <icon annotate="true" src="shop/jewelry.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="mall"/>
+#. <icon annotate="true" src="shop/mall.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="motorcycle"/>
+#. <icon annotate="true" src="vehicle/motorbike.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="newsagent"/>
+#. <icon annotate="true" src="shop/kiosk.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="organic"/>
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="optician"/>
+#. <icon annotate="true" src="shop/optician.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="shoes"/>
+#. <icon annotate="true" src="shop/shoes.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="tailor"/>
+#. <icon annotate="true" src="shop/tailor.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="travel_agency"/>
+#. <icon annotate="true" src="place/island.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="toys"/>
+#. <icon annotate="true" src="shop/toys.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="video"/>
+#. <icon annotate="true" src="shop/video.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- duplicate of shop_centre? -->
+#. <rule>
+#. <condition k="shop" v="shop_center"/>
+#. <icon annotate="true" src="shop/mall.png"/>
+#: build/trans_style.java:2160 build/trans_style.java:2168
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2192 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2256 build/trans_style.java:2264
+#: build/trans_style.java:2272 build/trans_style.java:2280
+#: build/trans_style.java:2288 build/trans_style.java:2296
+#: build/trans_style.java:2304 build/trans_style.java:2312
+#: build/trans_style.java:2320 build/trans_style.java:2328
+#: build/trans_style.java:2336 build/trans_style.java:2344
+#: build/trans_style.java:2352 build/trans_style.java:2360
+#: build/trans_style.java:2368 build/trans_style.java:2376
+#: build/trans_style.java:2384 build/trans_style.java:2392
+#: build/trans_style.java:2400 build/trans_style.java:2408
+#: build/trans_style.java:2416 build/trans_style.java:2424
+#: build/trans_style.java:2432 build/trans_style.java:2440
+#: build/trans_style.java:2448 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2473
+msgid "shop"
+msgstr ""
+
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--tourism tags -->
+#.
+#. <rule>
+#. <condition k="tourism" v="hotel"/>
+#. <icon annotate="true" src="accommodation.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="motel"/>
+#. <icon annotate="true" src="accommodation/motel.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="guest_house"/>
+#. <icon annotate="true" src="accommodation/guest_house.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="hostel"/>
+#. <icon annotate="true" src="accommodation/hostel.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="chalet"/>
+#. <icon annotate="true" src="accommodation/chalet.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="camp_site"/>
+#. <icon annotate="true" src="accommodation/camping.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="caravan_site"/>
+#. <icon annotate="true" src="accommodation/camping/caravan.png"/>
+#: build/trans_style.java:2483 build/trans_style.java:2491
+#: build/trans_style.java:2499 build/trans_style.java:2507
+#: build/trans_style.java:2515 build/trans_style.java:2523
+#: build/trans_style.java:2531
+msgid "hotel"
+msgstr ""
+
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="picnic_site"/>
+#. <icon annotate="true" src="leisure/picnic.png"/>
+#. color tourism
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="viewpoint"/>
+#. <icon annotate="true" src="sightseeing/viewpoint.png"/>
+#. color tourism
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="theme_park"/>
+#. <icon annotate="true" src="leisure/theme_park.png"/>
+#. color tourism
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="attraction"/>
+#. <icon annotate="true" src="sightseeing.png"/>
+#. color tourism
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="zoo"/>
+#. <icon annotate="true" src="leisure/zoo.png"/>
+#. color tourism
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="artwork"/>
+#. <icon annotate="true" src="service/arts_centre.png"/>
+#. color tourism
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="museum"/>
+#. <icon annotate="true" src="sightseeing/museum.png"/>
+#. color tourism
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- information tags -->
+#. <rule>
+#. <condition k="information" v="guidepost"/>
+#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="information" v="office"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. color tourism
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="information" v="map"/>
+#. <icon annotate="true" src="misc/information/map.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="information" v="bicyclemap"/>
+#. <icon annotate="true" src="misc/information/map_bicycle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="information" v="hikingmap"/>
+#. <icon annotate="true" src="misc/information/map_hiking.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="information" v="pistemap"/>
+#. <icon annotate="true" src="misc/information/map_skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="information" v="citymap"/>
+#. <icon annotate="true" src="misc/information/map_city.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="information" v="board"/>
+#. <icon annotate="true" src="misc/information/board.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="information" v="nature"/>
+#. <icon annotate="true" src="misc/information/board_nature.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="information" v="history"/>
+#. <icon annotate="true" src="misc/information/board_history.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="information" v="wildlife"/>
+#. <icon annotate="true" src="misc/information/board_wildlife.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="information"/>
+#. <icon annotate="true" src="misc/information.png"/>
+#: build/trans_style.java:2539 build/trans_style.java:2547
+#: build/trans_style.java:2555 build/trans_style.java:2563
+#: build/trans_style.java:2571 build/trans_style.java:2579
+#: build/trans_style.java:2587 build/trans_style.java:2603
+#: build/trans_style.java:2674
+msgid "tourism"
+msgstr "туризм"
+
+#. color tourism
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--historic tags -->
+#.
+#. <rule>
+#. <condition k="historic" v="castle"/>
+#. <icon annotate="true" src="sightseeing/castle.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="monument"/>
+#. <icon annotate="true" src="sightseeing/monument.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="memorial"/>
+#. <icon annotate="true" src="sightseeing/memorial.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="archaeological_site"/>
+#. <icon annotate="true" src="sightseeing/archaeological.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="ruins"/>
+#. <icon annotate="true" src="sightseeing/ruins.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="battlefield"/>
+#. <icon annotate="true" src="sightseeing/battlefield.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="wayside_cross"/>
+#. <icon annotate="true" src="religion/wayside_cross.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="wayside_shrine"/>
+#. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#: build/trans_style.java:2684 build/trans_style.java:2692
+#: build/trans_style.java:2700 build/trans_style.java:2708
+#: build/trans_style.java:2716 build/trans_style.java:2724
+#: build/trans_style.java:2732 build/trans_style.java:2740
+msgid "historic"
+msgstr "исторический"
+
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--landuse tags -->
+#.
+#. <rule>
+#. <condition k="landuse" v="farm"/>
+#. color green
+#. <icon annotate="true" src="misc/landmark/farm.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="farmland"/>
+#. color green
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="meadow"/>
+#. color green
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="vineyard"/>
+#. color forest
+#. <icon src="misc/landmark/trees.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="allotments"/>
+#. color green
+#. <icon src="misc/landmark/plant.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="grass"/>
+#. color cemetery
+#. <icon src="religion/cemetery.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="village_green"/>
+#. color green
+#. <icon src="leisure/common.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="leisure_ground"/>
+#: build/trans_style.java:2749 build/trans_style.java:2757
+#: build/trans_style.java:2765 build/trans_style.java:2773
+#: build/trans_style.java:2821 build/trans_style.java:2829
+#: build/trans_style.java:2927 build/trans_style.java:2935
+msgid "green"
+msgstr ""
+
+#. color green
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="quarry"/>
+#: build/trans_style.java:2781
+msgid "quarry"
+msgstr ""
+
+#. color quarry
+#. <icon src="misc/landmark/mine.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="landfill"/>
+#: build/trans_style.java:2789
+msgid "landfill"
+msgstr ""
+
+#. color landfill
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="basin"/>
+#. color basin
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="reservoir"/>
+#: build/trans_style.java:2797 build/trans_style.java:2805
+msgid "basin"
+msgstr "водоём"
+
+#. color basin
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="forest"/>
+#: build/trans_style.java:2813
+msgid "forest"
+msgstr "лес"
+
+#. color residential
+#. <icon src="misc/landuse/residential.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="farmyard"/>
+#: build/trans_style.java:2845
+msgid "farmyard"
+msgstr ""
+
+#. color farmyard
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#.
+#. <rule>
+#. <condition k="landuse" v="retail"/>
+#. color retail
+#. <icon src="shop/mall.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="commercial"/>
+#: build/trans_style.java:2854 build/trans_style.java:2862
+msgid "retail"
+msgstr ""
+
+#. color retail
+#. <icon src="misc/landuse/commercial.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="industrial"/>
+#: build/trans_style.java:2870
+msgid "industrial"
+msgstr ""
+
+#. color industrial
+#. <icon src="misc/landmark/works.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="brownfield"/>
+#: build/trans_style.java:2878
+msgid "brownfield"
+msgstr ""
+
+#. color brownfield
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="greenfield"/>
+#: build/trans_style.java:2886
+msgid "greenfield"
+msgstr ""
+
+#. color greenfield
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="railway"/>
+#: build/trans_style.java:2894
+msgid "railland"
+msgstr ""
+
+#. color construction
+#. <icon src="misc/construction.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="military"/>
+#. color green
+#. <icon src="leisure/common.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--military tags -->
+#.
+#. <rule>
+#. <condition k="military" v="airfield"/>
+#. <icon src="transport/airport/airfield.png"/>
+#. color military
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="military" v="bunker"/>
+#. <icon src="misc/landmark/bunker.png"/>
+#. color military
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="military" v="barracks"/>
+#. <icon src="misc/no_icon.png"/>
+#. color military
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="military" v="danger_area"/>
+#. <icon src="misc/danger.png"/>
+#. color military
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="military" v="range"/>
+#. <icon src="misc/landmark/range.png"/>
+#: build/trans_style.java:2911 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2970 build/trans_style.java:2978
+msgid "military"
+msgstr ""
+
+#. color military
+#. <icon src="vehicle/tank.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="cemetery"/>
+#: build/trans_style.java:2919
+msgid "cemetery"
+msgstr "кладбище"
+
+#. color light_water
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="peak"/>
+#: build/trans_style.java:2995
+msgid "peak"
+msgstr "пик"
+
+#. color peak
+#. <icon annotate="true" src="misc/landmark/peak_small.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="glacier"/>
+#. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
+#: build/trans_style.java:3004
+msgid "glacier"
+msgstr ""
+
+#. color glacier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="volcano"/>
+#. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
+#: build/trans_style.java:3012
+msgid "volcano"
+msgstr "вулкан"
+
+#. color volcano
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="cliff"/>
+#. <icon src="misc/no_icon.png"/>
+#. color natural
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="scree"/>
+#. <icon src="misc/no_icon.png"/>
+#. color scrub
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="fell"/>
+#. <icon src="misc/no_icon.png"/>
+#. color beach
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="bay"/>
+#. <icon src="misc/no_icon.png"/>
+#. color natural
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="land"/>
+#. <icon src="misc/no_icon.png"/>
+#. color natural
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="cave_entrance"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3044 build/trans_style.java:3108
+#: build/trans_style.java:3116 build/trans_style.java:3124
+msgid "natural"
+msgstr ""
+
+#. color natural
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="scrub"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:3036
+msgid "scrub"
+msgstr ""
+
+#. color natural
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="heath"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:3052
+msgid "heath"
+msgstr ""
+
+#. color heath
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wood"/>
+#. <icon src="misc/landmark/trees.png"/>
+#: build/trans_style.java:3060
+msgid "wood"
+msgstr ""
+
+#. color water
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="mud"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:3092
+msgid "mud"
+msgstr ""
+
+#. color mud
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="beach"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:3100
+msgid "beach"
+msgstr ""
+
+#. color natural
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="tree"/>
+#. <icon src="misc/landmark/trees.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--route tags -->
+#.
+#. <rule>
+#. <condition k="route" v="bus"/>
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="route" v="ferry"/>
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="route" v="flight"/>
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="route" v="ncn"/>
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="route" v="subsea"/>
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="route" v="ski"/>
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="route" v="tour"/>
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="route" v="pub_crawl"/>
+#: build/trans_style.java:3140 build/trans_style.java:3148
+#: build/trans_style.java:3156 build/trans_style.java:3164
+#: build/trans_style.java:3172 build/trans_style.java:3180
+#: build/trans_style.java:3188 build/trans_style.java:3196
+msgid "route"
+msgstr ""
+
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--boundary tags -->
+#.
+#. <rule>
+#. <condition k="boundary" v="national"/>
+#. color boundary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boundary" v="administrative"/>
+#. color boundary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boundary" v="civil"/>
+#. color boundary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boundary" v="political"/>
+#. color boundary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boundary" v="national_park"/>
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3238
+msgid "boundary"
+msgstr "граница"
+
+#. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--abutters tags -->
+#.
+#. <!--accessories tags -->
+#.
+#. <!--properties tags -->
+#.
+#. <rule>
+#. <condition k="mountain_pass" b="yes"/>
+#. <icon src="misc/landmark/mountain_pass.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- this will badly display otherwise well tagged footways and alike, so comment it out until we have better ways to display this in JOSM!
+#. XXX - maybe it's possible to use linemod's here?
+#. <rule>
+#. <condition k="surface" v="paved"/>
+#. <linemod mode="under" width="0" dashedcolour="#505050"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="surface" v="unpaved"/>
+#. <linemod mode="under" width="0" dashedcolour="#301000"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="surface" v="gravel"/>
+#. <linemod mode="under" width="0" dashedcolour="#100070"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="surface" v="cobblestone"/>
+#. <linemod mode="under" width="0" dashedcolour="#600060"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. -->
+#.
+#. <!--name tags -->
+#.
+#. <!--preferences tags -->
+#.
+#. <!--place tags -->
+#.
+#. <rule>
+#. <condition k="place" v="continent"/>
+#. <icon annotate="true" src="place/settlement/capital.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="country"/>
+#. <icon annotate="true" src="place/settlement/capital.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="state"/>
+#. <icon annotate="true" src="place/settlement/capital.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="region"/>
+#. <icon annotate="true" src="place/settlement/capital.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="county"/>
+#. <icon annotate="true" src="place/settlement/capital.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="city"/>
+#. <icon annotate="true" src="place/settlement/city.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="town"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="village"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="hamlet"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="suburb"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="locality"/>
+#. <icon annotate="true" src="place/locality.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="island"/>
+#. <icon annotate="true" src="place/island.png"/>
+#: build/trans_style.java:3653 build/trans_style.java:3661
+#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3685 build/trans_style.java:3693
+#: build/trans_style.java:3701 build/trans_style.java:3709
+#: build/trans_style.java:3717 build/trans_style.java:3725
+#: build/trans_style.java:3733 build/trans_style.java:3741
+msgid "place"
+msgstr ""
+
+#. color area
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:housenumber"/>
+#. <icon annotate="true" src="misc/housenumber.png" priority="-50000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:postcode"/>
+#. <icon annotate="true" src="misc/housenumber.png" priority="-50000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="odd"/>
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="even"/>
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="all"/>
+#: build/trans_style.java:3852 build/trans_style.java:3859
+#: build/trans_style.java:3866
+msgid "address"
+msgstr ""
+
+#. <?xml version="1.0"?>
+#. <surveyor columns="4" width="1300" height="0">
+#. <!-- icons can either be absolute paths or relative paths to the .josm directory -->
+#. <!-- action class: either fully qualified classnames or if not found,
+#. package at.dallermassl.josm.plugin.surveyor.action is assumed -->
+#: build/trans_surveyor.java:6
+msgid "Tunnel Start"
+msgstr "Начало тоннеля"
+
+#. <button label="Bridge" hotkey="B" type="toggle">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="bridge"/>
+#. </button>
+#: build/trans_surveyor.java:16
+msgid "Village/City"
+msgstr "Город/Село"
+
+#. <button label="Parking" hotkey="P" icon="parking">
+#. <!--action class="SetNodeAction" params="amenity=parking"/-->
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Parking"/>
+#. </button>
+#: build/trans_surveyor.java:29
+msgid "One Way"
+msgstr "Односторонняя"
+
+#. <button label="One Way" hotkey="O" icon="noentry">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="oneway=yes"/>
+#. </button>
+#: build/trans_surveyor.java:33
+msgid "Church"
+msgstr "Церковь"
+
+#. <button label="Church" hotkey="C" icon="church">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
+#. <action class="SetWaypointAction" params="Church"/>
+#. </button>
+#: build/trans_surveyor.java:38
+msgid "Fuel Station"
+msgstr "Заправка"
+
+#. <button label="Restaurant" hotkey="R" icon="restaurant">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetNodeAction" params="amenity=restaurant"/>
+#. <action class="SetWaypointAction" params="Restaurant"/>
+#. </button>
+#: build/trans_surveyor.java:52
+msgid "Shopping"
+msgstr "Магазин"
+
+#. <button label="Shopping" hotkey="S" icon="shopping">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Info"/>
+#. </button>
+#: build/trans_surveyor.java:56
+msgid "WC"
+msgstr "Туалет"
+
+#. <button label="WC" hotkey="W" icon="toilet">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Info"/>
+#. </button>
+#: build/trans_surveyor.java:60
+msgid "Camping"
+msgstr "Кэмпинг"
+
+#. <button label="Residential" hotkey="5">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Residential"/>
+#. </button>
+#. <!--
+#. <button label="Test" hotkey="shift X">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Test X"/>
+#. </button>
+#: build/trans_surveyor.java:93 build/trans_surveyor.java:97
+msgid "Test"
+msgstr "Тест"
+
+#. JOSM TagChecker validator file
+#. Format:
+#. Each line specifies a certain error to be reported
+#. <data type> : messagetype : <key><expression><value>
+#.
+#. Data type can be:
+#. node        - a node point
+#. way         - a way
+#. relation    - a relation
+#. *           - all data types
+#.
+#. Message type can be:
+#. E            - an error
+#. W            - a warning
+#. I            - an low priority informational warning
+#.
+#. Key and value are expressions describing certain keys and values of these keys.
+#. Regulator expressions are supported. In this case the expressions starts and
+#. ends with // signs. If an 'i' is appended, the regular expression is
+#. case insensitive.
+#.
+#. The * sign indicates any string.
+#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special
+#. handling for boolean values (yes, true, 0, false, no, ...).
+#.
+#. Expression can be:
+#. !=          - the key/value combination does not match
+#. ==          - the key/value combination does match
+#.
+#. To have more complicated expressions, multiple elements can be grouped together
+#. with an logical and (&&).
+#.
+#. The comment at the end of a rule is displayed in validator description
+#.
+#. Empty lines and space signs are ignored
+#: build/trans_validator.java:38
+msgid "oneway tag on a node"
+msgstr "тэг \"одностороннее движение\" в точке"
+
+#. node : W : oneway == *
+#: build/trans_validator.java:39
+msgid "bridge tag on a node"
+msgstr "тэг \"мост\" в точке"
+
+#. node : W : bridge == BOOLEAN_TRUE
+#. node : W : highway == tertiary
+#. node : W : highway == secondary
+#. node : W : highway == residential
+#. node : W : highway == unclassified
+#: build/trans_validator.java:40 build/trans_validator.java:41
+#: build/trans_validator.java:42 build/trans_validator.java:43
+#: build/trans_validator.java:44
+msgid "wrong highway tag on a node"
+msgstr "неверный тэг \"дорога\" в точке"
+
+#. node : W : highway == track
+#. way  : I : highway == secondary && ref != *
+#. way  : I : highway == tertiary && ref != *
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
+msgid "highway without a reference"
+msgstr "дорога без сноски"
+
+#. way  : I : highway == motorway && nat_ref != *
+#: build/trans_validator.java:48
+msgid "temporary highway type"
+msgstr "временный тип дороги"
+
+#. *    : W : highway == road
+#: build/trans_validator.java:49
+msgid "misspelled key name"
+msgstr "опечатка в названии ключа"
+
+#. *    : W : / *name */i == * && name != *
+#: build/trans_validator.java:51
+msgid "cycleway with tag bicycle"
+msgstr "велодорожка с тэгом 'велосипед'"
+
+#. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
+#: build/trans_validator.java:52
+msgid "footway with tag foot"
+msgstr "пешеходная дорожка с тэгом 'пешеход'"
+
+#. way  : W : highway == footway && foot == BOOLEAN_FALSE
+#. way  : I : highway == cycleway && bicycle == *                 # cycleway with tag bicycle
+#. way  : I : highway == footway && foot == *                     # footway with tag foot
+#: build/trans_validator.java:55
+msgid "separate cycleway as lane on a cycleway"
+msgstr "отдельная полоса для велосипедов на велодорожке"
+
+#. way  : W : highway == cycleway && cycleway == lane
+#: build/trans_validator.java:56
+msgid "barrier used on a way"
+msgstr "преграда на пути движения"
+
+#. way  : W : highway == * && barrier == *
+#. way  : I : waterway == * && layer != *                         # waterway without layer tag
+#: build/trans_validator.java:59
+msgid "maxspeed used for footway"
+msgstr "для пешеходной дороги установлена максимальная скорость движения"
+
+#. way  : I : highway == footway && maxspeed == *
+#: build/trans_validator.java:61
+msgid "layer tag with + sign"
+msgstr "номер слоя со знаком +"
+
+#. *    : W : layer == /\+.*/
+#: build/trans_validator.java:63
+msgid "street name contains ss"
+msgstr "название улицы содержит ss"
+
+#. *    : I : name == /.*Strasse.*/i
+#: build/trans_validator.java:64
+msgid "abbreviated street name"
+msgstr "сокращённое название улицы"
+
+#. *    : W : name == /.*Str\.?/i
+#: build/trans_validator.java:66
+msgid "relation without type"
+msgstr ""
+
+#. relation : E : type != *
+#: build/trans_validator.java:68
+msgid "restaurant without name"
+msgstr ""
+
+#. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
+#. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
+#. *    : W : natural == water && waterway == *
+#. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:70 build/trans_validator.java:71
+#: build/trans_validator.java:72
+msgid "unusual tag combination"
+msgstr ""
+
+#. FORMAT
+#. default(true or false);Name;URL
+#. NOTE: default items should be common and worldwide
+#.
+#: build/trans_wms.java:5
+msgid "Landsat"
+msgstr "Landsat"
+
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg
+#: build/trans_wms.java:6
+msgid "Open Aerial Map"
+msgstr ""
+
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg
+#. fails with division by zero error
+#: build/trans_wms.java:8
+msgid "NPE Maps"
+msgstr "карты NPE"
+
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+#: build/trans_wms.java:9
+msgid "NPE Maps (Tim)"
+msgstr ""
+
+#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
+#. different forms for Yahoo
+#. must be yahoo://<commandline>
+#. The {0} in the commandline is for the URL
+#. output must be on stdout
+#: build/trans_wms.java:14
+msgid "YAHOO (GNOME)"
+msgstr "YAHOO (GNOME)"
+
+#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#: build/trans_wms.java:15
+msgid "YAHOO (GNOME Fix)"
+msgstr ""
+
+#. yahoo://gnome-web-photo-fixed {0}
+#: build/trans_wms.java:16
+msgid "YAHOO (WebKit)"
+msgstr "YAHOO (WebKit)"
+
+#. yahoo://webkit-image {0}
+#: build/trans_wms.java:17
+msgid "YAHOO (WebKit GTK)"
+msgstr "YAHOO (WebKit GTK)"
+
+#. yahoo://webkit-image-gtk {0}
+#. only for Germany
+#: build/trans_wms.java:19
+msgid "Oberpfalz Geofabrik.de"
+msgstr "подложка Geofabrik.de"
+
+#. http://oberpfalz.geofabrik.de/wms4josm?
+#: build/trans_wms.java:20
+msgid "Streets NRW Geofabrik.de"
+msgstr ""
+
+#~ msgid "desc"
+#~ msgstr "описание"
+
+#~ msgid "symbol"
+#~ msgstr "символ"
+
+#~ msgid "time"
+#~ msgstr "время"
+
+#~ msgid "Signpost"
+#~ msgstr "Столб с указателями"
+
+#~ msgid "Information point"
+#~ msgstr "Информационный пункт"
+
+#~ msgid "office"
+#~ msgstr "офис"
+
+#~ msgid "guidepost"
+#~ msgstr "указатель"
 
 #~ msgid "Please select something from the conflict list."
@@ -13183,7 +20397,7 @@
 #~ "care and check if it works as expected.</html>"
 #~ msgstr ""
-#~ "<html>Данная функциональность добавлена совсем недавно. "
-#~ "Пожалуйста,<br>пользуйтесь с осторожностью, и проверяйте, чтоб всё работало, "
-#~ "как надо.</html>"
+#~ "<html>Данная функциональность добавлена совсем недавно. Пожалуйста,"
+#~ "<br>пользуйтесь с осторожностью, и проверяйте, чтоб всё работало, как "
+#~ "надо.</html>"
 
 #~ msgid "Upload track filtered by JOSM"
@@ -13202,5 +20416,4 @@
 #~ msgstr "Загрузка GPX"
 
-#, java-format
 #~ msgid "Upload raw file: {0}"
 #~ msgstr "Загрузить необработанный файл: {0}"
