Index: applications/editors/josm/i18n/po/ru.po =================================================================== --- applications/editors/josm/i18n/po/ru.po (revision 22950) +++ applications/editors/josm/i18n/po/ru.po (revision 23004) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-08-29 22:08+0000\n" -"Last-Translator: bastik \n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-02 22:13+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: Koptev Oleg \n" "MIME-Version: 1.0\n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2010-09-02 16:57+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: RUSSIAN FEDERATION\n" @@ -73,7 +73,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -89,5 +89,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -258,5 +258,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -430,5 +430,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -446,5 +446,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -623,10 +623,10 @@ "последовательностью точек." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "Объединить {0} линии" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "Выделите не менее двух линий для объединения." @@ -676,5 +676,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -814,5 +814,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Дублировать" @@ -1558,8 +1558,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1618,6 +1618,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "Ошибка" @@ -1784,5 +1784,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "Нет, прервать" @@ -3126,5 +3126,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3251,5 +3251,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Двойной конфликт" @@ -3611,10 +3611,10 @@ msgstr "Предупреждение: не удается сохранить настройки в ''{0}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "Ошибка в файле конфигурации на строках {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3625,5 +3625,5 @@ "не является каталогом." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3634,5 +3634,5 @@ "является каталогом." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3643,5 +3643,5 @@ "отсутствующий каталог настроек: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3652,5 +3652,5 @@ "каталог настроек: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3660,5 +3660,5 @@ "параметрами по умолчанию." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3669,5 +3669,5 @@ "параметров по умолчанию." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3678,5 +3678,5 @@ "к состоянию по умолчанию: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3687,5 +3687,5 @@ "резервный
{0}
а новый будет создан с параметрами по умолчанию." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3696,10 +3696,10 @@ "настроек {0} к состоянию по умолчанию." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "Ошибка: Неожиданная строка ''{0}'' в файле закладок ''{1}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4995,5 +4995,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -5011,5 +5011,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5555,5 +5555,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -6257,5 +6257,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "Создать копию этого отношения и открыть его в другом окне редактора" @@ -6338,5 +6338,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -8192,5 +8192,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -8259,26 +8259,26 @@ msgstr "({0}/{1}): Скачивание отношения ''{2}''..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Теги и участники" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Родительские отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Дочерние элементы отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Применить роль:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "Ввести роль и применить её на выделенных участников отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -8290,14 +8290,14 @@ "хотите продолжать с циклическими отношениями?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Удалить их, почистить отношение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Игнорировать их, оставить отношение как есть" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -8310,9 +8310,9 @@ "участника отношения?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Несколько участников, относящихся к одному и тому же элементу" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -8325,5 +8325,5 @@ "''{0}'' будет пропущено." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -8332,5 +8332,5 @@ "участником" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -8339,5 +8339,5 @@ "участника" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8347,5 +8347,5 @@ "выделенным участником" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8355,20 +8355,20 @@ "выделенного участника" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "Удалить всех участников, относящихся к каждому из выделенных элементов" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "Редактор отношений: удалить выделенное" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "Выделить участников отношения, которые относятся к выбранным элементам" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8379,64 +8379,64 @@ "выделенных элементов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Выделить элементы для выделенных участников отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Сортировать участников отношений" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Сортировать" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Редактор отношений: сортировать" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Поменять порядок участников отношения на обратный" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "В обратном порядке" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Редактор отношений: Наоборот" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Переместить выделенных участников отношения вверх" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Редактор отношений: поднять" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Переместить выделенных участников отношения вниз" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Редактор отношений: опустить" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Удалить отмеченных участников из отношения" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Редактор отношений: удалить" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Удалить редактируемое отношение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8448,19 +8448,19 @@ "был открыт. Они были удалены из списка участников отношений." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "Да, создать конфликт и закрыть" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "Щёлкните, чтобы создать конфликт и закрыть этот редактор отношений" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "Нет, продолжить редактирование" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" @@ -8468,5 +8468,5 @@ "отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8478,5 +8478,5 @@ "создать конфликт и закрыть редактор?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8487,50 +8487,50 @@ "
Пожалуйста, уладьте этот конфликт, прежде чем продолжать." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Записать внесённые изменения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "Применить обновления и закрыть диалог" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "Отменить обновления и закрыть диалог" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Добавить пустой тег" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Скачать всех неполных участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Скачать участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Редактор отношений: скачать участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Скачать с сервера выделенных неполных участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "Задать роль для выделенных участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Применить роль" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8540,29 +8540,29 @@ msgstr[2] "Вы назначили пустую роль на {0} элементов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "Это эквивалентно удалению ролей из этих элементов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "Вы действительно хотите назначить новую роль?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "Да, записать" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "Нет, не записывать" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "Подтвердить пустую роль" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "Выделенный, при редактировании отношения, участник относится к" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8948,4 +8948,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -12972,9 +12973,9 @@ msgstr "Настроить доступные модули." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "Скачать модули" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "Необходимо перезапустить JOSM, чтобы изменения вступили в силу." @@ -14302,11 +14303,11 @@ "идентификатором {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "(Код={0})" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -14821,10 +14822,10 @@ msgstr "Соединение с сервером..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "Не удалось установить соединение с API {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." @@ -14832,4 +14833,8 @@ "Не удается соединиться с сервером OSM. Пожалуйста, проверьте Ваше интернет-" "соединение." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -15689,5 +15694,5 @@ "проблема конфигурации. JOSM прекращает работу." -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" @@ -15695,6 +15700,6 @@ "Предупреждение: не удалось обработать файл .zip {0}''. Текст ошибки: {1}" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -17349,5 +17354,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "Пустой слой" @@ -19441,10 +19446,10 @@ msgstr "Ряд домов вдоль улицы" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "Редактировать OpenSeaMap" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "Редактор морских объектов Seamark Editor" @@ -21578,25 +21583,22 @@ msgstr "Выберите не разветвляющиеся последовательности линий" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "Сохранить WMS слой" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "Название меню" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "Служебная" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "Слои" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -21604,49 +21606,43 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "Ошибка" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -#, fuzzy -msgid "Show Bounds" -msgstr "Границы" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "Не отображать линии между точками для этого слоя." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "Ссылка на WMS" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." -msgstr "Ошибочная ссылка?" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." -msgstr "Сначала выберите слой WMS в списке." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." -msgstr "Сначала выберите слой WMS в списке." +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76 @@ -21771,5 +21767,5 @@ "Это может привести к ошибочным координатам." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" @@ -21778,19 +21774,19 @@ "искажена" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "(деактивировано)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "Автоматическое скачивание слоя WMS ({0}), в масштабе {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Скачивание слоя WMS ({0}), в масштабе {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -21805,17 +21801,17 @@ "попытаться извлечь квадраты WMS?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "Да, выбрать изображения" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "Ошибочная ссылка?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "Скачать видимые квадраты карты" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -21824,33 +21820,33 @@ "измените разрешение" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "Изменить разрешение" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "Загрузить заново ошибочные квадраты карты" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "Альфа канал" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "Сохранить слой WMS в файл" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "Сохранить WMS слой" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "Загрузить слой WMS из файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "Загрузить WMS слой" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -21858,17 +21854,17 @@ "Неподдерживаемый формат версии WMS файла; обнаружено {0}, ожидалось {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "Ошибка формата файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "Ошибка при загрузке файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "Установить закладку WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "Автоматическое скачивание" @@ -21886,21 +21882,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "Открыть пустой WMS-слой для загрузки данных из файла" @@ -21923,7 +21924,6 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 -#, fuzzy msgid "Add WMS URL" -msgstr "Ссылка на WMS" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104 @@ -36172,7 +36172,4 @@ msgstr "PCN 2006 — Италия" -#~ msgid "Enter a menu name and WMS URL" -#~ msgstr "Введите имя пункта меню и URL этого WMS" - #~ msgid "No data imported." #~ msgstr "Данные не импортированы" @@ -36846,4 +36843,7 @@ #~ msgid "Open User Page" #~ msgstr "Открыть страницу пользователя" + +#~ msgid "Enter a menu name and WMS URL" +#~ msgstr "Введите имя пункта меню и URL этого WMS" #~ msgid "Please select the row to copy."