Fix: include file.h in file.c

[andy/viking.git] / po / ru.po

diff --git a/po/ru.po b/po/ru.po
index 4c35363b1d532111d949639862af013fdc8f335b..ab640786549ad99ba9ceedcc773786dbab880a79 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,70 +1,95 @@
 # Russian translation for viking
 # Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
 # This file is distributed under the same license as the viking package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
+# Dmitri Bogomolov  <4glitch@gmail.com>, 2008-2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: viking\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-23 23:39+0200\n"
-"PO-Revision-Date: 2010-09-07 09:10+0000\n"
-"Last-Translator: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>\n"
+"POT-Creation-Date: 2013-02-04 23:29+0100\n"
+"PO-Revision-Date: 2012-10-29 21:19+0000\n"
+"Last-Translator: Dmitri Bogomolov <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\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: 2010-11-14 21:36+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-03-23 17:12+0000\n"
+"X-Generator: Launchpad (build 16540)\n"
 
-#: ../src/acquire.c:118
-msgid "Working..."
-msgstr "Ð\92Ñ\8bполнÑ\8fеÑ\82Ñ\81Ñ\8f..."
+#: ../src/acquire.c:103 ../src/vikgpslayer.c:1185
+msgid "Done."
+msgstr "Ð\93оÑ\82ово."
 
-#: ../src/acquire.c:141
+#: ../src/acquire.c:114
+msgid "No data."
+msgstr "Нет данных."
+
+#: ../src/acquire.c:154 ../src/acquire.c:404
 msgid "Error: acquisition failed."
 msgstr "Ошибка: получение не удалось"
 
-#: ../src/acquire.c:149 ../src/vikgpslayer.c:1019
-msgid "Done."
-msgstr "Ð\93оÑ\82ово."
+#: ../src/acquire.c:341
+msgid "Working..."
+msgstr "Ð\92Ñ\8bполнÑ\8fеÑ\82Ñ\81Ñ\8f..."
 
-#: ../src/acquire.c:156
-msgid "No data."
-msgstr "Нет данных"
+#. This shouldn't happen...
+#: ../src/acquire.c:394
+msgid ""
+"Unable to create command\n"
+"Acquire method failed."
+msgstr ""
 
-#: ../src/acquire.c:339 ../src/vikgpslayer.c:1058
-msgid "Status: detecting gpsbabel"
-msgstr "Статус: поиск gpsbabel"
+#: ../src/acquire.c:486
+msgid "_Filter"
+msgstr ""
+
+#: ../src/acquire.c:501
+#, c-format
+msgid "Filter with %s"
+msgstr ""
 
-#: ../src/background.c:57
+#: ../src/acquire.c:518
+msgid "Filter"
+msgstr ""
+
+#: ../src/background.c:52
 #, c-format
 msgid "%d items"
 msgstr "%d элементов"
 
-#: ../src/background.c:225
+#: ../src/background.c:248
 msgid "Job"
 msgstr "Операция"
 
-#: ../src/background.c:229
+#: ../src/background.c:252
 msgid "Progress"
 msgstr "Ход выполнения"
 
-#: ../src/background.c:240
+#: ../src/background.c:268
 msgid "Viking Background Jobs"
 msgstr "Фоновые задачи"
 
-#: ../src/clipboard.c:84
+#: ../src/bing.c:47
+msgid "Bing"
+msgstr "Bing"
+
+#. VIK_GTK_WINDOW_FROM_WIDGET(vp)
+#: ../src/bingmapsource.c:445
+msgid "Bing attribution Loading"
+msgstr ""
+
+#: ../src/clipboard.c:95
 msgid "paste failed"
 msgstr "ошибка вставки"
 
-#: ../src/clipboard.c:94
+#: ../src/clipboard.c:105
 msgid "wrong clipboard data size"
 msgstr "неправильный размер буфера обмена"
 
-#: ../src/clipboard.c:113
+#: ../src/clipboard.c:124
 #, c-format
 msgid ""
 "The clipboard contains sublayer data for %s layers. You must select a layer "
@@ -73,151 +98,149 @@ msgstr ""
 "Буфер содержит данные подслоя для %s слоев. Вы должны выбрать слой этого "
 "типа, чтобы вставить данные из буфер обмена."
 
-#: ../src/clipboard.c:219
+#: ../src/clipboard.c:236
 msgid ""
 "In order to paste a waypoint, please select an appropriate layer to paste "
 "into."
 msgstr ""
 "Для того, чтобы вставить точку, выберите соответствующий слой для вставки."
 
-#: ../src/curl_download.c:115
-#, c-format
-msgid "%s() Curl perform failed: %s"
-msgstr "%s() Curl выполнить не удалось: %s"
-
-#: ../src/dialog.c:49
+#: ../src/dialog.c:52
 msgid "Go to Lat/Lon"
-msgstr ""
+msgstr "Перейти к Широте/Долготе"
 
-#: ../src/dialog.c:61 ../src/dialog.c:236
+#: ../src/dialog.c:64 ../src/dialog.c:251
 msgid "Latitude:"
 msgstr "Широта:"
 
-#: ../src/dialog.c:67 ../src/dialog.c:241
+#: ../src/dialog.c:70 ../src/dialog.c:256
 msgid "Longitude:"
 msgstr "Долгота:"
 
-#: ../src/dialog.c:97
+#: ../src/dialog.c:102
 msgid "Go to UTM"
-msgstr ""
+msgstr "Перейти к UTM"
 
-#: ../src/dialog.c:110
+#: ../src/dialog.c:115
 msgid "Northing:"
-msgstr ""
+msgstr "Ничего:"
 
-#: ../src/dialog.c:116
+#: ../src/dialog.c:121
 msgid "Easting:"
-msgstr ""
+msgstr "Движение на восток:"
 
-#: ../src/dialog.c:123
+#: ../src/dialog.c:128
 msgid "Zone:"
 msgstr "Зона:"
 
-#: ../src/dialog.c:126
+#: ../src/dialog.c:131
 msgid "Letter:"
 msgstr "Письмо:"
 
 # Свойства пункта
-#: ../src/dialog.c:187
+#: ../src/dialog.c:199
 msgid "Waypoint Properties"
-msgstr "Свойства путевой точки"
+msgstr "Свойства пункта"
 
-#: ../src/dialog.c:224
+#: ../src/dialog.c:233
 msgid "Name:"
 msgstr "Имя:"
 
-#: ../src/dialog.c:246
+#: ../src/dialog.c:261
 msgid "Altitude:"
 msgstr "Высота:"
 
-#: ../src/dialog.c:251
+#: ../src/dialog.c:266
 msgid "Comment:"
 msgstr "Комментарий:"
 
-#: ../src/dialog.c:258
+#: ../src/dialog.c:274 ../src/osm-traces.c:437
+msgid "Description:"
+msgstr "Описание:"
+
+#: ../src/dialog.c:277
 msgid "Image:"
 msgstr "Изображение:"
 
-#: ../src/dialog.c:263
+#: ../src/dialog.c:282
 msgid "Symbol:"
 msgstr "Символ:"
 
-#: ../src/dialog.c:272
+#: ../src/dialog.c:291
 msgid "(none)"
 msgstr "(нет)"
 
 #. TODO: other checks (isalpha or whatever )
-#: ../src/dialog.c:327
+#: ../src/dialog.c:356
 msgid "Please enter a name for the waypoint."
-msgstr "Введите имя для новой путевой точки."
-
-#: ../src/dialog.c:331
-#, c-format
-msgid "The waypoint \"%s\" exists, do you want to overwrite it?"
-msgstr "Путевая точка  \"%s\" уже существует, перезаписать?"
+msgstr "Введите имя для нового пункта."
 
-#: ../src/dialog.c:482 ../src/geonamessearch.c:228
+#: ../src/dialog.c:529 ../src/geonamessearch.c:243
+#: ../src/datasource_osm_my_traces.c:507
 msgid "Nothing was selected"
 msgstr "Ничего не выбрано"
 
-#: ../src/dialog.c:490
+#: ../src/dialog.c:537
+msgid "Add Route"
+msgstr ""
+
+#: ../src/dialog.c:537
 msgid "Add Track"
-msgstr "Добавить трек"
+msgstr "Добавить маршрут"
+
+#: ../src/dialog.c:545
+msgid "Route Name:"
+msgstr ""
 
-#: ../src/dialog.c:498
+#: ../src/dialog.c:545
 msgid "Track Name:"
-msgstr "Имя трека:"
+msgstr "Имя маршрута:"
 
-#: ../src/dialog.c:516
+#: ../src/dialog.c:565
 msgid "Please enter a name for the track."
-msgstr "Введите имя трека"
+msgstr "Введите имя маршрута"
 
-#: ../src/dialog.c:520
-#, c-format
-msgid "The track \"%s\" exists, do you want to overwrite it?"
-msgstr "Трек \"%s\" существует, перезаписать?"
-
-#: ../src/dialog.c:582
+#: ../src/dialog.c:623
 msgid "Zoom Factors..."
 msgstr "Величины приближения..."
 
-#: ../src/dialog.c:596
+#: ../src/dialog.c:637
 msgid "Zoom factor (in meters per pixel):"
 msgstr "Величина приближения (в метрах на пиксел):"
 
-#: ../src/dialog.c:597
+#: ../src/dialog.c:638
 msgid "X (easting): "
-msgstr ""
+msgstr "X (восточнее): "
 
-#: ../src/dialog.c:598
+#: ../src/dialog.c:639
 msgid "Y (northing): "
-msgstr ""
+msgstr "Y (севернее): "
 
-#: ../src/dialog.c:603
+#: ../src/dialog.c:644
 msgid "X and Y zoom factors must be equal"
 msgstr "Величины приближения по X и по Y должны совпадать."
 
-#: ../src/dialog.c:656
+#: ../src/dialog.c:699
 msgid "1 min"
 msgstr "1 мин"
 
-#: ../src/dialog.c:657
+#: ../src/dialog.c:700
 msgid "1 hour"
 msgstr "1 час"
 
-#: ../src/dialog.c:658
+#: ../src/dialog.c:701
 msgid "1 day"
 msgstr "1 день"
 
-#: ../src/dialog.c:659
+#: ../src/dialog.c:702
 msgid "Custom (in minutes):"
 msgstr "Произвольно (в минутах)"
 
-#: ../src/dialog.c:714
+#: ../src/dialog.c:808
 msgid "GPS Data and Topo Analyzer, Explorer, and Manager."
-msgstr ""
+msgstr "Анализатор, обозреватель и менеджер данных GPS."
 
-#: ../src/dialog.c:715
+#: ../src/dialog.c:809
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -233,22 +256,58 @@ msgid ""
 "this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
 "Place, Suite 330, Boston, MA 02111-1307, USA"
 msgstr ""
+"Данная программа является свободным программным обеспечением; вы можете "
+"распространять и (или) изменять её в соответствии с условиями GNU General "
+"Public License, опубликованной Free Software Foundation; либо версии 2 "
+"лицензии, или (на ваш выбор) любой более поздней.\n"
+"\n"
+"Эта программа распространяется в надежде, что она будет полезной, но БЕЗ "
+"КАКИХ-ЛИБО ГАРАНТИЙ, даже без подразумеваемых гарантий КОММЕРЧЕСКОЙ ЦЕННОСТИ "
+"или ПРИГОДНОСТИ ДЛЯ КОНКРЕТНЫХ ЦЕЛЕЙ. См. GNU General Public License для "
+"более подробной информации.\n"
+"\n"
+"Вы должны были получить копию GNU General Public License вместе с этой "
+"программой; если нет, напишите в Free Software Foundation, Inc., 59 Temple "
+"Place, Suite 330, Boston, MA 02111-1307, USA"
 
-#: ../src/dialog.c:749
+#: ../src/dialog.c:837
+msgid "Translation is coordinated on http://launchpad.net/viking"
+msgstr "Перевод координируется http://launchpad.net/viking"
+
+#: ../src/dialog.c:845
 msgid "Download along track"
 msgstr "Скачать вдоль пути"
 
-#: ../src/dialog.c:751
+#: ../src/dialog.c:851
 msgid "Map type:"
 msgstr "Тип карты:"
 
-#: ../src/dialog.c:756
+#: ../src/dialog.c:856
 msgid "Zoom level:"
 msgstr "Увеличение/уменьшение:"
 
+#: ../src/dialog.c:896
+#, c-format
+msgid "The map data is licensed: %s."
+msgstr "Картографические данные лицензированы: %s."
+
+#: ../src/dialog.c:899
+#, c-format
+msgid ""
+"The data provided by '<b>%s</b>' are licensed under the following license: "
+"<b>%s</b>.\n"
+"Please, read the license before continuing."
+msgstr ""
+"Данные, предоставленные '<b>%s</b>', по следующей лицензии: <b>%s</b>.\n"
+"Пожалуйста, прочтите лицензию перед тем, как продолжить."
+
+#: ../src/dialog.c:904
+msgid "Open license"
+msgstr "Открытая лицензия"
+
 #: ../src/expedia.c:53
 msgid "Expedia Street Maps"
-msgstr ""
+msgstr "Карты Expedia"
 
 #: ../src/expedia.c:81
 msgid "Invalid expedia altitude"
@@ -272,189 +331,431 @@ msgstr ""
 "Не удалось сохранить графический файл EXPEDIA (сразу после удачного "
 "скачивания! Пожалуйста сообщите об ошибке и удалите файл!): %s"
 
-#: ../src/geonamessearch.c:98
+#. *
+#. * See http://www.geonames.org/export/wikipedia-webservice.html#wikipediaBoundingBox
+#. 
+#. Translators may wish to change this setting as appropriate to get Wikipedia articles in that language
+#: ../src/geonamessearch.c:46
+msgid "en"
+msgstr ""
+
+#: ../src/geonamessearch.c:121
 msgid "Search"
 msgstr "Поиск"
 
-#: ../src/geonamessearch.c:100
+#: ../src/geonamessearch.c:123
 msgid "No entries found!"
 msgstr "Записи не найдены!"
 
-#: ../src/geonamessearch.c:254 ../src/googlesearch.c:121
-msgid "couldn't map temp file"
+#. NB could allow columns to be shifted around by doing this after each new
+#. gtk_tree_view_column_set_reorderable ( column, TRUE );
+#. However I don't think is that useful, so I haven't put it in
+#: ../src/geonamessearch.c:177 ../src/datasource_osm_my_traces.c:425
+msgid "Name"
 msgstr ""
 
-#: ../src/geonamessearch.c:395 ../src/vikgototool.c:250
-msgid "couldn't open temp file"
-msgstr "невозможно открыть временный файл"
+#: ../src/geonamessearch.c:182
+msgid "Feature"
+msgstr ""
 
-#: ../src/globals.c:42
+#: ../src/geonamessearch.c:187 ../src/datasource_osm_my_traces.c:440
+msgid "Lat/Lon"
+msgstr ""
+
+#: ../src/geonamessearch.c:269 ../src/googlesearch.c:100
+msgid "couldn't map temp file"
+msgstr ""
+
+#: ../src/globals.c:44
 msgid "Degree format:"
 msgstr "Формат градусов:"
 
-#: ../src/globals.c:46
+#: ../src/globals.c:48
 msgid "Distance units:"
 msgstr "Единица расстояния:"
 
-#: ../src/globals.c:50
+#: ../src/globals.c:52
 msgid "Speed units:"
 msgstr "Единица скорости:"
 
-#: ../src/globals.c:54
+#: ../src/globals.c:56
 msgid "Height units:"
 msgstr "Единица высоты:"
 
-#: ../src/globals.c:58
+#: ../src/globals.c:60
 msgid "Use large waypoint icons:"
-msgstr "Большие иконки путевых точек:"
+msgstr "Большие иконки пунктов:"
 
-#: ../src/globals.c:62
+#: ../src/globals.c:64
 msgid "Default latitude:"
 msgstr "Широта по умолчанию:"
 
-#: ../src/globals.c:65
+#: ../src/globals.c:67
 msgid "Default longitude:"
 msgstr "Долгота по умолчанию:"
 
+#: ../src/globals.c:73
+msgid "Alphabetical"
+msgstr ""
+
+#: ../src/globals.c:73 ../src/datasource_osm_my_traces.c:435
+msgid "Time"
+msgstr ""
+
+#: ../src/globals.c:76
+msgid "KML File Export Units:"
+msgstr ""
+
+#: ../src/globals.c:77
+msgid "GPX Track Order:"
+msgstr ""
+
+#: ../src/globals.c:82
+msgid "Image Viewer:"
+msgstr ""
+
+#: ../src/globals.c:87
+msgid "External GPX Program 1:"
+msgstr "Внешняя GPX Программа 1:"
+
+#: ../src/globals.c:88
+msgid "External GPX Program 2:"
+msgstr "Внешняя GPX Программа 2:"
+
+#. Defaults for the options are setup here
+#: ../src/globals.c:96
+msgid "General"
+msgstr "Общие"
+
+#. New Tab
+#: ../src/globals.c:121
+msgid "Export/External"
+msgstr "Экспорт/Внешний"
+
 #. Webtools
 #: ../src/google.c:36
 msgid "Google"
 msgstr "Google"
 
-#: ../src/datasource_gc.c:62
+#: ../src/datasource_file.c:59
+msgid "Import file with GPSBabel"
+msgstr "Импортировать с помощью GPSBabel"
+
+#: ../src/datasource_file.c:60
+msgid "Imported file"
+msgstr "Импортированный файл"
+
+#. The file selector
+#: ../src/datasource_file.c:133
+msgid "File:"
+msgstr "Файл:"
+
+#: ../src/datasource_file.c:134
+msgid "File to import"
+msgstr "Файл для импорта"
+
+#: ../src/datasource_file.c:141
+msgid "All files"
+msgstr "Все файлы"
+
+#. The file format selector
+#: ../src/datasource_file.c:148
+msgid "File type:"
+msgstr "Тип файла:"
+
+#: ../src/datasource_file.c:193
+#, c-format
+msgid "using babel args '%s' and file '%s'"
+msgstr ""
+
+#: ../src/datasource_gc.c:66
 msgid "Download Geocaches"
-msgstr "Загрузить Геокеши"
+msgstr "Загрузить Геокэши"
 
-#: ../src/datasource_gc.c:63
+#: ../src/datasource_gc.c:67
 msgid "Geocaching.com Caches"
 msgstr "Кэши geocaching.com"
 
-#: ../src/datasource_gc.c:79
+#: ../src/datasource_gc.c:84
 msgid "geocaching.com username:"
 msgstr "Имя пользователя geocaching.com:"
 
-#: ../src/datasource_gc.c:80
+#: ../src/datasource_gc.c:85
 msgid "geocaching.com password:"
 msgstr "Пароль пользователя geocaching.com:"
 
-#: ../src/datasource_gc.c:108
+#: ../src/datasource_gc.c:126
+#, c-format
 msgid ""
-"Can't find gcget in path! Check that you have installed gcget correctly."
-msgstr ""
-"Не удается найти gcget! Проверьте что у вас есть корректно установленный "
-"gcget."
+"Can't find %s or %s in path! Check that you have installed it correctly."
+msgstr "Невозможно найти %s или %s! Проверьте правильность установки."
 
-#: ../src/datasource_gc.c:170
+#: ../src/datasource_gc.c:188
 msgid "Number geocaches:"
 msgstr "Количество геокешей:"
 
-#: ../src/datasource_gc.c:172
+#: ../src/datasource_gc.c:190
 msgid "Centered around:"
+msgstr "Вокруг:"
+
+#: ../src/datasource_gc.c:226
+msgid "Broken input - using some defaults"
+msgstr ""
+
+#: ../src/datasource_geotag.c:51
+msgid "Create Waypoints from Geotagged Images"
 msgstr ""
 
+#: ../src/datasource_geotag.c:52
+msgid "Geotagged Images"
+msgstr "Изображения с данными о местоположении"
+
+#: ../src/datasource_geotag.c:102 ../src/vikwindow.c:2314
+#: ../src/vikwindow.c:2382 ../src/vikwindow.c:2824
+msgid "All"
+msgstr "Все"
+
+#: ../src/datasource_geotag.c:107 ../src/vikwindow.c:2829
+msgid "JPG"
+msgstr "JPG"
+
+#: ../src/datasource_geotag.c:165
+#, c-format
+msgid "Unable to create waypoint from %s"
+msgstr "Не удаётся создать путевую точку из %s"
+
 #: ../src/datasource_google.c:49 ../src/datasource_google.c:50
 msgid "Google Directions"
-msgstr ""
+msgstr "Проводник Google"
 
-#: ../src/datasource_google.c:75
+#: ../src/datasource_google.c:77
 msgid "From:"
-msgstr ""
+msgstr "Из:"
 
-#: ../src/datasource_google.c:77
+#: ../src/datasource_google.c:79
 msgid "To:"
-msgstr "(po-check-file-header)"
+msgstr "в:"
 
-#: ../src/datasource_gps.c:53
+#: ../src/datasource_gps.c:57
 msgid "Acquire from GPS"
 msgstr "Получить из GPS"
 
-#: ../src/datasource_gps.c:54
+#: ../src/datasource_gps.c:58
 msgid "Acquired from GPS"
 msgstr "Получено из GPS"
 
-#: ../src/datasource_gps.c:142
+#: ../src/datasource_gps.c:221
 #, c-format
 msgid "using cmdline '%s' and file '%s'\n"
-msgstr ""
+msgstr "используя команду '%s' и файл '%s'\n"
 
-#: ../src/datasource_gps.c:204 ../src/vikgpslayer.c:761
+#: ../src/datasource_gps.c:297 ../src/vikgpslayer.c:884
 #, c-format
 msgid "Downloading %d waypoint..."
 msgid_plural "Downloading %d waypoints..."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Скачивается %d пункт..."
+msgstr[1] "Скачивается %d пункта..."
+msgstr[2] "Скачивается %d пунктов..."
 
-#: ../src/datasource_gps.c:206 ../src/vikgpslayer.c:763
+#: ../src/datasource_gps.c:298 ../src/vikgpslayer.c:885
 #, c-format
 msgid "Downloading %d trackpoint..."
 msgid_plural "Downloading %d trackpoints..."
+msgstr[0] "Скачивается %d узел..."
+msgstr[1] "Скачивается %d узла..."
+msgstr[2] "Скачивается %d узлов..."
+
+#: ../src/datasource_gps.c:303 ../src/vikgpslayer.c:890
+#, c-format
+msgid "Downloading %d routepoint..."
+msgid_plural "Downloading %d routepoints..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/datasource_gps.c:224
+#: ../src/datasource_gps.c:325 ../src/datasource_gps.c:326
+#: ../src/datasource_gps.c:327
 #, c-format
 msgid "Downloaded %d out of %d %s..."
 msgstr "Скачано %d из %d %s..."
 
-#: ../src/datasource_gps.c:226
+#: ../src/datasource_gps.c:331 ../src/datasource_gps.c:332
+#: ../src/datasource_gps.c:333
 #, c-format
 msgid "Downloaded %d %s."
 msgstr "Скачано %d %s."
 
-#: ../src/datasource_gps.c:239 ../src/vikgpslayer.c:833
+#: ../src/datasource_gps.c:347 ../src/vikgpslayer.c:968
 #, c-format
 msgid "GPS Device: %s"
 msgstr "GPS : %s"
 
-#: ../src/datasource_gps.c:328 ../src/vikgpslayer.c:145
+#: ../src/datasource_gps.c:370 ../src/vikgpslayer.c:1042
+#: ../src/vikgpslayer.c:1110
+msgid "Status: Working..."
+msgstr ""
+
+#: ../src/datasource_gps.c:469 ../src/vikgpslayer.c:150
 msgid "GPS Protocol:"
 msgstr "GPS протокол:"
 
-#: ../src/datasource_gps.c:335 ../src/vikgpslayer.c:146
+#. List now assigned at runtime
+#: ../src/datasource_gps.c:488 ../src/vikgpslayer.c:151
 msgid "Serial Port:"
 msgstr "Последовательный порт:"
 
-#: ../src/datasource_gps.c:356
+#: ../src/datasource_gps.c:509
 msgid ""
 "Turn Off After Transfer\n"
-"(Garmin Only)"
+"(Garmin/NAViLink Only)"
+msgstr ""
+"Выключить после передачи\n"
+"(только для Garmin/NAViLink)"
+
+#: ../src/datasource_gps.c:512
+msgid "Tracks:"
+msgstr "Маршруты"
+
+#: ../src/datasource_gps.c:516
+msgid "Routes:"
 msgstr ""
 
-#: ../src/datasource_gps.c:377 ../src/vikgpslayer.c:1063
+#: ../src/datasource_gps.c:520
+msgid "Waypoints:"
+msgstr "Путевые точки:"
+
+#: ../src/datasource_gps.c:594 ../src/vikgpslayer.c:1305
 msgid "GPS device: N/A"
 msgstr "GPS устройство: необнаружено"
 
-#: ../src/dem.c:59 ../src/dem.c:73
+#: ../src/datasource_osm.c:52 ../src/datasource_osm.c:53
+msgid "OSM traces"
+msgstr "Контуры OSM"
+
+#: ../src/datasource_osm.c:80
+msgid "Page number:"
+msgstr "Номер страницы:"
+
+#: ../src/datasource_osm_my_traces.c:63 ../src/datasource_osm_my_traces.c:64
+msgid "OSM My Traces"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:108
+msgid "Username:"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:113
+msgid "The email or username used to login to OSM"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:115 ../src/osm-traces.c:413
+msgid "Password:"
+msgstr "Пароль:"
+
+#: ../src/datasource_osm_my_traces.c:120
+msgid "The password used to login to OSM"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:430
+msgid "Description"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:445
+msgid "Privacy"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:452
+msgid "Within Current View"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:518
+msgid "GPS Traces"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:520
+msgid "None found!"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:629
+msgid "My OSM Traces"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:645
+#, c-format
+msgid "Unable to get trace: %s"
+msgstr ""
+
+#: ../src/datasource_wikipedia.c:32
+msgid "Create Waypoints from Wikipedia Articles"
+msgstr ""
+
+#: ../src/datasource_wikipedia.c:33
+msgid "Wikipedia Waypoints"
+msgstr ""
+
+#: ../src/dem.c:65 ../src/dem.c:79
 msgid "Invalid DEM"
 msgstr "Неправильный DEM"
 
-#: ../src/dem.c:115
+#: ../src/dem.c:121
 msgid "Invalid DEM header"
 msgstr "Неправильный DEM заголовок"
 
-#: ../src/dem.c:184 ../src/dem.c:197
+#: ../src/dem.c:190 ../src/dem.c:203
 msgid "Incorrect DEM Class B record: expected 1"
-msgstr ""
+msgstr "Неправильная запись DEM Class B: ожидается 1"
 
-#: ../src/dem.c:354
+#: ../src/dem.c:360
 #, c-format
 msgid "Couldn't map file %s: %s"
 msgstr ""
 
-#: ../src/download.c:111
+#: ../src/download.c:112
 msgid "Tile age (s):"
 msgstr ""
 
-#: ../src/download.c:232
+#: ../src/download.c:233
 #, c-format
 msgid "Download error: %s"
 msgstr "Ошибка загрузки: %s"
 
-#: ../src/file.c:426 ../src/file.c:430
+#: ../src/download.c:313
+msgid "couldn't open temp file"
+msgstr "невозможно открыть временный файл"
+
+#: ../src/file.c:456 ../src/file.c:461
 #, c-format
 msgid "Draw mode '%s' no more supported"
 msgstr "Режим отображения '%s' больше не поддерживается"
 
+#: ../src/geotag_exif.c:433
+msgid "Not enough memory."
+msgstr "Не хватает памяти."
+
+#: ../src/geotag_exif.c:451
+msgid "Setting a value for this tag is unsupported!"
+msgstr "Установка значения для этого тега не поддерживается!"
+
+#: ../src/geotag_exif.c:470
+#, c-format
+msgid "Too few components specified (need %d, found %d)\n"
+msgstr "Слишком мало указанных компонентов (нужно %d, найдено %d)\n"
+
+#: ../src/geotag_exif.c:474
+msgid "Numeric value expected\n"
+msgstr "Ожидаемые числовые значения\n"
+
+#: ../src/geotag_exif.c:482
+msgid "This shouldn't happen!"
+msgstr "Это не должно случиться!"
+
+#: ../src/geotag_exif.c:552
+msgid "Not yet implemented!"
+msgstr "Пока не реализовано!"
+
+#: ../src/geotag_exif.c:565
+msgid "Warning; Too many components specified!"
+msgstr "Предупреждение: указано слишком много компонентов!"
+
 #: ../src/osm-traces.c:73
 msgid "Identifiable (public w/ timestamps)"
 msgstr ""
@@ -469,7 +770,7 @@ msgstr "Публичное"
 
 #: ../src/osm-traces.c:76
 msgid "Private"
-msgstr ""
+msgstr "Частное"
 
 #: ../src/osm-traces.c:93
 msgid "OSM username:"
@@ -479,40 +780,62 @@ msgstr "OSM имя:"
 msgid "OSM password:"
 msgstr "OSM пароль:"
 
-#: ../src/osm-traces.c:229
+#. Preferences
+#: ../src/osm-traces.c:151
+msgid "OpenStreetMap Traces"
+msgstr "Контуры OpenStreetMap"
+
+#: ../src/osm-traces.c:234
 #, c-format
 msgid "failed to upload data: HTTP response is %ld"
 msgstr "Не удалось загрузить данные: ответ HTTP %ld"
 
-#: ../src/osm-traces.c:232
+#: ../src/osm-traces.c:239
 #, c-format
 msgid "curl_easy_getinfo failed: %d"
-msgstr ""
+msgstr "curl_easy_getinfo не удалось: %d"
 
-#: ../src/osm-traces.c:236
+#: ../src/osm-traces.c:244
 #, c-format
 msgid "curl request failed: %s"
-msgstr ""
+msgstr "Неудачный запрос curl: %s"
 
-#: ../src/osm-traces.c:264
+#: ../src/osm-traces.c:275
 #, c-format
 msgid "failed to open temporary file: %s"
 msgstr "не удалось открыть временный файл: %s"
 
-#: ../src/osm-traces.c:298
+#. Success
+#: ../src/osm-traces.c:328
+msgid "Uploaded to OSM"
+msgstr "Загружено в OSM"
+
+#: ../src/osm-traces.c:332
+msgid "FAILED TO UPLOAD DATA TO OSM - CURL PROBLEM"
+msgstr "Не удалось загрузить данные на OSM - проблема curl"
+
+#: ../src/osm-traces.c:335
+msgid "FAILED TO UPLOAD DATA TO OSM"
+msgstr "НЕ УДАЛОСЬ ЗАГРУЗИТЬ ДАННЫЕ В OSM"
+
+#: ../src/osm-traces.c:335
+msgid "HTTP response code"
+msgstr "код ответа HTTP"
+
+#: ../src/osm-traces.c:348
 #, c-format
 msgid "failed to unlink temporary file: %s"
 msgstr "не удалось удалить временный файл: %s"
 
-#: ../src/osm-traces.c:310
+#: ../src/osm-traces.c:387
 msgid "OSM upload"
-msgstr ""
+msgstr "Загрузить на OSM"
 
-#: ../src/osm-traces.c:331
+#: ../src/osm-traces.c:405
 msgid "Email:"
 msgstr "Email:"
 
-#: ../src/osm-traces.c:342
+#: ../src/osm-traces.c:410
 msgid ""
 "The email used as login\n"
 "<small>Enter the email you use to login into www.openstreetmap.org.</small>"
@@ -521,11 +844,7 @@ msgstr ""
 "<small>Введите email, который вы используете для "
 "www.openstreetmap.org.</small>"
 
-#: ../src/osm-traces.c:345
-msgid "Password:"
-msgstr "Пароль:"
-
-#: ../src/osm-traces.c:356
+#: ../src/osm-traces.c:418
 msgid ""
 "The password used to login\n"
 "<small>Enter the password you use to login into "
@@ -535,41 +854,40 @@ msgstr ""
 "<small>Введите пароль, который вы используете для "
 "www.openstreetmap.org.</small>"
 
-#: ../src/osm-traces.c:359
+#: ../src/osm-traces.c:423
 msgid "File's name:"
 msgstr "Имя файла:"
 
-#: ../src/osm-traces.c:369
+#: ../src/osm-traces.c:433
 msgid ""
 "The name of the file on OSM\n"
 "<small>This is the name of the file created on the server.This is not the "
 "name of the local file.</small>"
 msgstr ""
+"Имя файла в OSM\n"
+"<small>Это имя для файла, созданного на сервере. Это не имя локального "
+"файла.</small>"
 
-#: ../src/osm-traces.c:373
-msgid "Description:"
-msgstr "Описание:"
-
-#: ../src/osm-traces.c:378
+#: ../src/osm-traces.c:442
 msgid "The description of the trace"
 msgstr "Описание контура"
 
-#: ../src/osm-traces.c:380
+#: ../src/osm-traces.c:444
 msgid "Tags:"
 msgstr "Тэги:"
 
-#: ../src/osm-traces.c:385
+#: ../src/osm-traces.c:449
 msgid "The tags associated to the trace"
-msgstr ""
+msgstr "Метки, связанные с маршрутом"
 
-#: ../src/osm-traces.c:415
+#: ../src/osm-traces.c:482
 #, c-format
 msgid "Uploading %s to OSM"
-msgstr ""
+msgstr "%s загружается в OSM"
 
 #: ../src/mapcache.c:61
-msgid "Mapcache memory size (MB):"
-msgstr "Размер кэш-памяти карты (Мб):"
+msgid "Map cache memory size (MB):"
+msgstr ""
 
 #: ../src/print.c:53
 msgid "None"
@@ -591,33 +909,33 @@ msgstr "Оба"
 msgid "Image Settings"
 msgstr "Настройки изображения"
 
-#: ../src/print.c:550
+#: ../src/print.c:546
 msgid "done"
 msgstr "завершено"
 
 #. Page Size
-#: ../src/print.c:579
+#: ../src/print.c:575
 msgid "_Adjust Page Size and Orientation"
 msgstr "Установить размер и ориентацию страницы"
 
-#: ../src/print.c:595
+#: ../src/print.c:591
 msgid "C_enter:"
 msgstr "Центр:"
 
 #. ignore page margins
-#: ../src/print.c:613
+#: ../src/print.c:609
 msgid "Ignore Page _Margins"
 msgstr "Игнорироват_ь края страницы"
 
-#: ../src/print.c:632
+#: ../src/print.c:628
 msgid "Image S_ize:"
 msgstr "Размер картинки:"
 
-#: ../src/util.c:77
+#: ../src/util.c:81
 msgid "Could not launch web browser."
 msgstr "Не удалось запустить веб-браузер."
 
-#: ../src/util.c:88
+#: ../src/util.c:92
 msgid "Could not create new email."
 msgstr "Не удалось создать новое эл. письмо."
 
@@ -627,126 +945,162 @@ msgstr "Цвет:"
 
 #: ../src/vikcoordlayer.c:47
 msgid "Minutes Width:"
-msgstr ""
+msgstr "Широта, минут:"
 
 #: ../src/vikcoordlayer.c:48
 msgid "Line Thickness:"
 msgstr "Толщина линий"
 
+#: ../src/vikcoordlayer.c:56
+msgid "Coordinate"
+msgstr ""
+
 #: ../src/datasource_bfilter.c:46
 msgid "Max number of points:"
 msgstr "Максимальное количество точек"
 
 #: ../src/datasource_bfilter.c:60
-msgid "Simplify All Tracks"
-msgstr "Упростить все треки"
+msgid "Simplify All Tracks..."
+msgstr "Упростить все маршруты"
 
 #: ../src/datasource_bfilter.c:61
 msgid "Simplified Tracks"
-msgstr "Упрощенные треки"
+msgstr "Упрощенные маршруты"
 
-#: ../src/datasource_bfilter.c:94 ../src/datasource_bfilter.c:95
+#: ../src/datasource_bfilter.c:96 ../src/datasource_bfilter.c:97
 msgid "Remove Duplicate Waypoints"
 msgstr "Удалить повторяющиеся точки"
 
-#: ../src/datasource_bfilter.c:125
+#: ../src/datasource_bfilter.c:129
 msgid "Waypoints Inside This"
 msgstr ""
 
-#: ../src/datasource_bfilter.c:126
+#: ../src/datasource_bfilter.c:130
 msgid "Polygonized Layer"
 msgstr ""
 
-#: ../src/datasource_bfilter.c:159
+#: ../src/datasource_bfilter.c:165
 msgid "Waypoints Outside This"
 msgstr ""
 
 # typo
-#: ../src/datasource_bfilter.c:160
+#: ../src/datasource_bfilter.c:166
 msgid "Polygonzied Layer"
 msgstr ""
 
-#: ../src/main.c:117
+#: ../src/main.c:89
+#, c-format
+msgid "Ignoring Xlib error: error code %d request code %d\n"
+msgstr ""
+
+#: ../src/main.c:102
 msgid "Enable debug output"
 msgstr "Включить отладочную выдачу"
 
-#: ../src/main.c:118
+#: ../src/main.c:103
 msgid "Enable verbose output"
 msgstr "Включить подробную выдачу"
 
-#: ../src/main.c:119
+#: ../src/main.c:104
 msgid "Show version"
 msgstr "Показать версию"
 
-#: ../src/osm.c:81
+#: ../src/osm.c:106
+msgid "On Disk OSM Tile Format"
+msgstr ""
+
+#: ../src/osm.c:121
 msgid "OSM (view)"
 msgstr "OSM (просмотр)"
 
-#: ../src/osm.c:85
+#: ../src/osm.c:125
 msgid "OSM (edit)"
 msgstr "OSM (правка)"
 
-#: ../src/osm.c:89
+#: ../src/osm.c:129
 msgid "OSM (render)"
 msgstr "OSM (отрисовка)"
 
-#: ../src/preferences.c:267
-msgid "Preferences"
+#. Example: http://127.0.0.1:8111/load_and_zoom?left=8.19&right=8.20&top=48.605&bottom=48.590&select=node413602999
+#. JOSM or merkaartor must already be running with remote interface enabled
+#: ../src/osm.c:136
+msgid "Local port 8111 (eg JOSM)"
 msgstr ""
 
-#: ../src/uibuilder.c:148
+#: ../src/preferences.c:285
+msgid "Preferences"
+msgstr "Предпочтения"
+
+#: ../src/uibuilder.c:147
 msgid "Take care that this password will be stored clearly in a plain file."
+msgstr "Обратите внимание, что пароль сохраняется в файле открытым текстом."
+
+#: ../src/vikaggregatelayer.c:37
+msgid "Aggregate"
 msgstr ""
 
 #: ../src/vikdemlayer.c:101
 msgid "Absolute height"
-msgstr ""
+msgstr "Абсолютная высота"
 
 #: ../src/vikdemlayer.c:102
 msgid "Height gradient"
 msgstr ""
 
-#: ../src/vikdemlayer.c:119
+#: ../src/vikdemlayer.c:118
 msgid "DEM Files:"
 msgstr "DEM Файлы:"
 
-#: ../src/vikdemlayer.c:120
+#: ../src/vikdemlayer.c:119
 msgid "Download Source:"
 msgstr "Источник загрузки:"
 
-#: ../src/vikdemlayer.c:121
+#: ../src/vikdemlayer.c:120
 msgid "Min Elev Color:"
 msgstr ""
 
-#: ../src/vikdemlayer.c:122
+#: ../src/vikdemlayer.c:121
 msgid "Type:"
 msgstr "Тип:"
 
-#: ../src/vikdemlayer.c:123
+#: ../src/vikdemlayer.c:122
 msgid "Min Elev:"
-msgstr "Минимальная Высота:"
+msgstr "Мин. высота:"
 
-#: ../src/vikdemlayer.c:124
+#: ../src/vikdemlayer.c:123
 msgid "Max Elev:"
-msgstr "Максимальная Высота:"
+msgstr "Макс. высота:"
+
+#: ../src/vikdemlayer.c:134
+msgid "_DEM Download"
+msgstr ""
 
-#: ../src/vikdemlayer.c:135
-msgid "DEM Download/Import"
-msgstr "DEM Загрузить/Импортировать"
+#: ../src/vikdemlayer.c:134
+msgid "DEM Download"
+msgstr ""
 
-#: ../src/vikdemlayer.c:809
-#, c-format
-msgid "No SRTM data available for %f, %f"
+#: ../src/vikdemlayer.c:188
+msgid "DEM"
 msgstr ""
 
-#: ../src/vikdemlayer.c:1047
-msgid "No download source selected. Edit layer properties."
-msgstr "Не выбран источник для скачивания. Измените настройки слоя."
+#: ../src/vikdemlayer.c:284
+#, c-format
+msgid "Number of files: %d"
+msgstr "Количество файлов: %d"
+
+#: ../src/vikdemlayer.c:385
+msgid "DEM Loading"
+msgstr "Загрузка DEM"
+
+#: ../src/vikdemlayer.c:889
+#, c-format
+msgid "No SRTM data available for %f, %f"
+msgstr "Нет данных SRTM для %f, %f"
 
-#: ../src/vikdemlayer.c:1070
+#: ../src/vikdemlayer.c:1149
 #, c-format
 msgid "Downloading DEM %s"
-msgstr ""
+msgstr "Скачивание DEM %s"
 
 #: ../src/vikfileentry.c:68
 msgid "Browse..."
@@ -756,398 +1110,581 @@ msgstr "Обзор..."
 msgid "Choose file"
 msgstr "Выберите файл"
 
-#: ../src/vikfilelist.c:47
+#: ../src/vikfilelist.c:48
 msgid "Choose file(s)"
 msgstr "Выберите файл(ы)"
 
-#: ../src/vikfilelist.c:126
+#: ../src/vikfilelist.c:172
 msgid "Add..."
 msgstr "Добавить..."
 
-#: ../src/vikfilelist.c:127
+#: ../src/vikfilelist.c:173
 msgid "Delete"
 msgstr "Удалить"
 
-#: ../src/vikgeoreflayer.c:68
+#: ../src/vikgeoreflayer.c:70
+msgid "_Georef Move Map"
+msgstr ""
+
+#: ../src/vikgeoreflayer.c:70
 msgid "Georef Move Map"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:72
+#: ../src/vikgeoreflayer.c:77
+msgid "Georef Z_oom Tool"
+msgstr ""
+
+#: ../src/vikgeoreflayer.c:77
 msgid "Georef Zoom Tool"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:311 ../src/vikmapslayer.c:606
+#: ../src/vikgeoreflayer.c:87
+msgid "GeoRef Map"
+msgstr ""
+
+#: ../src/vikgeoreflayer.c:335 ../src/vikmapslayer.c:685
 #, c-format
 msgid "Couldn't open image file: %s"
 msgstr "Не удалось открыть графический файл: %s"
 
-#: ../src/vikgeoreflayer.c:341
+#: ../src/vikgeoreflayer.c:365
 msgid "Unexpected end of file reading World file."
-msgstr ""
+msgstr "Неожиданный конец во время чтения файла привязки."
 
-#: ../src/vikgeoreflayer.c:357 ../src/vikgeoreflayer.c:402
+#: ../src/vikgeoreflayer.c:381 ../src/vikgeoreflayer.c:426
 msgid "Choose World file"
-msgstr ""
+msgstr "Выберите файл привязки"
 
-#: ../src/vikgeoreflayer.c:370
+#: ../src/vikgeoreflayer.c:394
 msgid "The World file you requested could not be opened for reading."
-msgstr ""
+msgstr "Не удалось открыть для чтения выбранный файл привязки."
 
-#: ../src/vikgeoreflayer.c:415
+#: ../src/vikgeoreflayer.c:439
 msgid "The file you requested could not be opened for writing."
-msgstr ""
+msgstr "Выбранный вами файл невозможно открыть для записи."
 
-#: ../src/vikgeoreflayer.c:432 ../src/viklayer.c:463
+#: ../src/vikgeoreflayer.c:456 ../src/viklayer.c:480
 msgid "Layer Properties"
 msgstr "Свойства слоя"
 
-#: ../src/vikgeoreflayer.c:448
+#: ../src/vikgeoreflayer.c:478
 msgid "World File Parameters:"
-msgstr ""
+msgstr "Параметры файла привязки:"
 
-#: ../src/vikgeoreflayer.c:449
+#: ../src/vikgeoreflayer.c:479
 msgid "Load From File..."
 msgstr "Загрузить из файла..."
 
-#: ../src/vikgeoreflayer.c:454
+#: ../src/vikgeoreflayer.c:484
 msgid "Corner pixel easting:"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:456
+#: ../src/vikgeoreflayer.c:486
 msgid "the UTM \"easting\" value of the upper-right corner pixel of the map"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:458
+#: ../src/vikgeoreflayer.c:488
 msgid "Corner pixel northing:"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:460
+#: ../src/vikgeoreflayer.c:490
 msgid "the UTM \"northing\" value of the upper-right corner pixel of the map"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:462
+#: ../src/vikgeoreflayer.c:492
 msgid "X (easting) scale (mpp): "
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:463
+#: ../src/vikgeoreflayer.c:493
 msgid "Y (northing) scale (mpp): "
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:466
+#: ../src/vikgeoreflayer.c:496
 msgid "the scale of the map in the X direction (meters per pixel)"
 msgstr "масштаб карты по оси X (метров на пиксел)"
 
-#: ../src/vikgeoreflayer.c:468
+#: ../src/vikgeoreflayer.c:498
 msgid "the scale of the map in the Y direction (meters per pixel)"
 msgstr "масштаб карты по оси Y (метров на пиксел)"
 
-#: ../src/vikgeoreflayer.c:470
+#: ../src/vikgeoreflayer.c:500
 msgid "Map Image:"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:574
+#. Now with icons
+#: ../src/vikgeoreflayer.c:608
 msgid "_Zoom to Fit Map"
-msgstr ""
+msgstr "Масштабировать к размеру карты"
 
-#: ../src/vikgeoreflayer.c:579
+#: ../src/vikgeoreflayer.c:614
 msgid "_Goto Map Center"
-msgstr ""
+msgstr "Перейти к центру карты"
 
-#: ../src/vikgeoreflayer.c:584
+#: ../src/vikgeoreflayer.c:620
 msgid "_Export to World File"
-msgstr ""
+msgstr "Экспортировать в файл привязки"
 
-#: ../src/vikgoto.c:77
+#: ../src/vikgoto.c:75
 msgid "No goto tool available."
 msgstr "Нет инструмента поиска."
 
-#: ../src/vikgoto.c:90 ../src/vikgoto.c:108
+#: ../src/vikgoto.c:88 ../src/vikgoto.c:107
 msgid "goto"
 msgstr "перейти"
 
-#: ../src/vikgoto.c:92
+#: ../src/vikgoto.c:90
 msgid "I don't know that place. Do you want another goto?"
-msgstr "Я не знаю такого места. Хотите сделать новый поиск?"
+msgstr "Я не знаю такого места. Хотите выполнить новый поиск?"
 
-#: ../src/vikgoto.c:110
+#: ../src/vikgoto.c:109
 msgid "goto provider:"
-msgstr ""
+msgstr "поставщик поиска:"
 
-#: ../src/vikgoto.c:125
+#: ../src/vikgoto.c:124
 msgid "Enter address or place name:"
-msgstr "Введите адрес или названия места:"
+msgstr "Введите адрес или название места:"
 
-#: ../src/vikgpslayer.c:149
-msgid "Recording tracks"
+#: ../src/vikgpslayer.c:127
+msgid "Data Mode"
+msgstr ""
+
+#: ../src/vikgpslayer.c:129
+msgid "Realtime Tracking Mode"
+msgstr ""
+
+#: ../src/vikgpslayer.c:137
+msgid "Keep vehicle at center"
+msgstr ""
+
+#: ../src/vikgpslayer.c:138
+msgid "Keep vehicle on screen"
+msgstr ""
+
+#: ../src/vikgpslayer.c:139
+msgid "Disable"
+msgstr ""
+
+#: ../src/vikgpslayer.c:152
+msgid "Download Tracks:"
+msgstr "Скачать маршруты:"
+
+#: ../src/vikgpslayer.c:153
+msgid "Upload Tracks:"
+msgstr "Загрузить маршруты:"
+
+#: ../src/vikgpslayer.c:154
+msgid "Download Routes:"
+msgstr ""
+
+#: ../src/vikgpslayer.c:155
+msgid "Upload Routes:"
 msgstr ""
 
-#: ../src/vikgpslayer.c:150
+#: ../src/vikgpslayer.c:156
+msgid "Download Waypoints:"
+msgstr "Скачать пункты:"
+
+#: ../src/vikgpslayer.c:157
+msgid "Upload Waypoints:"
+msgstr "Загрузить пункты:"
+
+#: ../src/vikgpslayer.c:159
+msgid "Recording tracks"
+msgstr "Запись маршрутов"
+
+#: ../src/vikgpslayer.c:160
 msgid "Jump to current position on start"
 msgstr "Перемещаться в текущее расположение при старте"
 
-#: ../src/vikgpslayer.c:151
+#: ../src/vikgpslayer.c:161
 msgid "Moving Map Method:"
 msgstr ""
 
-#: ../src/vikgpslayer.c:152
+#: ../src/vikgpslayer.c:162
 msgid "Gpsd Host:"
-msgstr "Gpsd хост:"
+msgstr "Узел gpsd:"
 
-#: ../src/vikgpslayer.c:153
+#: ../src/vikgpslayer.c:163
 msgid "Gpsd Port:"
-msgstr "Gpsd портt:"
+msgstr "Порт gpsd:"
 
-#: ../src/vikgpslayer.c:154
+#: ../src/vikgpslayer.c:164
 msgid "Gpsd Retry Interval (seconds):"
 msgstr ""
 
-#: ../src/vikgpslayer.c:218 ../src/vikgpslayer.c:1051
+#: ../src/vikgpslayer.c:179
+msgid "GPS"
+msgstr ""
+
+#: ../src/vikgpslayer.c:242 ../src/vikgpslayer.c:1258
 msgid "GPS Download"
 msgstr ""
 
-#: ../src/vikgpslayer.c:218 ../src/vikgpslayer.c:1051
+#: ../src/vikgpslayer.c:242 ../src/vikgpslayer.c:1258
+#: ../src/viktrwlayer.c:3094
 msgid "GPS Upload"
 msgstr ""
 
-#: ../src/vikgpslayer.c:220
+#: ../src/vikgpslayer.c:244
 msgid "GPS Realtime Tracking"
 msgstr ""
 
-#: ../src/vikgpslayer.c:383
+#: ../src/vikgpslayer.c:451
 msgid "Unknown GPS Protocol"
 msgstr "Неизвестный протокол GPS"
 
-#: ../src/vikgpslayer.c:402
+#: ../src/vikgpslayer.c:469
 msgid "Unknown serial port device"
-msgstr ""
+msgstr "Неизвестное устройство COM"
 
-#: ../src/vikgpslayer.c:468
+#: ../src/vikgpslayer.c:572
 #, c-format
 msgid "%s: unknown parameter"
 msgstr "%s: неизвестный параметр"
 
-#: ../src/vikgpslayer.c:582
+#. Now with icons
+#: ../src/vikgpslayer.c:693
 msgid "_Upload to GPS"
-msgstr ""
+msgstr "Загрузить в GPS"
 
-#: ../src/vikgpslayer.c:587
+#: ../src/vikgpslayer.c:699
 msgid "Download from _GPS"
-msgstr ""
+msgstr "Выгрузить из _GPS"
 
-#: ../src/vikgpslayer.c:604
+#: ../src/vikgpslayer.c:720
 msgid "Empty _Realtime"
 msgstr ""
 
-#: ../src/vikgpslayer.c:610
+#: ../src/vikgpslayer.c:727
 msgid "E_mpty Upload"
 msgstr ""
 
-#: ../src/vikgpslayer.c:615
+#: ../src/vikgpslayer.c:733
 msgid "_Empty Download"
 msgstr ""
 
-#: ../src/vikgpslayer.c:620
+#: ../src/vikgpslayer.c:739
 msgid "Empty _All"
-msgstr ""
+msgstr "Очистить все"
 
 #. 
 #. NB It's not fatal if this gives 2 for example! Hence removal of the g_assert
 #. This happens when copied GPS layer is deleted (not sure why the number_handlers would be 2)
 #. I don't think there's any side effects and certainly better than the program just aborting
 #. 
-#: ../src/vikgpslayer.c:636
+#: ../src/vikgpslayer.c:756
 #, c-format
 msgid "Unexpected number of disconnected handlers: %d"
 msgstr ""
 
-#: ../src/vikgpslayer.c:768
+#: ../src/vikgpslayer.c:898
 #, c-format
 msgid "Uploading %d waypoint..."
 msgid_plural "Uploading %d waypoints..."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Загружается %d пункт..."
+msgstr[1] "Загружается %d пункта..."
+msgstr[2] "Загружается %d пунктов..."
 
-#: ../src/vikgpslayer.c:770
+#: ../src/vikgpslayer.c:899
 #, c-format
 msgid "Uploading %d trackpoint..."
 msgid_plural "Uploading %d trackpoints..."
+msgstr[0] "Загружается %d узел..."
+msgstr[1] "Загружается %d узла..."
+msgstr[2] "Загружается %d узлов..."
+
+#: ../src/vikgpslayer.c:900
+#, c-format
+msgid "Uploading %d routepoint..."
+msgid_plural "Uploading %d routepoints..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikgpslayer.c:794
+#: ../src/vikgpslayer.c:925
 #, c-format
 msgid "Downloaded %d out of %d waypoint..."
 msgid_plural "Downloaded %d out of %d waypoints..."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Скачано %d из %d пункта..."
+msgstr[1] "Скачано %d из %d пунктов..."
+msgstr[2] "Скачано %d из %d пунктов..."
 
-#: ../src/vikgpslayer.c:796
+#: ../src/vikgpslayer.c:926
 #, c-format
 msgid "Downloaded %d out of %d trackpoint..."
 msgid_plural "Downloaded %d out of %d trackpoints..."
+msgstr[0] "Скачано %d из %d узла..."
+msgstr[1] "Скачано %d из %d узлов..."
+msgstr[2] "Скачано %d из %d узлов..."
+
+#: ../src/vikgpslayer.c:927
+#, c-format
+msgid "Downloaded %d out of %d routepoint..."
+msgid_plural "Downloaded %d out of %d routepoints..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikgpslayer.c:800
+#: ../src/vikgpslayer.c:932
 #, c-format
 msgid "Uploaded %d out of %d waypoint..."
 msgid_plural "Uploaded %d out of %d waypoints..."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Загружено %d из %d пункта..."
+msgstr[1] "Загружено %d из %d пунктов..."
+msgstr[2] "Загружено %d из %d пунктов..."
 
-#: ../src/vikgpslayer.c:802
+#: ../src/vikgpslayer.c:933
 #, c-format
 msgid "Uploaded %d out of %d trackpoint..."
 msgid_plural "Uploaded %d out of %d trackpoints..."
+msgstr[0] "Загружено %d из %d узла..."
+msgstr[1] "Загружено %d из %d узлов..."
+msgstr[2] "Загружено %d из %d узлов..."
+
+#: ../src/vikgpslayer.c:934
+#, c-format
+msgid "Uploaded %d out of %d routepoint..."
+msgid_plural "Uploaded %d out of %d routepoints..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikgpslayer.c:809
+#: ../src/vikgpslayer.c:942
 #, c-format
 msgid "Downloaded %d waypoint"
 msgid_plural "Downloaded %d waypoints"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Скачан %d пункт"
+msgstr[1] "Скачано %d пункта"
+msgstr[2] "Скачано %d пунктов"
 
-#: ../src/vikgpslayer.c:811
+#: ../src/vikgpslayer.c:943
 #, c-format
 msgid "Downloaded %d trackpoint"
 msgid_plural "Downloaded %d trackpoints"
+msgstr[0] "Скачан %d узел"
+msgstr[1] "Скачано %d узла"
+msgstr[2] "Скачано %d узлов"
+
+#: ../src/vikgpslayer.c:944
+#, c-format
+msgid "Downloaded %d routepoint"
+msgid_plural "Downloaded %d routepoints"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikgpslayer.c:815
+#: ../src/vikgpslayer.c:949
 #, c-format
 msgid "Uploaded %d waypoint"
 msgid_plural "Uploaded %d waypoints"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Загружен %d узел"
+msgstr[1] "Загружено %d узла"
+msgstr[2] "Загружено %d узлов"
 
-#: ../src/vikgpslayer.c:817
+#: ../src/vikgpslayer.c:950
 #, c-format
 msgid "Uploaded %d trackpoint"
 msgid_plural "Uploaded %d trackpoints"
+msgstr[0] "Загружен %d пункт"
+msgstr[1] "Загружено %d пункта"
+msgstr[2] "Загружено %d пунктов"
+
+#: ../src/vikgpslayer.c:951
+#, c-format
+msgid "Uploaded %d routepoint"
+msgid_plural "Uploaded %d routepoints"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikgpslayer.c:1014
+#: ../src/vikgpslayer.c:1180
 msgid "Error: couldn't find gpsbabel."
 msgstr "Ошибка: gpsbabel не найден."
 
-#: ../src/viklayerspanel.c:57
-msgid "/C_ut"
+#: ../src/vikgpslayer.c:1269
+msgid "Warning - GPS Upload items may overwrite each other"
 msgstr ""
 
-#: ../src/viklayerspanel.c:58
-msgid "/_Copy"
-msgstr "/_Копировать"
+#: ../src/vikgpslayer.c:1301
+msgid "Status: detecting gpsbabel"
+msgstr "Статус: поиск gpsbabel"
 
-#: ../src/viklayerspanel.c:59
-msgid "/_Paste"
-msgstr "/Вст_авить"
+#: ../src/vikgpslayer.c:1332
+msgid "No GPS items selected for transfer."
+msgstr ""
+
+#: ../src/vikgpslayer.c:1347
+msgid "Could not turn off device."
+msgstr ""
 
-#: ../src/viklayerspanel.c:60
-msgid "/_Delete"
-msgstr "/_Удалить"
+#: ../src/vikgpslayer.c:1385
+msgid "Are you sure you want to delete GPS Upload data?"
+msgstr ""
 
-#: ../src/viklayerspanel.c:61
-msgid "/New Layer"
-msgstr "/Новый слой"
+#: ../src/vikgpslayer.c:1398
+msgid "Are you sure you want to delete GPS Download data?"
+msgstr ""
 
-#: ../src/viklayerspanel.c:150
+#: ../src/vikgpslayer.c:1412
+msgid "Are you sure you want to delete GPS Realtime data?"
+msgstr ""
+
+#: ../src/vikgpslayer.c:1425
+msgid "Are you sure you want to delete All GPS data?"
+msgstr ""
+
+#: ../src/viklayerspanel.c:55
+msgid "C_ut"
+msgstr "Вырезать"
+
+#: ../src/viklayerspanel.c:56
+msgid "_Copy"
+msgstr "_Копировать"
+
+#: ../src/viklayerspanel.c:57
+msgid "_Paste"
+msgstr "Вст_авить"
+
+#: ../src/viklayerspanel.c:58
+msgid "_Delete"
+msgstr "_Удалить"
+
+#: ../src/viklayerspanel.c:59
+msgid "New Layer"
+msgstr "Новый слой"
+
+#: ../src/viklayerspanel.c:127
 msgid "Top Layer"
 msgstr "Верхний слой"
 
-#: ../src/viklayerspanel.c:165
+#: ../src/viklayerspanel.c:143
 msgid "Add new layer"
 msgstr "Добавить слой"
 
-#: ../src/viklayerspanel.c:172
+#: ../src/viklayerspanel.c:150
 msgid "Remove selected layer"
 msgstr "Удалить выбранный слой"
 
-#: ../src/viklayerspanel.c:179
+#: ../src/viklayerspanel.c:157
 msgid "Move selected layer up"
 msgstr "Переместить выбранный слой вверх"
 
-#: ../src/viklayerspanel.c:186
+#: ../src/viklayerspanel.c:164
 msgid "Move selected layer down"
 msgstr "Переместить выбранный слой вниз"
 
-#: ../src/viklayerspanel.c:193
+#: ../src/viklayerspanel.c:171
 msgid "Cut selected layer"
 msgstr "Вырезать выбранный слой"
 
-#: ../src/viklayerspanel.c:200
+#: ../src/viklayerspanel.c:178
 msgid "Copy selected layer"
 msgstr "Копировать выбранный слой"
 
-#: ../src/viklayerspanel.c:207
+#: ../src/viklayerspanel.c:185
 msgid "Paste layer below selected layer"
 msgstr "Вставить слой под выбранным"
 
-#: ../src/viklayerspanel.c:492
-msgid "Aggregate Layers have no settable properties."
+#. TODO: FIXME: if name has a '/' in it it will get all messed up. why not have an itemfactory field with
+#. name, icon, shortcut, etc.?
+#: ../src/viklayerspanel.c:204 ../src/vikwindow.c:3292
+#, c-format
+msgid "New _%s Layer"
 msgstr ""
 
-#: ../src/viklayerspanel.c:543
+#: ../src/viklayerspanel.c:511
+msgid "Aggregate Layers have no settable properties."
+msgstr "У объединяющего слоя нет изменяемых свойств."
+
+#: ../src/viklayerspanel.c:555
 msgid "You cannot cut the Top Layer."
-msgstr "Нельзя вырезать верхний слой"
+msgstr "Нельзя вырезать верхний слой."
+
+#: ../src/viklayerspanel.c:600
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "Вы уверены что хотите удалить %s?"
 
-#: ../src/viklayerspanel.c:598
+#: ../src/viklayerspanel.c:617
 msgid "You cannot delete the Top Layer."
 msgstr "Нельзя удалить верхний слой."
 
-#: ../src/viklayerspanel.c:682
+#: ../src/viklayerspanel.c:701
 msgid "Are you sure you wish to delete all layers?"
 msgstr "Вы уверены что хотите удалить все слои?"
 
 #. ******* MAPZOOMS ********
-#: ../src/vikmapslayer.c:90
+#: ../src/vikmapslayer.c:91
 msgid "Use Viking Zoom Level"
 msgstr ""
 
-#: ../src/vikmapslayer.c:122
+#: ../src/vikmapslayer.c:124
 msgid "Map Type:"
 msgstr "Тип карты:"
 
-#: ../src/vikmapslayer.c:123
+#: ../src/vikmapslayer.c:125
 msgid "Maps Directory:"
 msgstr "Каталог карт:"
 
-#: ../src/vikmapslayer.c:124
+#: ../src/vikmapslayer.c:126
 msgid "Alpha:"
-msgstr "Пррозрачность:"
+msgstr "Прозрачность:"
 
-#: ../src/vikmapslayer.c:125
+#: ../src/vikmapslayer.c:127
+msgid "Control the Alpha value for transparency effects"
+msgstr ""
+
+#: ../src/vikmapslayer.c:128
 msgid "Autodownload maps:"
 msgstr "Автоматически скачивать карты:"
 
-#: ../src/vikmapslayer.c:126
-msgid "Zoom Level:"
+#: ../src/vikmapslayer.c:129
+msgid "Autodownload Only Gets Missing Maps:"
+msgstr ""
+
+#: ../src/vikmapslayer.c:130
+msgid ""
+"Using this option avoids attempting to update already acquired tiles. This "
+"can be useful if you want to restrict the network usage, without having to "
+"resort to manual control. Only applies when 'Autodownload Maps' is on."
 msgstr ""
 
+#: ../src/vikmapslayer.c:131
+msgid "Zoom Level:"
+msgstr "Степень приближения:"
+
 #: ../src/vikmapslayer.c:132
+msgid ""
+"Determines the method of displaying map tiles for the current zoom level. "
+"'Viking Zoom Level' uses the best matching level, otherwise setting a fixed "
+"value will always use map tiles of the specified value regardless of the "
+"actual zoom level."
+msgstr ""
+
+#: ../src/vikmapslayer.c:146
+msgid "_Maps Download"
+msgstr ""
+
+#: ../src/vikmapslayer.c:146
 msgid "Maps Download"
 msgstr "Загрузка карт"
 
-#: ../src/vikmapslayer.c:138
+#: ../src/vikmapslayer.c:161
 msgid "Map"
 msgstr "Карта"
 
-#: ../src/vikmapslayer.c:212
+#: ../src/vikmapslayer.c:249
 msgid "Default maplayer directory:"
 msgstr ""
 
-#: ../src/vikmapslayer.c:449
-msgid "Unknown map type"
+#: ../src/vikmapslayer.c:249
+msgid "Choose a directory to store cached Map tiles for this layer"
 msgstr ""
 
-#: ../src/vikmapslayer.c:459
+#: ../src/vikmapslayer.c:505
+msgid "Unknown map type"
+msgstr "Неизвестный тип карты"
+
+#: ../src/vikmapslayer.c:516
 msgid "Unknown Map Zoom"
 msgstr ""
 
-#: ../src/vikmapslayer.c:528
+#: ../src/vikmapslayer.c:589
 #, c-format
 msgid ""
 "New map cannot be displayed in the current drawmode.\n"
@@ -1156,47 +1693,71 @@ msgstr ""
 "Новая карта не может быть показана в текущем режиме отрисовки.\n"
 "Выберите \"%s\" из меню Вид для ее просмотра."
 
-#: ../src/vikmapslayer.c:674
+#: ../src/vikmapslayer.c:753
 #, c-format
 msgid ""
 "Cowardly refusing to draw tiles or existence of tiles beyond %d zoom out "
 "factor"
 msgstr ""
 
-#: ../src/vikmapslayer.c:1062
+#: ../src/vikmapslayer.c:1157
 #, c-format
 msgid "Redownloading up to %d %s map..."
 msgid_plural "Redownloading up to %d %s maps..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikmapslayer.c:1064
+#: ../src/vikmapslayer.c:1159
 #, c-format
 msgid "Redownloading %d %s map..."
 msgid_plural "Redownloading %d %s maps..."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Повторно скачивается %d %s карта..."
+msgstr[1] "Повторно скачивается %d %s карты..."
+msgstr[2] "Повторно скачивается %d %s карт..."
 
-#: ../src/vikmapslayer.c:1068 ../src/vikmapslayer.c:1139
+#: ../src/vikmapslayer.c:1163 ../src/vikmapslayer.c:1238
 #, c-format
 msgid "Downloading %d %s map..."
 msgid_plural "Downloading %d %s maps..."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Скачивается %d %s карта..."
+msgstr[1] "Скачивается %d %s карты..."
+msgstr[2] "Скачивается %d %s карт..."
 
-#: ../src/vikmapslayer.c:1202
-msgid "Redownload _Bad Map(s)"
+#: ../src/vikmapslayer.c:1311
+#, c-format
+msgid ""
+"\n"
+"Source: %s\n"
+"\n"
+"Tile File: %s\n"
+"Tile File Timestamp: %s"
 msgstr ""
 
-#: ../src/vikmapslayer.c:1206
-msgid "Redownload _New Map(s)"
+#: ../src/vikmapslayer.c:1318
+#, c-format
+msgid ""
+"Source: %s\n"
+"\n"
+"No Tile File!"
 msgstr ""
 
-#: ../src/vikmapslayer.c:1210
+#: ../src/vikmapslayer.c:1356
+msgid "Redownload _Bad Map(s)"
+msgstr "Заново скачать испорченные карты"
+
+#: ../src/vikmapslayer.c:1360
+msgid "Redownload _New Map(s)"
+msgstr "Заново скачать новые карты"
+
+#: ../src/vikmapslayer.c:1364
 msgid "Redownload _All Map(s)"
+msgstr "Заново скачать все карты"
+
+#: ../src/vikmapslayer.c:1368
+msgid "_Show Tile Information"
 msgstr ""
 
-#: ../src/vikmapslayer.c:1290
+#: ../src/vikmapslayer.c:1449
 #, c-format
 msgid ""
 "Wrong drawmode for this map.\n"
@@ -1205,1157 +1766,2071 @@ msgstr ""
 "Неподходящий режим отрисовки для этой карты.\n"
 "Выберите \"%s\" из меню вид и попробуйте снова."
 
-#: ../src/vikmapslayer.c:1295
+#: ../src/vikmapslayer.c:1454
 msgid "Wrong zoom level for this map."
 msgstr ""
 
-#: ../src/vikmapslayer.c:1325
+#. Now with icons
+#: ../src/vikmapslayer.c:1485
 msgid "Download _Missing Onscreen Maps"
-msgstr ""
+msgstr "Скачать отсутствующие экранные карты"
 
-#: ../src/vikmapslayer.c:1331
+#: ../src/vikmapslayer.c:1492
 msgid "Download _New Onscreen Maps"
-msgstr ""
+msgstr "Скачать новые экранные карты"
 
-#. TODO Add GTK_STOCK_REFRESH icon
-#: ../src/vikmapslayer.c:1338
+#: ../src/vikmapslayer.c:1499
 msgid "Reload _All Onscreen Maps"
-msgstr ""
+msgstr "Скачать все экранные карты"
 
-#: ../src/viktreeview.c:203
+#: ../src/viktreeview.c:263
 msgid "Layer Name"
 msgstr "Имя слоя"
 
-#: ../src/viktreeview.c:624
+#: ../src/viktreeview.c:742
 #, c-format
 msgid "delete data from %s\n"
 msgstr "удалить данные %s\n"
 
-#: ../src/viktrwlayer.c:307
+#: ../src/viktrwlayer.c:377
+msgid "Create _Waypoint"
+msgstr ""
+
+#: ../src/viktrwlayer.c:377
 msgid "Create Waypoint"
 msgstr "Создать пункт"
 
-#: ../src/viktrwlayer.c:310
+#: ../src/viktrwlayer.c:383
+msgid "Create _Track"
+msgstr ""
+
+#: ../src/viktrwlayer.c:383
 msgid "Create Track"
 msgstr "Создать маршрут"
 
-#: ../src/viktrwlayer.c:314
-msgid "Begin Track"
-msgstr "Начать маршрут"
+#: ../src/viktrwlayer.c:392
+msgid "Create _Route"
+msgstr ""
+
+#: ../src/viktrwlayer.c:392
+msgid "Create Route"
+msgstr ""
+
+#: ../src/viktrwlayer.c:401
+msgid "_Edit Waypoint"
+msgstr ""
 
-#: ../src/viktrwlayer.c:317
+#: ../src/viktrwlayer.c:401
 msgid "Edit Waypoint"
 msgstr "Редактироватаь пункт"
 
-#: ../src/viktrwlayer.c:322
+#: ../src/viktrwlayer.c:409
+msgid "Edit Trac_kpoint"
+msgstr ""
+
+#: ../src/viktrwlayer.c:409
 msgid "Edit Trackpoint"
 msgstr "Редактировать узел"
 
-#: ../src/viktrwlayer.c:327
+#: ../src/viktrwlayer.c:417
+msgid "Show P_icture"
+msgstr ""
+
+#: ../src/viktrwlayer.c:417
 msgid "Show Picture"
+msgstr "Показать картинку"
+
+#: ../src/viktrwlayer.c:424
+msgid "Route _Finder"
 msgstr ""
 
-#: ../src/viktrwlayer.c:330
-msgid "Magic Scissors"
-msgstr "Волшебные ножницы"
+#: ../src/viktrwlayer.c:424
+msgid "Route Finder"
+msgstr ""
 
 #. ***** PARAMETERS *****
-#: ../src/viktrwlayer.c:337 ../src/viktrwlayer.c:1463
-#: ../src/viktrwlayer.c:1465
+#: ../src/viktrwlayer.c:447 ../src/viktrwlayer.c:1942
+#: ../src/viktrwlayer.c:1944
 msgid "Waypoints"
 msgstr "Пункты"
 
-#: ../src/viktrwlayer.c:337 ../src/viktrwlayer.c:1453
-#: ../src/viktrwlayer.c:1455
+#: ../src/viktrwlayer.c:447 ../src/viktrwlayer.c:1933
+#: ../src/viktrwlayer.c:1935
 msgid "Tracks"
 msgstr "Маршруты"
 
-#: ../src/viktrwlayer.c:337
+#: ../src/viktrwlayer.c:447
 msgid "Waypoint Images"
 msgstr "Картинки пунктов"
 
-#: ../src/viktrwlayer.c:340
+#: ../src/viktrwlayer.c:450
 msgid "Draw by Track"
 msgstr ""
 
-#: ../src/viktrwlayer.c:340
-msgid "Draw by Velocity"
+#: ../src/viktrwlayer.c:450
+msgid "Draw by Speed"
 msgstr ""
 
-#: ../src/viktrwlayer.c:340
-msgid "All Tracks Black"
-msgstr "Все маршруты черные"
+#: ../src/viktrwlayer.c:450
+msgid "All Tracks Same Color"
+msgstr ""
 
-#: ../src/viktrwlayer.c:341
+#: ../src/viktrwlayer.c:451
 msgid "Filled Square"
 msgstr "Закрашенный квадрат"
 
-#: ../src/viktrwlayer.c:341
+#: ../src/viktrwlayer.c:451
 msgid "Square"
 msgstr "Квадрат"
 
-#: ../src/viktrwlayer.c:341
+#: ../src/viktrwlayer.c:451
 msgid "Circle"
 msgstr "Окружность"
 
-#: ../src/viktrwlayer.c:341
+#: ../src/viktrwlayer.c:451
 msgid "X"
+msgstr "X"
+
+#: ../src/viktrwlayer.c:477
+msgid "Extra Extra Small"
+msgstr ""
+
+#: ../src/viktrwlayer.c:478
+msgid "Extra Small"
+msgstr ""
+
+#: ../src/viktrwlayer.c:479
+msgid "Small"
+msgstr ""
+
+#: ../src/viktrwlayer.c:480
+msgid "Medium"
+msgstr ""
+
+#: ../src/viktrwlayer.c:481
+msgid "Large"
+msgstr ""
+
+#: ../src/viktrwlayer.c:482
+msgid "Extra Large"
+msgstr ""
+
+#: ../src/viktrwlayer.c:483
+msgid "Extra Extra Large"
 msgstr ""
 
-#: ../src/viktrwlayer.c:363
+#: ../src/viktrwlayer.c:491
 msgid "Track Drawing Mode:"
+msgstr "Режим рисования маршрутов:"
+
+#: ../src/viktrwlayer.c:492
+msgid "All Tracks Color:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:364
+#: ../src/viktrwlayer.c:493
+msgid "The color used when 'All Tracks Same Color' drawing mode is selected"
+msgstr ""
+
+#: ../src/viktrwlayer.c:494
 msgid "Draw Track Lines"
 msgstr "Нарисовать линии маршрута"
 
-#: ../src/viktrwlayer.c:365
+#: ../src/viktrwlayer.c:495
+msgid "Track Thickness:"
+msgstr "Толщина маршрута:"
+
+#: ../src/viktrwlayer.c:496
+msgid "Draw Track Direction"
+msgstr ""
+
+#: ../src/viktrwlayer.c:497
+msgid "Direction Size:"
+msgstr ""
+
+#: ../src/viktrwlayer.c:498
 msgid "Draw Trackpoints"
 msgstr "Нарисовать узлы"
 
-#: ../src/viktrwlayer.c:366
-msgid "Draw Elevation"
+#: ../src/viktrwlayer.c:499
+msgid "Trackpoint Size:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:367
+#: ../src/viktrwlayer.c:500
+msgid "Draw Elevation"
+msgstr "Нарисовать высоту"
+
+#: ../src/viktrwlayer.c:501
 msgid "Draw Elevation Height %:"
-msgstr ""
+msgstr "Нарисовать % высоты:"
 
-#: ../src/viktrwlayer.c:369
+#: ../src/viktrwlayer.c:503
 msgid "Draw Stops"
 msgstr "Нарисовать остановки"
 
-#: ../src/viktrwlayer.c:370
-msgid "Min Stop Length (seconds):"
+#: ../src/viktrwlayer.c:504
+msgid ""
+"Whether to draw a marker when trackpoints are at the same position but over "
+"the minimum stop length apart in time"
 msgstr ""
 
-#: ../src/viktrwlayer.c:372
-msgid "Track Thickness:"
-msgstr "ТолÑ\89ина маÑ\80Ñ\88Ñ\80Ñ\83Ñ\82а:"
+#: ../src/viktrwlayer.c:505
+msgid "Min Stop Length (seconds):"
+msgstr "Ð\9cинималÑ\8cнаÑ\8f длина оÑ\81Ñ\82ановки (в Ñ\81екÑ\83ндаÑ\85)"
 
-#: ../src/viktrwlayer.c:373
+#: ../src/viktrwlayer.c:507
 msgid "Track BG Thickness:"
-msgstr ""
+msgstr "Толщина фона маршрута:"
 
-#: ../src/viktrwlayer.c:374
+#: ../src/viktrwlayer.c:508
 msgid "Track Background Color"
-msgstr ""
+msgstr "Цвет фона маршрута"
 
-#: ../src/viktrwlayer.c:375
-msgid "Min Track Velocity:"
+#: ../src/viktrwlayer.c:509
+msgid "Draw by Speed Factor (%):"
 msgstr ""
 
-#: ../src/viktrwlayer.c:376
-msgid "Max Track Velocity:"
+#: ../src/viktrwlayer.c:510
+msgid ""
+"The percentage factor away from the average speed determining the color used"
 msgstr ""
 
-#: ../src/viktrwlayer.c:378
+#: ../src/viktrwlayer.c:512
 msgid "Draw Labels"
+msgstr "Нарисовать названия"
+
+#: ../src/viktrwlayer.c:513
+msgid "Waypoint Font Size:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:379
+#: ../src/viktrwlayer.c:514
 msgid "Waypoint Color:"
-msgstr ""
+msgstr "Цвет пунктов:"
 
-#: ../src/viktrwlayer.c:380
+#: ../src/viktrwlayer.c:515
 msgid "Waypoint Text:"
-msgstr ""
+msgstr "Текст пунктов:"
 
-#: ../src/viktrwlayer.c:381
+#: ../src/viktrwlayer.c:516
 msgid "Background:"
-msgstr ""
+msgstr "Фон:"
 
-#: ../src/viktrwlayer.c:382
+#: ../src/viktrwlayer.c:517
 msgid "Fake BG Color Translucency:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:383
+#: ../src/viktrwlayer.c:518
 msgid "Waypoint marker:"
-msgstr ""
+msgstr "Маркер пункта:"
 
-#: ../src/viktrwlayer.c:384
+#: ../src/viktrwlayer.c:519
 msgid "Waypoint size:"
-msgstr ""
+msgstr "Размер пунктов:"
 
-#: ../src/viktrwlayer.c:385
+#: ../src/viktrwlayer.c:520
 msgid "Draw Waypoint Symbols:"
-msgstr ""
+msgstr "Рисовать символы пунктов:"
 
-#: ../src/viktrwlayer.c:387
+#: ../src/viktrwlayer.c:522
 msgid "Draw Waypoint Images"
-msgstr ""
+msgstr "Рисовать картинки пунктов"
 
-#: ../src/viktrwlayer.c:388
+#: ../src/viktrwlayer.c:523
 msgid "Image Size (pixels):"
-msgstr "РазмеÑ\80 каÑ\80Ñ\82иники (пикÑ\81елÑ\8b):"
+msgstr "Размер картинки (пикселы):"
 
-#: ../src/viktrwlayer.c:389
+#: ../src/viktrwlayer.c:524
 msgid "Image Alpha:"
 msgstr "Прозрачность картинки:"
 
-#: ../src/viktrwlayer.c:390
+#: ../src/viktrwlayer.c:525
 msgid "Image Memory Cache Size:"
+msgstr "Размер кэша для картинок:"
+
+#: ../src/viktrwlayer.c:610
+msgid "TrackWaypoint"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1602
-msgid "This layer has no waypoints or trackpoints."
+#: ../src/viktrwlayer.c:1951 ../src/viktrwlayer.c:1953
+msgid "Routes"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1610
-msgid "Export Layer"
-msgstr "Экспортировать слой"
+#: ../src/viktrwlayer.c:2144
+#, c-format
+msgid " in %d:%02d hrs:mins"
+msgstr " в %d:%02d ч:мин"
 
-#: ../src/viktrwlayer.c:1629 ../src/vikwindow.c:1617 ../src/vikwindow.c:2060
+#: ../src/viktrwlayer.c:2148
 #, c-format
-msgid "The file \"%s\" exists, do you wish to overwrite it?"
-msgstr "Файл \"%s\", хотите перезаписать?"
+msgid ""
+"\n"
+"%sTotal Length %.1f %s%s"
+msgstr ""
+"\n"
+"%sОбщая длина %.1f %s%s"
 
-#: ../src/viktrwlayer.c:1639 ../src/vikwindow.c:1638
-msgid "The filename you requested could not be opened for writing."
+#: ../src/viktrwlayer.c:2154
+#, c-format
+msgid "Tracks: %d - Waypoints: %d - Routes: %d%s"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1660
-msgid "Find"
+#: ../src/viktrwlayer.c:2174
+#, c-format
+msgid "Tracks: %d"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1670
-msgid "Waypoint Name:"
-msgstr "Имя пункта:"
+#: ../src/viktrwlayer.c:2184
+#, c-format
+msgid "Routes: %d"
+msgstr ""
 
-#: ../src/viktrwlayer.c:1690
-msgid "Waypoint not found in this layer."
-msgstr "Пункт не найден в этом слое."
+#: ../src/viktrwlayer.c:2215
+#, c-format
+msgid "- %d:%02d hrs:mins"
+msgstr "- %d:%02d ч:мин"
 
-#: ../src/viktrwlayer.c:1787
-msgid "_Goto Center of Layer"
-msgstr ""
+#: ../src/viktrwlayer.c:2223
+#, c-format
+msgid "%s%.1f km %s"
+msgstr "%s%.1f км %s"
 
-#: ../src/viktrwlayer.c:1792
-msgid "Goto _Waypoint"
-msgstr ""
+#: ../src/viktrwlayer.c:2226
+#, c-format
+msgid "%s%.1f miles %s"
+msgstr "%s%.1f миль %s"
 
-#: ../src/viktrwlayer.c:1798
-msgid "_Export Layer"
+#: ../src/viktrwlayer.c:2240
+#, c-format
+msgid "Waypoints: %d"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1803
-msgid "Export as GPS_Point"
+#: ../src/viktrwlayer.c:2266
+#, c-format
+msgid "Trkpt: Alt %dft"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1808
-msgid "Export as GPS_Mapper"
+#. VIK_UNITS_HEIGHT_METRES:
+#: ../src/viktrwlayer.c:2270
+#, c-format
+msgid "Trkpt: Alt %dm"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1813
-msgid "Export as _GPX"
+#. Compact date time format
+#: ../src/viktrwlayer.c:2277
+#, c-format
+msgid " | Time %x %X"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1818 ../src/viktrwlayer.c:2858
-msgid "_New Waypoint"
+#: ../src/viktrwlayer.c:2295
+#, c-format
+msgid " | Track: %s"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1825
-msgid "_Add Wikipedia Waypoints"
+#. Combine parts to make overall message
+#: ../src/viktrwlayer.c:2299
+#, c-format
+msgid "%s%s | %s %s %s"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1830
-msgid "Within _Layer Bounds"
+#: ../src/viktrwlayer.c:2314
+#, c-format
+msgid "Wpt: Alt %dft"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1835
-msgid "Within _Current View"
+#. VIK_UNITS_HEIGHT_METRES:
+#: ../src/viktrwlayer.c:2318
+#, c-format
+msgid "Wpt: Alt %dm"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1842 ../src/viktrwlayer.c:2824
-msgid "Upload to _OSM"
+#. Add comment if available
+#: ../src/viktrwlayer.c:2333
+#, c-format
+msgid "%s | %s %s | Comment: %s"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2353
-msgid "Failed. This track does not have timestamp"
+#: ../src/viktrwlayer.c:2335
+#, c-format
+msgid "%s | %s %s"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2367
-msgid "Failed. No other track in this layer has timestamp"
+#: ../src/viktrwlayer.c:2563 ../src/viktrwlayer.c:2634
+msgid "This layer has no waypoints or trackpoints."
+msgstr "В этом слое нет пунктов или маршрутных узлов."
+
+#: ../src/viktrwlayer.c:2661 ../src/vikwindow.c:2407 ../src/vikwindow.c:2848
+#, c-format
+msgid "The file \"%s\" exists, do you wish to overwrite it?"
+msgstr "Файл \"%s\", хотите перезаписать?"
+
+#: ../src/viktrwlayer.c:2671 ../src/vikwindow.c:2429
+msgid "The filename you requested could not be opened for writing."
+msgstr "Выбранный вами файл невозможно открыть для записи."
+
+#: ../src/viktrwlayer.c:2676 ../src/viktrwlayer.c:2681
+#: ../src/viktrwlayer.c:2691 ../src/viktrwlayer.c:2703
+msgid "Export Layer"
+msgstr "Экспортировать слой"
+
+#: ../src/viktrwlayer.c:2720
+msgid "Could not create temporary file for export."
 msgstr ""
 
-#: ../src/viktrwlayer.c:2373
-msgid "Merge with..."
+#: ../src/viktrwlayer.c:2729
+#, c-format
+msgid "Could not launch %s."
 msgstr ""
 
-#: ../src/viktrwlayer.c:2373
-msgid "Select track to merge with"
+#: ../src/viktrwlayer.c:2773
+msgid "Export Track as GPX"
+msgstr "Экспортировать маршруты в GPX"
+
+#: ../src/viktrwlayer.c:2795
+msgid "Find"
+msgstr "Найти"
+
+#: ../src/viktrwlayer.c:2805
+msgid "Waypoint Name:"
+msgstr "Имя пункта:"
+
+#: ../src/viktrwlayer.c:2822
+msgid "Waypoint not found in this layer."
+msgstr "Пункт не найден в этом слое."
+
+#: ../src/viktrwlayer.c:3090
+msgid "Can not upload invisible track."
 msgstr ""
 
-#: ../src/viktrwlayer.c:2410
-msgid "Merge Threshold..."
+#: ../src/viktrwlayer.c:3192 ../src/viktrwlayer.c:7785
+msgid "Track"
+msgstr "Маршрут"
+
+#: ../src/viktrwlayer.c:3215 ../src/viktrwlayer.c:7817
+msgid "Route"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2411
-msgid "Merge when time between tracks less than:"
+#: ../src/viktrwlayer.c:3296 ../src/viktrwlayer.c:6265
+#: ../src/viktrwlayer.c:6314
+msgid "_Finish Route"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2503
-msgid "Split Threshold..."
+#: ../src/viktrwlayer.c:3298 ../src/viktrwlayer.c:6223
+#: ../src/viktrwlayer.c:6312
+msgid "_Finish Track"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2504
-msgid "Split when time between trackpoints exceeds:"
+#. Now with icons
+#: ../src/viktrwlayer.c:3310
+msgid "_View Layer"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2587
-msgid "Waypoint Already Exists"
+#: ../src/viktrwlayer.c:3317
+msgid "V_iew"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2628
-msgid "Track Already Exists"
+#: ../src/viktrwlayer.c:3323
+msgid "View All _Tracks"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2750
-msgid "_Goto"
+#: ../src/viktrwlayer.c:3328
+msgid "View All _Routes"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2758
-msgid "_Visit Geocache Webpage"
+#: ../src/viktrwlayer.c:3333
+msgid "View All _Waypoints"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2773
-msgid "_Goto Startpoint"
+#: ../src/viktrwlayer.c:3338
+msgid "_Goto Center of Layer"
+msgstr "Перейти к центру слоя"
+
+#: ../src/viktrwlayer.c:3344 ../src/viktrwlayer.c:6199
+msgid "Goto _Waypoint..."
 msgstr ""
 
-#: ../src/viktrwlayer.c:2778
-msgid "Goto \"_Center\""
+#: ../src/viktrwlayer.c:3350
+msgid "_Export Layer"
+msgstr "Экспортировать слой"
+
+#: ../src/viktrwlayer.c:3356
+msgid "Export as GPS_Point..."
 msgstr ""
 
-#: ../src/viktrwlayer.c:2783
-msgid "Goto _Endpoint"
+#: ../src/viktrwlayer.c:3361
+msgid "Export as GPS_Mapper..."
 msgstr ""
 
-#: ../src/viktrwlayer.c:2788
-msgid "_Merge By Time"
+#: ../src/viktrwlayer.c:3366
+msgid "Export as _GPX..."
 msgstr ""
 
-#: ../src/viktrwlayer.c:2793
-msgid "Merge _With Other Tracks..."
+#: ../src/viktrwlayer.c:3371
+msgid "Export as _KML..."
 msgstr ""
 
-#: ../src/viktrwlayer.c:2798
-msgid "_Split By Time"
+#: ../src/viktrwlayer.c:3376
+msgid "Open with External Program_1: "
 msgstr ""
 
-#: ../src/viktrwlayer.c:2803
-msgid "Down_load Maps Along Track..."
+#: ../src/viktrwlayer.c:3383
+msgid "Open with External Program_2: "
 msgstr ""
 
-#: ../src/viktrwlayer.c:2808
-msgid "_Apply DEM Data"
+#: ../src/viktrwlayer.c:3391 ../src/vikwindow.c:3145
+msgid "_New"
+msgstr "Новый"
+
+#: ../src/viktrwlayer.c:3397
+msgid "New _Waypoint..."
 msgstr ""
 
-#: ../src/viktrwlayer.c:2813
-msgid "E_xtend Track End"
+#: ../src/viktrwlayer.c:3403
+msgid "New _Track"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2818
-msgid "Extend _Using Magic Scissors"
+#: ../src/viktrwlayer.c:3411
+msgid "New _Route"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2832
-msgid "_View Google Directions"
+#: ../src/viktrwlayer.c:3420 ../src/viktrwlayer.c:6597
+msgid "Geotag _Images..."
 msgstr ""
 
-#: ../src/viktrwlayer.c:2838
-msgid "Use with _Filter"
+#: ../src/viktrwlayer.c:3427
+msgid "_Acquire"
 msgstr ""
 
-#: ../src/viktrwlayer.c:3474
-msgid "Track"
+#: ../src/viktrwlayer.c:3433 ../src/vikwindow.c:3150
+msgid "From _GPS..."
+msgstr "Из _GPS..."
+
+#: ../src/viktrwlayer.c:3439
+msgid "From Google _Directions..."
 msgstr ""
 
-#: ../src/viktrwlayer.c:3807
-msgid "Could not launch eog to open file."
+#: ../src/viktrwlayer.c:3446
+msgid "From _OSM Traces..."
 msgstr ""
 
-#: ../src/viktrwlayer.c:3861
-#, c-format
-msgid "Creating %d Image Thumbnails..."
+#: ../src/viktrwlayer.c:3451
+msgid "From _My OSM Traces..."
 msgstr ""
 
-#: ../src/viktrwlayer.c:4086
-msgid "No map layer in use. Create one first"
+#: ../src/viktrwlayer.c:3459 ../src/vikwindow.c:3166
+msgid "From _Wikipedia Waypoints"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:686
-msgid "Failed spliting track. Track unchanged"
-msgstr ""
-
-#: ../src/viktrwlayer_propwin.c:703
-msgid "Operation Aborted. Track unchanged"
-msgstr ""
+#: ../src/viktrwlayer.c:3465
+msgid "Within _Layer Bounds"
+msgstr "В рамках слоя"
 
-#: ../src/viktrwlayer_propwin.c:757
-#, c-format
-msgid "%s - Track Properties"
-msgstr ""
+#: ../src/viktrwlayer.c:3471
+msgid "Within _Current View"
+msgstr "Внутри текущего вида"
 
-#: ../src/viktrwlayer_propwin.c:762
-msgid "Split at Marker"
+#: ../src/viktrwlayer.c:3479
+msgid "From Geo_caching..."
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:763
-msgid "Split Segments"
+#: ../src/viktrwlayer.c:3486 ../src/vikwindow.c:3163
+msgid "From Geotagged _Images..."
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:764
-msgid "Reverse"
+#: ../src/viktrwlayer.c:3492
+msgid "From _File..."
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:765
-msgid "Delete Dupl."
+#: ../src/viktrwlayer.c:3498 ../src/viktrwlayer.c:6542
+msgid "_Upload"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:788
-msgid "<b>Comment:</b>"
+#: ../src/viktrwlayer.c:3504
+msgid "Upload to _GPS..."
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:788
-msgid "<b>Track Length:</b>"
+#: ../src/viktrwlayer.c:3511 ../src/viktrwlayer.c:6570
+msgid "Upload to _OSM..."
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:788
-msgid "<b>Trackpoints:</b>"
+#: ../src/viktrwlayer.c:3519
+msgid "De_lete"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:788
-msgid "<b>Segments:</b>"
+#: ../src/viktrwlayer.c:3525
+msgid "Delete All _Tracks"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:788
-msgid "<b>Duplicate Points:</b>"
+#: ../src/viktrwlayer.c:3531
+msgid "Delete Tracks _From Selection..."
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:788
-msgid "<b>Max Speed:</b>"
+#: ../src/viktrwlayer.c:3537 ../src/viktrwlayer.c:6290
+msgid "Delete _All Routes"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:788
-msgid "<b>Avg. Speed:</b>"
+#: ../src/viktrwlayer.c:3543 ../src/viktrwlayer.c:6296
+msgid "_Delete Routes From Selection..."
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:788
-msgid "<b>Avg. Dist. Between TPs:</b>"
+#: ../src/viktrwlayer.c:3549
+msgid "Delete All _Waypoints"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:788
-msgid "<b>Elevation Range:</b>"
+#: ../src/viktrwlayer.c:3555
+msgid "Delete Waypoints From _Selection..."
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:788
-msgid "<b>Total Elevation Gain/Loss:</b>"
+#: ../src/viktrwlayer.c:4128
+#, c-format
+msgid "Are you sure you want to delete all tracks in %s?"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:788
-msgid "<b>Start:</b>"
+#: ../src/viktrwlayer.c:4138
+#, c-format
+msgid "Are you sure you want to delete all routes in %s?"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:788
-msgid "<b>End:</b>"
+#: ../src/viktrwlayer.c:4148
+#, c-format
+msgid "Are you sure you want to delete all waypoints in %s?"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:788
-msgid "<b>Duration:</b>"
+#: ../src/viktrwlayer.c:4165
+#, c-format
+msgid "Are you sure you want to delete the waypoint \"%s\""
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:828 ../src/viktrwlayer_propwin.c:852
-#: ../src/viktrwlayer_propwin.c:889 ../src/viktrwlayer_propwin.c:907
-#: ../src/viktrwlayer_propwin.c:957 ../src/viktrwlayer_propwin.c:958
-#: ../src/viktrwlayer_propwin.c:959 ../src/viktrwlayer_propwin.c:981
-#: ../src/viktrwlayer_propwin.c:988
+#: ../src/viktrwlayer.c:4178
 #, c-format
-msgid "No Data"
+msgid "Are you sure you want to delete the track \"%s\""
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:954
+#: ../src/viktrwlayer.c:4191
 #, c-format
-msgid "%d minutes"
+msgid "Are you sure you want to delete the route \"%s\""
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:977
-msgid "Statistics"
+#: ../src/viktrwlayer.c:4351 ../src/viktrwlayer.c:4922
+msgid ""
+"Converting a track to a route removes extra track data such as segments, "
+"timestamps, etc...\n"
+"Do you want to continue?"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:982
-msgid "<b>Track Distance:</b>"
+#: ../src/viktrwlayer.c:4711
+msgid "Failed. No other tracks with timestamps in this layer found"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:983
-msgid "Elevation-distance"
+#: ../src/viktrwlayer.c:4713
+msgid "Failed. No other tracks without timestamps in this layer found"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:989
-msgid "<b>Track Time:</b>"
-msgstr ""
+#: ../src/viktrwlayer.c:4732
+msgid "Merge with..."
+msgstr "Объединить с..."
 
-#: ../src/viktrwlayer_propwin.c:990
-msgid "Speed-time"
+#: ../src/viktrwlayer.c:4733
+msgid "Select route to merge with"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:115
-msgid "<b>Part of Track:</b>"
-msgstr ""
+#: ../src/viktrwlayer.c:4733
+msgid "Select track to merge with"
+msgstr "Выберите маршрут для объединения"
 
-#: ../src/viktrwlayer_tpwin.c:116
-msgid "<b>Latitude:</b>"
+#: ../src/viktrwlayer.c:4818 ../src/viktrwlayer.c:4895
+msgid "Append Route"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:117
-msgid "<b>Longitude:</b>"
+#: ../src/viktrwlayer.c:4818 ../src/viktrwlayer.c:4895
+msgid "Append Track"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:118
-msgid "<b>Altitude:</b>"
+#: ../src/viktrwlayer.c:4819
+msgid "Select the route to append after the current route"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:119
-msgid "<b>Timestamp:</b>"
+#: ../src/viktrwlayer.c:4820
+msgid "Select the track to append after the current track"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:120
-msgid "<b>Time:</b>"
+#: ../src/viktrwlayer.c:4896
+msgid "Select the track to append after the current route"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:121
-msgid "<b>Distance Difference:</b>"
+#: ../src/viktrwlayer.c:4897
+msgid "Select the route to append after the current track"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:122
-msgid "<b>Time Difference:</b>"
-msgstr ""
+#: ../src/viktrwlayer.c:4957
+#, c-format
+msgid "%d segment merged"
+msgid_plural "%d segments merged"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/viktrwlayer_tpwin.c:123
-msgid "<b>\"Speed\" Between:</b>"
-msgstr ""
+#: ../src/viktrwlayer.c:4973
+msgid "Failed. This track does not have timestamp"
+msgstr "Неудача. У этого маршрута нет отметки времени"
 
-#: ../src/viktrwlayer_tpwin.c:124
-msgid "<b>VDOP:</b>"
-msgstr ""
+#: ../src/viktrwlayer.c:4985
+msgid "Failed. No other track in this layer has timestamp"
+msgstr "Неудача. В этом слое больше нет маршрутов с отметками времени"
 
-#: ../src/viktrwlayer_tpwin.c:125
-msgid "<b>HDOP:</b>"
-msgstr ""
+#: ../src/viktrwlayer.c:4992
+msgid "Merge Threshold..."
+msgstr "Порог объединения..."
 
-#: ../src/viktrwlayer_tpwin.c:126
-msgid "<b>PDOP:</b>"
-msgstr ""
+#: ../src/viktrwlayer.c:4993
+msgid "Merge when time between tracks less than:"
+msgstr "Объединить если время между маршрутами меньше:"
 
-#: ../src/viktrwlayer_tpwin.c:127
-msgid "<b>SAT/FIX:</b>"
-msgstr ""
+#: ../src/viktrwlayer.c:5128
+msgid "Split Threshold..."
+msgstr "Порог разделения..."
 
-#: ../src/viktrwlayer_tpwin.c:136
-msgid "Trackpoint"
-msgstr ""
+#: ../src/viktrwlayer.c:5129
+msgid "Split when time between trackpoints exceeds:"
+msgstr "Разделить, если время между узлами превышает:"
 
-#: ../src/viktrwlayer_tpwin.c:141
-msgid "Split Here"
+#: ../src/viktrwlayer.c:5205
+msgid "Split Every Nth Point"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:142
-msgid "Join With Last"
-msgstr ""
+#: ../src/viktrwlayer.c:5206
+msgid "Split on every Nth point:"
+msgstr "Разделить в каждой N-ой точке:"
 
-#: ../src/vikwindow.c:187
-msgid "Pan"
+#: ../src/viktrwlayer.c:5312
+msgid "Can not split track as it has no segments"
 msgstr ""
 
-#: ../src/vikwindow.c:187
-msgid "Zoom"
-msgstr ""
+#: ../src/viktrwlayer.c:5340 ../src/viktrwlayer.c:5370
+#, c-format
+msgid "Deleted %ld point"
+msgid_plural "Deleted %ld points"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/vikwindow.c:187
-msgid "Ruler"
+#: ../src/viktrwlayer.c:5531
+msgid "Internal Error in vik_trw_layer_uniquify_tracks"
 msgstr ""
 
-#: ../src/vikwindow.c:363
-#, c-format
+#: ../src/viktrwlayer.c:5588 ../src/viktrwlayer.c:5635
+#: ../src/viktrwlayer.c:5814
 msgid ""
-"Do you want to save the changes you made to the document \"%s\"?\n"
-"\n"
-"Your changes will be lost if you don't save them."
+"Multiple entries with the same name exist. This method only works with "
+"unique names. Force unique names now?"
 msgstr ""
 
-#: ../src/vikwindow.c:366 ../src/vikwindow.c:1389
-msgid "Untitled"
+#: ../src/viktrwlayer.c:5599
+msgid "No tracks found"
 msgstr ""
 
-#: ../src/vikwindow.c:367
-msgid "Don't Save"
+#: ../src/viktrwlayer.c:5607 ../src/viktrwlayer.c:5654
+#: ../src/viktrwlayer.c:5834
+msgid "Delete Selection"
 msgstr ""
 
-#: ../src/vikwindow.c:402
-msgid "mpp"
+#: ../src/viktrwlayer.c:5608
+msgid "Select tracks to delete"
 msgstr ""
 
-#: ../src/vikwindow.c:402
-msgid "pixelfact"
+#: ../src/viktrwlayer.c:5646
+msgid "No routes found"
 msgstr ""
 
-#: ../src/vikwindow.c:551
-#, c-format
-msgid "%s %s %dm"
+#: ../src/viktrwlayer.c:5655
+msgid "Select routes to delete"
 msgstr ""
 
-#: ../src/vikwindow.c:553
-#, c-format
-msgid "%s %s %dft"
+#: ../src/viktrwlayer.c:5761
+msgid "Internal Error in vik_trw_layer_uniquify_waypoints"
 msgstr ""
 
-#: ../src/vikwindow.c:556
-#, c-format
-msgid "%s %s"
+#: ../src/viktrwlayer.c:5824
+msgid "No waypoints found"
 msgstr ""
 
-#: ../src/vikwindow.c:1178
-msgid "You must select a layer to show its properties."
+#: ../src/viktrwlayer.c:5835
+msgid "Select waypoints to delete"
 msgstr ""
 
-#: ../src/vikwindow.c:1204
-msgid "You must select a layer to delete."
+#: ../src/viktrwlayer.c:5896
+#, c-format
+msgid ""
+"A waypoint with the name \"%s\" already exists. Really rename to the same "
+"name?"
 msgstr ""
 
-#: ../src/vikwindow.c:1501
+#: ../src/viktrwlayer.c:5926
 #, c-format
-msgid "Unable to add '%s' to the list of recently used documents"
+msgid ""
+"A track with the name \"%s\" already exists. Really rename to the same name?"
 msgstr ""
 
-#: ../src/vikwindow.c:1515
-msgid "The file you requested could not be opened."
+#: ../src/viktrwlayer.c:5963
+#, c-format
+msgid ""
+"A route with the name \"%s\" already exists. Really rename to the same name?"
 msgstr ""
 
-#: ../src/vikwindow.c:1561
-msgid "Please select a GPS data file to open. "
-msgstr ""
+#: ../src/viktrwlayer.c:6085 ../src/viktrwlayer.c:6337
+msgid "_Goto"
+msgstr "Перейти"
 
-#: ../src/vikwindow.c:1604
-msgid "Save as Viking File."
-msgstr ""
+#: ../src/viktrwlayer.c:6104
+msgid "_Visit Geocache Webpage"
+msgstr "Посетить web-страницу геотайника"
 
-#: ../src/vikwindow.c:1895
-msgid ""
-"Viewable region outside allowable pixel size bounds for image. Clipping "
-"width/height values."
+#: ../src/viktrwlayer.c:6123
+msgid "_Show Picture..."
 msgstr ""
 
-#: ../src/vikwindow.c:1917
-#, c-format
-msgid "Total area: %ldm x %ldm (%.3f sq. km)"
+#: ../src/viktrwlayer.c:6131
+msgid "Update Geotag on _Image"
 msgstr ""
 
-#: ../src/vikwindow.c:1920
-#, c-format
-msgid "Total area: %ldm x %ldm (%.3f sq. miles)"
+#: ../src/viktrwlayer.c:6137
+msgid "_Update"
 msgstr ""
 
-#. todo: default for answers inside VikWindow or static (thruout instance)
-#: ../src/vikwindow.c:1934
-msgid "Save to Image File"
+#: ../src/viktrwlayer.c:6142
+msgid "Update and _Keep File Timestamp"
 msgstr ""
 
-#: ../src/vikwindow.c:1952
-msgid "Width (pixels):"
+#: ../src/viktrwlayer.c:6153
+msgid "Visit _Webpage"
 msgstr ""
 
-#: ../src/vikwindow.c:1954
-msgid "Height (pixels):"
+#: ../src/viktrwlayer.c:6184
+msgid "_New Waypoint..."
 msgstr ""
 
-#: ../src/vikwindow.c:1957
-msgid "Zoom (meters per pixel):"
+#: ../src/viktrwlayer.c:6193
+msgid "_View All Waypoints"
 msgstr ""
 
-#: ../src/vikwindow.c:1963
-msgid "Area in current viewable window"
+#: ../src/viktrwlayer.c:6205
+msgid "Delete _All Waypoints"
 msgstr ""
 
-#: ../src/vikwindow.c:1973
-msgid "Save as PNG"
+#: ../src/viktrwlayer.c:6211
+msgid "_Delete Waypoints From Selection..."
 msgstr ""
 
-#: ../src/vikwindow.c:1974
-msgid "Save as JPEG"
+#: ../src/viktrwlayer.c:6233
+msgid "_View All Tracks"
 msgstr ""
 
-#: ../src/vikwindow.c:1994
-msgid "East-west image tiles:"
+#: ../src/viktrwlayer.c:6239
+msgid "_New Track"
 msgstr ""
 
-#: ../src/vikwindow.c:1996
-msgid "North-south image tiles:"
+#: ../src/viktrwlayer.c:6247
+msgid "Delete _All Tracks"
 msgstr ""
 
-#: ../src/vikwindow.c:2036
-msgid "You must be in UTM mode to use this feature"
+#: ../src/viktrwlayer.c:6253
+msgid "_Delete Tracks From Selection..."
 msgstr ""
 
-#: ../src/vikwindow.c:2047
-msgid "Save Image"
+#: ../src/viktrwlayer.c:6276
+msgid "_View All Routes"
 msgstr ""
 
-#: ../src/vikwindow.c:2074
-msgid "Choose a directory to hold images"
+#: ../src/viktrwlayer.c:6282
+msgid "_New Route"
 msgstr ""
 
-#: ../src/vikwindow.c:2160
-msgid "Choose a background color"
+#: ../src/viktrwlayer.c:6327
+msgid "_View Track"
 msgstr ""
 
-#: ../src/vikwindow.c:2181
-msgid "_File"
+#: ../src/viktrwlayer.c:6329
+msgid "_View Route"
 msgstr ""
 
-#: ../src/vikwindow.c:2182
-msgid "_Edit"
-msgstr ""
+#: ../src/viktrwlayer.c:6343
+msgid "_Startpoint"
+msgstr "Начало"
 
-#: ../src/vikwindow.c:2183
-msgid "_View"
-msgstr ""
+#: ../src/viktrwlayer.c:6349
+msgid "\"_Center\""
+msgstr "\"Центр\""
 
-#: ../src/vikwindow.c:2184 ../src/vikwindow.c:2268
-msgid "_Zoom"
-msgstr ""
+#: ../src/viktrwlayer.c:6355
+msgid "_Endpoint"
+msgstr "Конец"
 
-#: ../src/vikwindow.c:2185 ../src/vikwindow.c:2267
-msgid "_Pan"
-msgstr ""
+#: ../src/viktrwlayer.c:6361
+msgid "_Highest Altitude"
+msgstr "Наибольшая высота"
 
-#: ../src/vikwindow.c:2186
-msgid "_Layers"
-msgstr ""
+#: ../src/viktrwlayer.c:6367
+msgid "_Lowest Altitude"
+msgstr "Наименьшая высота"
 
-#: ../src/vikwindow.c:2187
-msgid "_Tools"
-msgstr ""
+#: ../src/viktrwlayer.c:6375
+msgid "_Maximum Speed"
+msgstr "Максимальная скорость"
 
-#: ../src/vikwindow.c:2188
-msgid "_Webtools"
+#: ../src/viktrwlayer.c:6384
+msgid "Co_mbine"
 msgstr ""
 
-#: ../src/vikwindow.c:2189 ../src/vikwindow.c:2255
-msgid "_Help"
+#: ../src/viktrwlayer.c:6392
+msgid "_Merge By Time..."
 msgstr ""
 
-#: ../src/vikwindow.c:2191
-msgid "_New"
+#: ../src/viktrwlayer.c:6397
+msgid "Merge _Segments"
 msgstr ""
 
-#: ../src/vikwindow.c:2191
-msgid "New file"
-msgstr ""
+#: ../src/viktrwlayer.c:6403
+msgid "Merge _With Other Tracks..."
+msgstr "Объединить с другими маршрутами..."
 
-#: ../src/vikwindow.c:2192
-msgid "_Open..."
+#: ../src/viktrwlayer.c:6409
+msgid "_Append Track..."
 msgstr ""
 
-#: ../src/vikwindow.c:2192
-msgid "Open a file"
+#: ../src/viktrwlayer.c:6411
+msgid "_Append Route..."
 msgstr ""
 
-#: ../src/vikwindow.c:2193
-msgid "Open _Recent File"
+#: ../src/viktrwlayer.c:6417
+msgid "Append _Route..."
 msgstr ""
 
-#: ../src/vikwindow.c:2194
-msgid "Append _File..."
+#: ../src/viktrwlayer.c:6419
+msgid "Append _Track..."
 msgstr ""
 
-#: ../src/vikwindow.c:2194
-msgid "Append data from a different file"
+#: ../src/viktrwlayer.c:6426
+msgid "_Split"
 msgstr ""
 
-#: ../src/vikwindow.c:2195
-msgid "A_cquire"
+#: ../src/viktrwlayer.c:6434
+msgid "_Split By Time..."
 msgstr ""
 
-#: ../src/vikwindow.c:2196
-msgid "From _GPS..."
+#. ATM always enable this entry - don't want to have to analyse the track before displaying the menu - to keep the menu speedy
+#: ../src/viktrwlayer.c:6440
+msgid "Split Se_gments"
 msgstr ""
 
-#: ../src/vikwindow.c:2196
-msgid "Transfer data from a GPS device"
+#: ../src/viktrwlayer.c:6446
+msgid "Split By _Number of Points..."
 msgstr ""
 
-#: ../src/vikwindow.c:2197
-msgid "Google _Directions..."
+#: ../src/viktrwlayer.c:6451
+msgid "Split at _Trackpoint"
 msgstr ""
 
-#: ../src/vikwindow.c:2197
-msgid "Get driving directions from Google"
+#: ../src/viktrwlayer.c:6460
+msgid "Delete Poi_nts"
 msgstr ""
 
-#: ../src/vikwindow.c:2199
-msgid "Geo_caches..."
+#: ../src/viktrwlayer.c:6466
+msgid "Delete Points With The Same _Position"
 msgstr ""
 
-#: ../src/vikwindow.c:2199
-msgid "Get Geocaches from geocaching.com"
+#: ../src/viktrwlayer.c:6471
+msgid "Delete Points With The Same _Time"
 msgstr ""
 
-#: ../src/vikwindow.c:2201
-msgid "_Save"
+#: ../src/viktrwlayer.c:6477
+msgid "_Reverse Track"
 msgstr ""
 
-#: ../src/vikwindow.c:2201
-msgid "Save the file"
+#: ../src/viktrwlayer.c:6479
+msgid "_Reverse Route"
 msgstr ""
 
-#: ../src/vikwindow.c:2202
-msgid "Save _As..."
-msgstr ""
+#: ../src/viktrwlayer.c:6488
+msgid "Down_load Maps Along Track..."
+msgstr "Скачать карты вдоль маршрута..."
 
-#: ../src/vikwindow.c:2202
-msgid "Save the file under different name"
+#: ../src/viktrwlayer.c:6490
+msgid "Down_load Maps Along Route..."
 msgstr ""
 
-#: ../src/vikwindow.c:2203
-msgid "_Generate Image File..."
+#: ../src/viktrwlayer.c:6497
+msgid "_Apply DEM Data"
 msgstr ""
 
-#: ../src/vikwindow.c:2203
-msgid "Save a snapshot of the workspace into a file"
+#: ../src/viktrwlayer.c:6504
+msgid "_Export Track as GPX..."
 msgstr ""
 
-#: ../src/vikwindow.c:2204
-msgid "Generate _Directory of Images..."
+#: ../src/viktrwlayer.c:6506
+msgid "_Export Route as GPX..."
 msgstr ""
 
-#: ../src/vikwindow.c:2204
-msgid "FIXME:IMGDIR"
-msgstr ""
+#: ../src/viktrwlayer.c:6513
+msgid "E_xtend Track End"
+msgstr "Продолжить конец маршрута"
 
-#: ../src/vikwindow.c:2207
-msgid "_Print..."
+#: ../src/viktrwlayer.c:6515
+msgid "E_xtend Route End"
 msgstr ""
 
-#: ../src/vikwindow.c:2207
-msgid "Print maps"
+#: ../src/viktrwlayer.c:6522
+msgid "C_onvert to a Route"
 msgstr ""
 
-#: ../src/vikwindow.c:2210
-msgid "E_xit"
+#: ../src/viktrwlayer.c:6524
+msgid "C_onvert to a Track"
 msgstr ""
 
-#: ../src/vikwindow.c:2210
-msgid "Exit the program"
+#: ../src/viktrwlayer.c:6532
+msgid "Extend _Using Route Finder"
 msgstr ""
 
-#: ../src/vikwindow.c:2211
-msgid "Save and Exit"
+#: ../src/viktrwlayer.c:6548
+msgid "_Upload to GPS..."
 msgstr ""
 
-#: ../src/vikwindow.c:2211
-msgid "Save and Exit the program"
+#: ../src/viktrwlayer.c:6559
+msgid "_View Google Directions"
 msgstr ""
 
-#: ../src/vikwindow.c:2213
-msgid "Go to the _Default Location"
+#: ../src/viktrwlayer.c:6579
+msgid "Use with _Filter"
 msgstr ""
 
-#: ../src/vikwindow.c:2213
-msgid "Go to the default location"
+#: ../src/viktrwlayer.c:6612
+msgid "_Edit Trackpoint"
 msgstr ""
 
-#: ../src/vikwindow.c:2214
-msgid "Go to _Location..."
+#: ../src/viktrwlayer.c:7524
+#, c-format
+msgid " - Gain %dm:Loss %dm"
 msgstr ""
 
-#: ../src/vikwindow.c:2214
-msgid "Go to address/place using text search"
+#: ../src/viktrwlayer.c:7526
+#, c-format
+msgid " - Gain %dft:Loss %dft"
 msgstr ""
 
-#: ../src/vikwindow.c:2215
-msgid "_Go to Lat/Lon..."
+#: ../src/viktrwlayer.c:7531
+#, c-format
+msgid " - Bearing %3.1f° - Step %s"
 msgstr ""
 
-#: ../src/vikwindow.c:2215
-msgid "Go to arbitrary lat/lon coordinate"
+#: ../src/viktrwlayer.c:8124
+#, c-format
+msgid "Could not launch %s to open file."
 msgstr ""
 
-#: ../src/vikwindow.c:2216
-msgid "Go to UTM..."
-msgstr ""
+#: ../src/viktrwlayer.c:8205
+#, c-format
+msgid "Creating %d Image Thumbnails..."
+msgstr "Создание %d картинок миниатюр..."
 
-#: ../src/vikwindow.c:2216
-msgid "Go to arbitrary UTM coordinate"
-msgstr ""
+#: ../src/viktrwlayer.c:8524
+msgid "No map layer in use. Create one first"
+msgstr "Нет слоя карты. Создайте его сначала"
 
-#: ../src/vikwindow.c:2217
-msgid "Set Bac_kground Color..."
+#: ../src/viktrwlayer_propwin.c:898 ../src/viktrwlayer_propwin.c:1155
+#, c-format
+msgid "%.1f kph"
 msgstr ""
 
-#: ../src/vikwindow.c:2218
-msgid "Zoom _In"
+#: ../src/viktrwlayer_propwin.c:901 ../src/viktrwlayer_propwin.c:1158
+#, c-format
+msgid "%.1f mph"
 msgstr ""
 
-#: ../src/vikwindow.c:2219
-msgid "Zoom _Out"
+#: ../src/viktrwlayer_propwin.c:904 ../src/viktrwlayer_propwin.c:1161
+#, c-format
+msgid "%.1f knots"
 msgstr ""
 
-#: ../src/vikwindow.c:2220
-msgid "Zoom _To..."
+#. VIK_UNITS_SPEED_METRES_PER_SECOND:
+#: ../src/viktrwlayer_propwin.c:908 ../src/viktrwlayer_propwin.c:1165
+#, c-format
+msgid "%.1f m/s"
 msgstr ""
 
-#: ../src/vikwindow.c:2221
-msgid "0.25"
+#: ../src/viktrwlayer_propwin.c:1745
+#, c-format
+msgid "%.1f miles"
 msgstr ""
 
-#: ../src/vikwindow.c:2222
-msgid "0.5"
+#: ../src/viktrwlayer_propwin.c:1747
+#, c-format
+msgid "%.1f km"
 msgstr ""
 
-#: ../src/vikwindow.c:2223
-msgid "1"
-msgstr ""
+#: ../src/viktrwlayer_propwin.c:2681
+msgid "Failed spliting track. Track unchanged"
+msgstr "Не удалось разделить маршрут. Маршрут не изменен."
 
-#: ../src/vikwindow.c:2224
-msgid "2"
-msgstr ""
+#: ../src/viktrwlayer_propwin.c:2779 ../src/viktrwlayer_propwin.c:3178
+#, c-format
+msgid "%s - Track Properties"
+msgstr "%s - свойства маршрута"
 
-#: ../src/vikwindow.c:2225
-msgid "4"
+#: ../src/viktrwlayer_propwin.c:2784
+msgid "Split at _Marker"
 msgstr ""
 
-#: ../src/vikwindow.c:2226
-msgid "8"
+#: ../src/viktrwlayer_propwin.c:2785
+msgid "Split _Segments"
 msgstr ""
 
-#: ../src/vikwindow.c:2227
-msgid "16"
+#: ../src/viktrwlayer_propwin.c:2786
+msgid "_Reverse"
 msgstr ""
 
-#: ../src/vikwindow.c:2228
-msgid "32"
+#: ../src/viktrwlayer_propwin.c:2787
+msgid "_Delete Dupl."
 msgstr ""
 
-#: ../src/vikwindow.c:2229
-msgid "64"
-msgstr ""
+#: ../src/viktrwlayer_propwin.c:2813
+msgid "<b>Comment:</b>"
+msgstr "<b>Комментарий:</b>"
 
-#: ../src/vikwindow.c:2230
-msgid "128"
+#: ../src/viktrwlayer_propwin.c:2814
+msgid "<b>Description:</b>"
 msgstr ""
 
-#: ../src/vikwindow.c:2231
-msgid "256"
-msgstr ""
+#: ../src/viktrwlayer_propwin.c:2815
+msgid "<b>Track Length:</b>"
+msgstr "<b>Длина маршрута:</b>"
 
-#: ../src/vikwindow.c:2232
-msgid "512"
-msgstr ""
+#: ../src/viktrwlayer_propwin.c:2816
+msgid "<b>Trackpoints:</b>"
+msgstr "<b>Узлов:</b>"
 
-#: ../src/vikwindow.c:2233
-msgid "1024"
-msgstr ""
+#: ../src/viktrwlayer_propwin.c:2817
+msgid "<b>Segments:</b>"
+msgstr "<b>Сегментов:</b>"
 
-#: ../src/vikwindow.c:2234
-msgid "2048"
-msgstr ""
+#: ../src/viktrwlayer_propwin.c:2818
+msgid "<b>Duplicate Points:</b>"
+msgstr "<b>Повторяющихся точек:</b>"
 
-#: ../src/vikwindow.c:2235
-msgid "4096"
-msgstr ""
+#: ../src/viktrwlayer_propwin.c:2819
+msgid "<b>Max Speed:</b>"
+msgstr "<b>Максимальная скорость:</b>"
 
-#: ../src/vikwindow.c:2236
-msgid "8192"
-msgstr ""
+#: ../src/viktrwlayer_propwin.c:2820
+msgid "<b>Avg. Speed:</b>"
+msgstr "<b>Средняя скорость:</b>"
 
-#: ../src/vikwindow.c:2237
-msgid "16384"
+#: ../src/viktrwlayer_propwin.c:2821
+msgid "<b>Moving Avg. Speed:</b>"
 msgstr ""
 
-#: ../src/vikwindow.c:2238
-msgid "32768"
-msgstr ""
+#: ../src/viktrwlayer_propwin.c:2822
+msgid "<b>Avg. Dist. Between TPs:</b>"
+msgstr "<b>Ср. расст. между узлами:</b>"
 
-#: ../src/vikwindow.c:2239
-msgid "Pan _North"
-msgstr ""
+#: ../src/viktrwlayer_propwin.c:2823
+msgid "<b>Elevation Range:</b>"
+msgstr "<b>Вертикальный диапазон:</b>"
 
-#: ../src/vikwindow.c:2240
-msgid "Pan _East"
+#: ../src/viktrwlayer_propwin.c:2824
+msgid "<b>Total Elevation Gain/Loss:</b>"
 msgstr ""
 
-#: ../src/vikwindow.c:2241
-msgid "Pan _South"
-msgstr ""
+#: ../src/viktrwlayer_propwin.c:2825
+msgid "<b>Start:</b>"
+msgstr "<b>Начало:</b>"
 
-#: ../src/vikwindow.c:2242
-msgid "Pan _West"
-msgstr ""
+#: ../src/viktrwlayer_propwin.c:2826
+msgid "<b>End:</b>"
+msgstr "<b>Конец:</b>"
 
-#: ../src/vikwindow.c:2243
-msgid "Background _Jobs"
+#: ../src/viktrwlayer_propwin.c:2827
+msgid "<b>Duration:</b>"
+msgstr "<b>Продолжительность:</b>"
+
+#: ../src/viktrwlayer_propwin.c:2828
+msgid "<b>Color:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2877 ../src/viktrwlayer_propwin.c:2901
+#: ../src/viktrwlayer_propwin.c:2929 ../src/viktrwlayer_propwin.c:2966
+#: ../src/viktrwlayer_propwin.c:2984 ../src/viktrwlayer_propwin.c:3034
+#: ../src/viktrwlayer_propwin.c:3035 ../src/viktrwlayer_propwin.c:3036
+#: ../src/viktrwlayer_propwin.c:3062 ../src/viktrwlayer_propwin.c:3063
+#: ../src/viktrwlayer_propwin.c:3078 ../src/viktrwlayer_propwin.c:3079
+#: ../src/viktrwlayer_propwin.c:3092 ../src/viktrwlayer_propwin.c:3093
+#: ../src/viktrwlayer_propwin.c:3106 ../src/viktrwlayer_propwin.c:3107
+#: ../src/viktrwlayer_propwin.c:3120 ../src/viktrwlayer_propwin.c:3121
+#: ../src/viktrwlayer_propwin.c:3134 ../src/viktrwlayer_propwin.c:3135
+#, c-format
+msgid "No Data"
+msgstr "Нет данных"
+
+#: ../src/viktrwlayer_propwin.c:3031
+#, c-format
+msgid "%d minutes"
+msgstr "%d минут"
+
+#: ../src/viktrwlayer_propwin.c:3058
+msgid "Statistics"
+msgstr "Статистика"
+
+#: ../src/viktrwlayer_propwin.c:3064
+msgid "Show D_EM"
 msgstr ""
 
-#: ../src/vikwindow.c:2245
-msgid "Cu_t"
+#: ../src/viktrwlayer_propwin.c:3065 ../src/viktrwlayer_propwin.c:3080
+#: ../src/viktrwlayer_propwin.c:3094 ../src/viktrwlayer_propwin.c:3136
+msgid "Show _GPS Speed"
 msgstr ""
 
-#: ../src/vikwindow.c:2246
-msgid "_Copy"
+#: ../src/viktrwlayer_propwin.c:3067 ../src/viktrwlayer_propwin.c:3082
+#: ../src/viktrwlayer_propwin.c:3110 ../src/viktrwlayer_propwin.c:3138
+msgid "<b>Track Distance:</b>"
+msgstr "<b>Длина маршрута:</b>"
+
+#: ../src/viktrwlayer_propwin.c:3068 ../src/viktrwlayer_propwin.c:3125
+msgid "<b>Track Height:</b>"
 msgstr ""
 
-#: ../src/vikwindow.c:2247
-msgid "_Paste"
+#: ../src/viktrwlayer_propwin.c:3073
+msgid "Elevation-distance"
+msgstr "Высота-расстояние"
+
+#: ../src/viktrwlayer_propwin.c:3083
+msgid "<b>Track Gradient:</b>"
 msgstr ""
 
-#: ../src/vikwindow.c:2248
-msgid "_Delete"
+#: ../src/viktrwlayer_propwin.c:3087
+msgid "Gradient-distance"
 msgstr ""
 
-#: ../src/vikwindow.c:2249
-msgid "Delete All"
+#: ../src/viktrwlayer_propwin.c:3096 ../src/viktrwlayer_propwin.c:3111
+#: ../src/viktrwlayer_propwin.c:3124
+msgid "<b>Track Time:</b>"
+msgstr "<b>Время маршрута:</b>"
+
+#: ../src/viktrwlayer_propwin.c:3097 ../src/viktrwlayer_propwin.c:3139
+msgid "<b>Track Speed:</b>"
 msgstr ""
 
-#: ../src/vikwindow.c:2250
-msgid "_Flush Map Cache"
+#: ../src/viktrwlayer_propwin.c:3101
+msgid "Speed-time"
+msgstr "Скорость-время"
+
+#: ../src/viktrwlayer_propwin.c:3108 ../src/viktrwlayer_propwin.c:3122
+msgid "Show S_peed"
 msgstr ""
 
-#: ../src/vikwindow.c:2251
-msgid "_Set the Default Location"
+#: ../src/viktrwlayer_propwin.c:3115
+msgid "Distance-time"
 msgstr ""
 
-#: ../src/vikwindow.c:2251
-msgid "Set the Default Location to the current position"
+#: ../src/viktrwlayer_propwin.c:3129
+msgid "Elevation-time"
 msgstr ""
 
-#: ../src/vikwindow.c:2252
-msgid "_Preferences"
+#: ../src/viktrwlayer_propwin.c:3143
+msgid "Speed-distance"
 msgstr ""
 
-#: ../src/vikwindow.c:2253
-msgid "_Properties"
+#: ../src/viktrwlayer_tpwin.c:118
+msgid "<b>Part of Track:</b>"
+msgstr "<b>Часть маршрута:</b>"
+
+#: ../src/viktrwlayer_tpwin.c:119
+msgid "<b>Latitude:</b>"
+msgstr "<b>Широта:</b>"
+
+#: ../src/viktrwlayer_tpwin.c:120
+msgid "<b>Longitude:</b>"
+msgstr "<b>Долгота:</b>"
+
+#: ../src/viktrwlayer_tpwin.c:121
+msgid "<b>Altitude:</b>"
+msgstr "<b>Высота:</b>"
+
+#: ../src/viktrwlayer_tpwin.c:122
+msgid "<b>Timestamp:</b>"
+msgstr "<b>Отметка времени:</b>"
+
+#: ../src/viktrwlayer_tpwin.c:123
+msgid "<b>Time:</b>"
+msgstr "<b>Время:</b>"
+
+#: ../src/viktrwlayer_tpwin.c:124
+msgid "<b>Distance Difference:</b>"
+msgstr "<b>Разница расстояния:</b>"
+
+#: ../src/viktrwlayer_tpwin.c:125
+msgid "<b>Time Difference:</b>"
+msgstr "<b>Разность времени:</b>"
+
+#: ../src/viktrwlayer_tpwin.c:126
+msgid "<b>\"Speed\" Between:</b>"
 msgstr ""
 
-#: ../src/vikwindow.c:2256
-msgid "_About"
+#: ../src/viktrwlayer_tpwin.c:127
+msgid "<b>VDOP:</b>"
 msgstr ""
 
-#: ../src/vikwindow.c:2261
-msgid "_UTM Mode"
+#: ../src/viktrwlayer_tpwin.c:128
+msgid "<b>HDOP:</b>"
 msgstr ""
 
-#: ../src/vikwindow.c:2262
-msgid "_Expedia Mode"
+#: ../src/viktrwlayer_tpwin.c:129
+msgid "<b>PDOP:</b>"
 msgstr ""
 
-#: ../src/vikwindow.c:2263
-msgid "_Mercator Mode"
+#: ../src/viktrwlayer_tpwin.c:130
+msgid "<b>SAT/FIX:</b>"
 msgstr ""
 
-#: ../src/vikwindow.c:2267
-msgid "Pan Tool"
+#: ../src/viktrwlayer_tpwin.c:139
+msgid "Trackpoint"
+msgstr "Узел"
+
+#: ../src/viktrwlayer_tpwin.c:142
+msgid "_Insert After"
+msgstr "Вставить после"
+
+#: ../src/viktrwlayer_tpwin.c:144
+msgid "Split Here"
+msgstr "Разделить здесь"
+
+#: ../src/viktrwlayer_geotag.c:446
+#, c-format
+msgid "Geotagging %d Images..."
 msgstr ""
 
-#: ../src/vikwindow.c:2268
-msgid "Zoom Tool"
+#: ../src/viktrwlayer_geotag.c:510
+msgid "Geotag Images"
 msgstr ""
 
-#: ../src/vikwindow.c:2269
-msgid "_Ruler"
+#: ../src/viktrwlayer_geotag.c:516
+msgid "Images"
 msgstr ""
 
-#: ../src/vikwindow.c:2269
-msgid "Ruler Tool"
+#: ../src/viktrwlayer_geotag.c:520
+msgid "Overwrite Existing Waypoints:"
 msgstr ""
 
-#: ../src/vikwindow.c:2273
-msgid "_Show Scale"
+#: ../src/viktrwlayer_geotag.c:523
+msgid "Overwrite Existing GPS Information:"
 msgstr ""
 
-#: ../src/vikwindow.c:2273
-msgid "Show Scale"
+#: ../src/viktrwlayer_geotag.c:525
+msgid "Keep File Modification Timestamp:"
 msgstr ""
 
-#: ../src/vikwindow.c:2274
-msgid "Show _Center Mark"
+#: ../src/viktrwlayer_geotag.c:555
+msgid "Create Waypoints:"
 msgstr ""
 
-#: ../src/vikwindow.c:2274
-msgid "Show Center Mark"
+#: ../src/viktrwlayer_geotag.c:563
+msgid "Write EXIF:"
 msgstr ""
 
-#: ../src/vikwindow.c:2275
-msgid "_Full Screen"
+#: ../src/viktrwlayer_geotag.c:575
+msgid "Interpolate Between Track Segments:"
 msgstr ""
 
-#: ../src/vikwindow.c:2275
-msgid "Activate full screen mode"
+#: ../src/viktrwlayer_geotag.c:579
+msgid "Image Time Offset (Seconds):"
 msgstr ""
 
-#: ../src/vikwindow.c:2276
-msgid "Show Side Pa_nel"
+#: ../src/viktrwlayer_geotag.c:581
+msgid ""
+"The number of seconds to ADD to the photos time to make it match the GPS "
+"data. Calculate this with (GPS - Photo). Can be negative or positive. Useful "
+"to adjust times when a camera's timestamp was incorrect."
 msgstr ""
 
-#: ../src/vikwindow.c:2276
-msgid "Show Side Panel"
+#: ../src/viktrwlayer_geotag.c:584
+msgid "Image Timezone:"
 msgstr ""
 
-#: ../src/vikwindow.c:2338
+#: ../src/viktrwlayer_geotag.c:586
+msgid ""
+"The timezone that was used when the images were created. For example, if a "
+"camera is set to AWST or +8:00 hours. Enter +8:00 here so that the correct "
+"adjustment to the images' time can be made. GPS data is always in UTC."
+msgstr ""
+
+#: ../src/viktrwlayer_geotag.c:590
 #, c-format
-msgid "New %s Layer"
+msgid "Using track: %s"
 msgstr ""
 
-#: ../src/viking.desktop.in.h:1
-msgid "GPS Data Manager"
+#: ../src/viktrwlayer_geotag.c:592
+#, c-format
+msgid "Using all tracks in: %s"
 msgstr ""
 
-#: ../src/viking.desktop.in.h:2
-msgid "Map Based GPS Data Manager (live data capable)."
+#: ../src/vikstatus.c:105
+msgid "Current zoom level. Click to select a new one."
 msgstr ""
 
-#: ../src/viking.desktop.in.h:3
+#: ../src/vikwaypoint.c:34
+msgid "Waypoint"
+msgstr ""
+
+#. TODO get rid of this as this is unnecessary duplication...
+#: ../src/vikwindow.c:221
+msgid "Pan"
+msgstr "Рука"
+
+#: ../src/vikwindow.c:221
+msgid "Zoom"
+msgstr "Масштаб"
+
+#: ../src/vikwindow.c:221
+msgid "Ruler"
+msgstr "Линейка"
+
+#: ../src/vikwindow.c:221
+msgid "Select"
+msgstr ""
+
+#. Create tooltip
+#: ../src/vikwindow.c:440
+msgid "Select zoom level"
+msgstr ""
+
+#: ../src/vikwindow.c:645
+#, c-format
+msgid ""
+"Do you want to save the changes you made to the document \"%s\"?\n"
+"\n"
+"Your changes will be lost if you don't save them."
+msgstr ""
+"Вы хотите сохранить изменения, сделанные в документе \"%s\"?\n"
+"\n"
+"Если вы не сохраните изменения, они будут потеряны."
+
+#: ../src/vikwindow.c:649
+msgid "Don't Save"
+msgstr "Не сохранять"
+
+#: ../src/vikwindow.c:696
+msgid "mpp"
+msgstr ""
+
+#: ../src/vikwindow.c:696
+msgid "pixelfact"
+msgstr ""
+
+#: ../src/vikwindow.c:861
+#, c-format
+msgid "%s %s %dm"
+msgstr ""
+
+#: ../src/vikwindow.c:863
+#, c-format
+msgid "%s %s %dft"
+msgstr ""
+
+#: ../src/vikwindow.c:866
+#, c-format
+msgid "%s %s"
+msgstr "%s %s"
+
+#. NB Ctrl+Shift+R is used for Refresh (deemed more important), so use 'U' instead
+#: ../src/vikwindow.c:1254
+msgid "_Ruler"
+msgstr "Линейка"
+
+#: ../src/vikwindow.c:1254
+msgid "Ruler Tool"
+msgstr "Инструмент линейка"
+
+#: ../src/vikwindow.c:1502 ../src/vikwindow.c:3138
+msgid "_Zoom"
+msgstr "Масштаб"
+
+#: ../src/vikwindow.c:1502
+msgid "Zoom Tool"
+msgstr "Инструмент масштабирования"
+
+#: ../src/vikwindow.c:1547 ../src/vikwindow.c:3139
+msgid "_Pan"
+msgstr "Рука"
+
+#: ../src/vikwindow.c:1547
+msgid "Pan Tool"
+msgstr "Инструмент рука"
+
+#: ../src/vikwindow.c:1664
+msgid "_Select"
+msgstr ""
+
+#: ../src/vikwindow.c:1664
+msgid "Select Tool"
+msgstr ""
+
+#: ../src/vikwindow.c:1809
+msgid "You must select a layer to show its properties."
+msgstr "Для просмотра свойств нужно выбрать слой."
+
+#. No error to show, so unlikely this will get called
+#: ../src/vikwindow.c:1824
+msgid "The help system is not available."
+msgstr ""
+
+#. Main error path
+#: ../src/vikwindow.c:1827
+#, c-format
+msgid ""
+"Help is not available because: %s.\n"
+"Ensure a Mime Type ghelp handler program is installed (e.g. yelp)."
+msgstr ""
+
+#: ../src/vikwindow.c:1850
+msgid "You must select a layer to delete."
+msgstr "Для удаления нужно выбрать слой."
+
+#: ../src/vikwindow.c:2087
+msgid "Untitled"
+msgstr "Безымянный"
+
+#: ../src/vikwindow.c:2194
+#, c-format
+msgid "Unable to add '%s' to the list of recently used documents"
+msgstr "Не удалось добавить '%s' к списку недавно использованных документов"
+
+#: ../src/vikwindow.c:2208
+msgid "The file you requested could not be opened."
+msgstr "Выбранный файл невозможно открыть."
+
+#: ../src/vikwindow.c:2211
+msgid ""
+"GPSBabel is required to load files of this type or GPSBabel encountered "
+"problems."
+msgstr ""
+
+#: ../src/vikwindow.c:2214
+#, c-format
+msgid "Unable to load malformed GPX file %s"
+msgstr ""
+
+#: ../src/vikwindow.c:2217
+#, c-format
+msgid "Unsupported file type for %s"
+msgstr ""
+
+#. Since we can process .vik files with issues just show a warning in the status bar
+#. Not that a user can do much about it... or tells them what this issue is yet...
+#: ../src/vikwindow.c:2223
+#, c-format
+msgid "WARNING: issues encountered loading %s"
+msgstr ""
+
+#: ../src/vikwindow.c:2278
+msgid "Please select a GPS data file to open. "
+msgstr "Пожалуйста, выберите файл с данными GPS. "
+
+#: ../src/vikwindow.c:2288
+msgid "Geocaching"
+msgstr ""
+
+#: ../src/vikwindow.c:2294
+msgid "Google Earth"
+msgstr ""
+
+#: ../src/vikwindow.c:2299
+msgid "GPX"
+msgstr ""
+
+#: ../src/vikwindow.c:2304 ../src/vikwindow.c:2387
+#: ../src/viking.desktop.in.h:1
 msgid "Viking"
+msgstr "Викинг"
+
+#: ../src/vikwindow.c:2374
+msgid "Save as Viking File."
+msgstr "Сохранить файл Viking."
+
+#. Try harder...
+#: ../src/vikwindow.c:2619 ../src/vikwindow.c:2625
+msgid "Generating image file..."
+msgstr ""
+
+#: ../src/vikwindow.c:2647
+msgid ""
+"Failed to generate internal image.\n"
+"\n"
+"Try creating a smaller image."
+msgstr ""
+
+#: ../src/vikwindow.c:2655
+msgid "Failed to generate image file."
+msgstr ""
+
+#. Success
+#: ../src/vikwindow.c:2660
+msgid "Image file generated."
+msgstr ""
+
+#: ../src/vikwindow.c:2764
+msgid ""
+"Viewable region outside allowable pixel size bounds for image. Clipping "
+"width/height values."
+msgstr ""
+
+#: ../src/vikwindow.c:2789
+#, c-format
+msgid "Total area: %ldm x %ldm (%.3f sq. km)"
+msgstr "Общая площадь: %ldм x %ldм (%.3f кв. км)"
+
+#: ../src/vikwindow.c:2792
+#, c-format
+msgid "Total area: %ldm x %ldm (%.3f sq. miles)"
+msgstr "Общая площадь: %ldм x %ldм (%.3f кв. миль)"
+
+#: ../src/vikwindow.c:2813
+msgid "Save Image"
+msgstr "Сохранить изображение"
+
+#: ../src/vikwindow.c:2834
+msgid "PNG"
+msgstr ""
+
+#: ../src/vikwindow.c:2857
+msgid "You must be in UTM mode to use this feature"
+msgstr "Нужно перейти в режим UTM для использования этой возможности"
+
+#: ../src/vikwindow.c:2862
+msgid "Choose a directory to hold images"
+msgstr "Выберите каталог для изображений"
+
+#. todo: default for answers inside VikWindow or static (thruout instance)
+#: ../src/vikwindow.c:2883
+msgid "Save to Image File"
+msgstr "Сохранить как изображение"
+
+#: ../src/vikwindow.c:2900
+msgid "Width (pixels):"
+msgstr "Ширина (в пикселах)"
+
+#: ../src/vikwindow.c:2902
+msgid "Height (pixels):"
+msgstr "Высота (в пикселах)"
+
+#: ../src/vikwindow.c:2905
+msgid ""
+"WARNING: USING LARGE IMAGES OVER 10000x10000\n"
+"MAY CRASH THE PROGRAM!"
+msgstr ""
+
+#: ../src/vikwindow.c:2907
+msgid "Zoom (meters per pixel):"
+msgstr "Масштаб (метров на пиксел):"
+
+#: ../src/vikwindow.c:2921
+msgid "Area in current viewable window"
+msgstr "Область в текущем видимом окне"
+
+#: ../src/vikwindow.c:2931
+msgid "Save as PNG"
+msgstr "Сохранить в PNG"
+
+#: ../src/vikwindow.c:2932
+msgid "Save as JPEG"
+msgstr "Сохранить в JPEG"
+
+#: ../src/vikwindow.c:2954
+msgid "East-west image tiles:"
+msgstr ""
+
+#: ../src/vikwindow.c:2956
+msgid "North-south image tiles:"
+msgstr ""
+
+#: ../src/vikwindow.c:3097
+msgid "Choose a background color"
+msgstr "Выберите цвет фона"
+
+#: ../src/vikwindow.c:3113
+msgid "Choose a track highlight color"
+msgstr ""
+
+#: ../src/vikwindow.c:3134
+msgid "_File"
+msgstr "Файл"
+
+#: ../src/vikwindow.c:3135
+msgid "_Edit"
+msgstr "Правка"
+
+#: ../src/vikwindow.c:3136
+msgid "_View"
+msgstr "Просмотр"
+
+#: ../src/vikwindow.c:3137
+msgid "_Show"
+msgstr "Показать"
+
+#: ../src/vikwindow.c:3140
+msgid "_Layers"
+msgstr "Слои"
+
+#: ../src/vikwindow.c:3141
+msgid "_Tools"
+msgstr "Инструменты"
+
+#: ../src/vikwindow.c:3142
+msgid "_Webtools"
+msgstr ""
+
+#: ../src/vikwindow.c:3143 ../src/vikwindow.c:3206
+msgid "_Help"
+msgstr "Помощь"
+
+#: ../src/vikwindow.c:3145
+msgid "New file"
+msgstr "Новый файл"
+
+#: ../src/vikwindow.c:3146
+msgid "_Open..."
+msgstr "Открыть..."
+
+#: ../src/vikwindow.c:3146
+msgid "Open a file"
+msgstr "Открыть файл"
+
+#: ../src/vikwindow.c:3147
+msgid "Open _Recent File"
+msgstr "Открыть недавний файл"
+
+#: ../src/vikwindow.c:3148
+msgid "Append _File..."
+msgstr "Добавить файл"
+
+#: ../src/vikwindow.c:3148
+msgid "Append data from a different file"
+msgstr "Добавить данные из другого файла"
+
+#: ../src/vikwindow.c:3149
+msgid "A_cquire"
+msgstr "Получить"
+
+#: ../src/vikwindow.c:3150
+msgid "Transfer data from a GPS device"
+msgstr "Передать данные из устройства GPS"
+
+#: ../src/vikwindow.c:3151
+msgid "Import File With GPS_Babel..."
 msgstr ""
 
-#~ msgid "Create"
-#~ msgstr "Создать"
+#: ../src/vikwindow.c:3151
+msgid "Import file via GPSBabel converter"
+msgstr ""
 
-#~ msgid "Full Screen"
-#~ msgstr "Во весь экран"
+#: ../src/vikwindow.c:3153
+msgid "Google _Directions..."
+msgstr "Проводник Google..."
 
-#~ msgid "Enter the password you use to login into www.openstreetmap.org."
-#~ msgstr "Введите пароль используемый для входа на www.openstreetmap.org."
+#: ../src/vikwindow.c:3153
+msgid "Get driving directions from Google"
+msgstr "Получить карту проезда от Google"
 
-#~ msgid "Redownload bad map(s)"
-#~ msgstr "Перезагрузить испорченные карты"
+#: ../src/vikwindow.c:3156
+msgid "_OSM Traces..."
+msgstr ""
 
-#~ msgid "Redownload all map(s)"
-#~ msgstr "Перезагрузить все карты"
+#: ../src/vikwindow.c:3156
+msgid "Get traces from OpenStreetMap"
+msgstr ""
 
-#~ msgid "Export as GPSMapper"
-#~ msgstr "Экспортировать в GPSMapper"
+#: ../src/vikwindow.c:3157
+msgid "_My OSM Traces..."
+msgstr ""
 
-#~ msgid "Export as GPX"
-#~ msgstr "Экспортировать в GPX"
+#: ../src/vikwindow.c:3157
+msgid "Get Your Own Traces from OpenStreetMap"
+msgstr ""
 
-#~ msgid "Goto Map Center"
-#~ msgstr "В центр карты"
+#: ../src/vikwindow.c:3160
+msgid "Geo_caches..."
+msgstr "Геотайники..."
 
-#~ msgid "Upload to GPS"
-#~ msgstr "Загрузить в GPS"
+#: ../src/vikwindow.c:3160
+msgid "Get Geocaches from geocaching.com"
+msgstr "Получить тайники с geocaching.com"
 
-#~ msgid "Download from GPS"
-#~ msgstr "Выгрузить из GPS"
+#: ../src/vikwindow.c:3163
+msgid "Create waypoints from geotagged images"
+msgstr ""
+
+#: ../src/vikwindow.c:3166
+msgid "Create waypoints from Wikipedia items in the current view"
+msgstr ""
+
+#: ../src/vikwindow.c:3168
+msgid "_Save"
+msgstr "Сохранить"
+
+#: ../src/vikwindow.c:3168
+msgid "Save the file"
+msgstr "Сохранить файл"
+
+#: ../src/vikwindow.c:3169
+msgid "Save _As..."
+msgstr "Сохранить как..."
+
+#: ../src/vikwindow.c:3169
+msgid "Save the file under different name"
+msgstr "Сохранить файл под другим именем"
+
+#: ../src/vikwindow.c:3170
+msgid "_Generate Image File..."
+msgstr "Создать файл изображения..."
 
-#~ msgid "Goto Center of Layer"
-#~ msgstr "Переместиться в центр слоя"
+#: ../src/vikwindow.c:3170
+msgid "Save a snapshot of the workspace into a file"
+msgstr "Сохранить снимок рабочей области в файл"
 
-#~ msgid "Goto Waypoint"
-#~ msgstr "Переместиться в пункт"
+#: ../src/vikwindow.c:3171
+msgid "Generate _Directory of Images..."
+msgstr "Создать каталог с картинками..."
 
-# typo?
-#~ msgid "Export layer"
-#~ msgstr "Экспортировать слой"
+#: ../src/vikwindow.c:3171
+msgid "FIXME:IMGDIR"
+msgstr ""
 
-#~ msgid "New Waypoint"
-#~ msgstr "Новый пункт"
+#: ../src/vikwindow.c:3174
+msgid "_Print..."
+msgstr "Печать"
+
+#: ../src/vikwindow.c:3174
+msgid "Print maps"
+msgstr "Печать карт"
+
+#: ../src/vikwindow.c:3177
+msgid "E_xit"
+msgstr "Выйти"
+
+#: ../src/vikwindow.c:3177
+msgid "Exit the program"
+msgstr "Выйти из программы"
+
+#: ../src/vikwindow.c:3178
+msgid "Save and Exit"
+msgstr "Сохранить и выйти"
+
+#: ../src/vikwindow.c:3178
+msgid "Save and Exit the program"
+msgstr "Сохранить и выйти из программы"
+
+#: ../src/vikwindow.c:3180
+msgid "Go to the _Default Location"
+msgstr "Перейти к исходному пункту"
+
+#: ../src/vikwindow.c:3180
+msgid "Go to the default location"
+msgstr "Перейти к исходному пункту"
+
+#: ../src/vikwindow.c:3181
+msgid "Go to _Location..."
+msgstr "Перейти к Расположению..."
+
+#: ../src/vikwindow.c:3181
+msgid "Go to address/place using text search"
+msgstr "Перейти к адресу/месту, используя поиск"
+
+#: ../src/vikwindow.c:3182
+msgid "_Go to Lat/Lon..."
+msgstr "_Перейти к широте/долготе..."
+
+#: ../src/vikwindow.c:3182
+msgid "Go to arbitrary lat/lon coordinate"
+msgstr "Перейти к заданной координате ш.,д."
+
+#: ../src/vikwindow.c:3183
+msgid "Go to UTM..."
+msgstr "Перейти к UTM..."
+
+#: ../src/vikwindow.c:3183
+msgid "Go to arbitrary UTM coordinate"
+msgstr "Перейти к заданной координате UTM"
+
+#: ../src/vikwindow.c:3184
+msgid "_Refresh"
+msgstr ""
+
+#: ../src/vikwindow.c:3184
+msgid "Refresh any maps displayed"
+msgstr ""
+
+#: ../src/vikwindow.c:3185
+msgid "Set _Highlight Color..."
+msgstr ""
+
+#: ../src/vikwindow.c:3186
+msgid "Set Bac_kground Color..."
+msgstr "Выбрать цвет фона..."
+
+#: ../src/vikwindow.c:3187
+msgid "Zoom _In"
+msgstr "Приблизить"
+
+#: ../src/vikwindow.c:3188
+msgid "Zoom _Out"
+msgstr "Отдалить"
+
+#: ../src/vikwindow.c:3189
+msgid "Zoom _To..."
+msgstr "Масштабировать _к..."
+
+#: ../src/vikwindow.c:3190
+msgid "Pan _North"
+msgstr "Сдвинуть к северу"
+
+#: ../src/vikwindow.c:3191
+msgid "Pan _East"
+msgstr "Сдвинуть к востоку"
+
+#: ../src/vikwindow.c:3192
+msgid "Pan _South"
+msgstr "Сдвинуть к югу"
+
+#: ../src/vikwindow.c:3193
+msgid "Pan _West"
+msgstr "Сдвинуть к западу"
+
+#: ../src/vikwindow.c:3194
+msgid "Background _Jobs"
+msgstr "Фоновые задачи"
+
+#: ../src/vikwindow.c:3196
+msgid "Cu_t"
+msgstr "Вырезать"
+
+#: ../src/vikwindow.c:3200
+msgid "Delete All"
+msgstr "Удалить все"
+
+#: ../src/vikwindow.c:3201
+msgid "_Flush Map Cache"
+msgstr "Опустошить кэш карт"
+
+#: ../src/vikwindow.c:3202
+msgid "_Set the Default Location"
+msgstr "Задать расположение по умолчанию"
+
+#: ../src/vikwindow.c:3202
+msgid "Set the Default Location to the current position"
+msgstr "Сохранить текущее расположение, как расположение по умолчанию"
+
+#: ../src/vikwindow.c:3203
+msgid "_Preferences"
+msgstr "Предпочтения"
+
+#: ../src/vikwindow.c:3204
+msgid "_Properties"
+msgstr "Свойства"
+
+#: ../src/vikwindow.c:3207
+msgid "_About"
+msgstr "О программе"
+
+#: ../src/vikwindow.c:3213
+msgid "_UTM Mode"
+msgstr "Режим _UTM"
+
+#: ../src/vikwindow.c:3214
+msgid "_Expedia Mode"
+msgstr "Режим _Expedia"
+
+#: ../src/vikwindow.c:3215
+msgid "_Mercator Mode"
+msgstr "Режим _Mercator"
+
+#: ../src/vikwindow.c:3216
+msgid "Lat_/Lon Mode"
+msgstr "Режим широта/долгота"
+
+#: ../src/vikwindow.c:3220
+msgid "Show _Scale"
+msgstr "Показать масштаб"
+
+#: ../src/vikwindow.c:3220
+msgid "Show Scale"
+msgstr "Паказать масштаб"
+
+#: ../src/vikwindow.c:3221
+msgid "Show _Center Mark"
+msgstr "Показать отметку центра"
+
+#: ../src/vikwindow.c:3221
+msgid "Show Center Mark"
+msgstr "Показать отметку центра"
+
+#: ../src/vikwindow.c:3222
+msgid "Show _Highlight"
+msgstr ""
+
+#: ../src/vikwindow.c:3222
+msgid "Show Highlight"
+msgstr ""
+
+#: ../src/vikwindow.c:3223
+msgid "_Full Screen"
+msgstr "На весь экран"
+
+#: ../src/vikwindow.c:3223
+msgid "Activate full screen mode"
+msgstr "Включить полноэкранный режим"
+
+#: ../src/vikwindow.c:3224
+msgid "Show Side _Panel"
+msgstr "Показать боковую панель"
+
+#: ../src/vikwindow.c:3224
+msgid "Show Side Panel"
+msgstr "Показать боковую панель"
+
+#: ../src/vikwindow.c:3225
+msgid "Show Status_bar"
+msgstr "Показать строку состояния"
+
+#: ../src/vikwindow.c:3225
+msgid "Show Statusbar"
+msgstr "Показать строку состояния"
+
+#: ../src/vikwindow.c:3226
+msgid "Show _Toolbar"
+msgstr "Показать панель инструментов"
+
+#: ../src/vikwindow.c:3226
+msgid "Show Toolbar"
+msgstr "Показать панель инструментов"
+
+#: ../src/vikwindow.c:3227
+msgid "Show _Menu"
+msgstr "Показать меню"
+
+#: ../src/vikwindow.c:3227
+msgid "Show Menu"
+msgstr "Показать меню"
+
+#: ../src/viking.desktop.in.h:2
+msgid "GPS Data Manager"
+msgstr "Менеджер данных GPS"
+
+#: ../src/viking.desktop.in.h:3
+msgid "Map Based GPS Data Manager (live data capable)."
+msgstr ""
+
+#: ../src/libjpeg/jpeg-data.c:206
+msgid "Data does not follow JPEG specification."
+msgstr ""
+
+#: ../src/libjpeg/jpeg-data.c:291
+#, c-format
+msgid "Path '%s' invalid."
+msgstr ""
+
+#: ../src/libjpeg/jpeg-data.c:309
+#, c-format
+msgid "Could not read '%s'."
+msgstr ""