Updated Russian translation

1 files changed, 177 insertions, 166 deletions

diff --git a/po/ru.po b/po/ru.po
index 3fb6be4..b18ae0e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -15,18 +15,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"applets&keywords=I18N+L10N&component=gweather\n"
-"POT-Creation-Date: 2012-03-11 19:27+0000\n"
-"PO-Revision-Date: 2012-03-17 13:06+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=libgweather&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-12-17 20:59+0000\n"
+"PO-Revision-Date: 2012-12-24 12:49+0400\n"
+"Last-Translator: Aleksej Kabanov <ak099@mail.ru>\n"
 "Language-Team: Russian <gnome-cyr@gnome.org>\n"
+"Language: ru\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-Generator: Lokalize 1.0\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-Generator: Poedit 1.5.4\n"
 
 #: ../libgweather/gweather-timezone.c:316
 msgid "Greenwich Mean Time"
@@ -37,106 +38,96 @@ msgctxt "timezone"
 msgid "Unknown"
 msgstr "Неизвестная"
 
-#. Translators: %d is an error code, and %s the error string
-#: ../libgweather/weather-metar.c:523
-#, c-format
-msgid "Failed to get METAR data: %d %s.\n"
-msgstr "Не удалось получить данные METAR: %d %s.\n"
-
-#: ../libgweather/weather-metar.c:571
-msgid "WeatherInfo missing location"
-msgstr "Отсутствует адрес WeatherInfo"
-
-#: ../libgweather/weather.c:200
+#: ../libgweather/weather.c:129
 msgid "Variable"
 msgstr "Переменный"
 
-#: ../libgweather/weather.c:201
+#: ../libgweather/weather.c:130
 msgid "North"
 msgstr "Северный"
 
-#: ../libgweather/weather.c:201
+#: ../libgweather/weather.c:130
 msgid "North - NorthEast"
 msgstr "Северо-северо-восточный"
 
-#: ../libgweather/weather.c:201
+#: ../libgweather/weather.c:130
 msgid "Northeast"
 msgstr "Северо-восточный"
 
-#: ../libgweather/weather.c:201
+#: ../libgweather/weather.c:130
 msgid "East - NorthEast"
 msgstr "Восточно-северо-восточный"
 
-#: ../libgweather/weather.c:202
+#: ../libgweather/weather.c:131
 msgid "East"
 msgstr "Восточный"
 
-#: ../libgweather/weather.c:202
+#: ../libgweather/weather.c:131
 msgid "East - Southeast"
 msgstr "Восточно-юго-восточный"
 
-#: ../libgweather/weather.c:202
+#: ../libgweather/weather.c:131
 msgid "Southeast"
 msgstr "Юго-восточный"
 
-#: ../libgweather/weather.c:202
+#: ../libgweather/weather.c:131
 msgid "South - Southeast"
 msgstr "Юго-юго-восточный"
 
-#: ../libgweather/weather.c:203
+#: ../libgweather/weather.c:132
 msgid "South"
 msgstr "Южный"
 
-#: ../libgweather/weather.c:203
+#: ../libgweather/weather.c:132
 msgid "South - Southwest"
 msgstr "Юго-юго-западный"
 
-#: ../libgweather/weather.c:203
+#: ../libgweather/weather.c:132
 msgid "Southwest"
 msgstr "Юго-западный"
 
-#: ../libgweather/weather.c:203
+#: ../libgweather/weather.c:132
 msgid "West - Southwest"
 msgstr "Западно-юго-западный"
 
-#: ../libgweather/weather.c:204
+#: ../libgweather/weather.c:133
 msgid "West"
 msgstr "Западный"
 
-#: ../libgweather/weather.c:204
+#: ../libgweather/weather.c:133
 msgid "West - Northwest"
 msgstr "Западно-северо-западный"
 
-#: ../libgweather/weather.c:204
+#: ../libgweather/weather.c:133
 msgid "Northwest"
 msgstr "Северо-западный"
 
-#: ../libgweather/weather.c:204
+#: ../libgweather/weather.c:133
 msgid "North - Northwest"
 msgstr "Северо-северо-западный"
 
-#: ../libgweather/weather.c:211 ../libgweather/weather.c:228
-#: ../libgweather/weather.c:300
+#: ../libgweather/weather.c:140 ../libgweather/weather.c:157
+#: ../libgweather/weather.c:229
 msgid "Invalid"
 msgstr "Недопустимый"
 
-#: ../libgweather/weather.c:217
+#: ../libgweather/weather.c:146
 msgid "Clear Sky"
 msgstr "Ясное небо"
 
-#: ../libgweather/weather.c:218
+#: ../libgweather/weather.c:147
 msgid "Broken clouds"
 msgstr "Облачно с прояснениями"
 
-#: ../libgweather/weather.c:219
+#: ../libgweather/weather.c:148
 msgid "Scattered clouds"
 msgstr "Рассеянные облака"
 
-#: ../libgweather/weather.c:220
+#: ../libgweather/weather.c:149
 msgid "Few clouds"
 msgstr "Незначительная облачность"
 
-#: ../libgweather/weather.c:221
+#: ../libgweather/weather.c:150
 msgid "Overcast"
 msgstr "Сплошная облачность"
 
@@ -144,373 +135,373 @@ msgstr "Сплошная облачность"
 #. * etc means, you can go to http://www.weather.com/glossary/ and
 #. * http://www.crh.noaa.gov/arx/wx.tbl.php
 #. NONE
-#: ../libgweather/weather.c:260 ../libgweather/weather.c:262
+#: ../libgweather/weather.c:189 ../libgweather/weather.c:191
 msgid "Thunderstorm"
 msgstr "Гроза"
 
 #. DRIZZLE
-#: ../libgweather/weather.c:261
+#: ../libgweather/weather.c:190
 msgid "Drizzle"
 msgstr "Моросящий дождь"
 
-#: ../libgweather/weather.c:261
+#: ../libgweather/weather.c:190
 msgid "Light drizzle"
 msgstr "Небольшой моросящий дождь"
 
-#: ../libgweather/weather.c:261
+#: ../libgweather/weather.c:190
 msgid "Moderate drizzle"
 msgstr "Умеренный моросящий дождь"
 
-#: ../libgweather/weather.c:261
+#: ../libgweather/weather.c:190
 msgid "Heavy drizzle"
 msgstr "Сильный моросящий дождь"
 
-#: ../libgweather/weather.c:261
+#: ../libgweather/weather.c:190
 msgid "Freezing drizzle"
 msgstr "Моросящий дождь с градом"
 
 #. RAIN
-#: ../libgweather/weather.c:262
+#: ../libgweather/weather.c:191
 msgid "Rain"
 msgstr "Дождь"
 
-#: ../libgweather/weather.c:262
+#: ../libgweather/weather.c:191
 msgid "Light rain"
 msgstr "Слабый дождь"
 
-#: ../libgweather/weather.c:262
+#: ../libgweather/weather.c:191
 msgid "Moderate rain"
 msgstr "Умеренный дождь"
 
-#: ../libgweather/weather.c:262
+#: ../libgweather/weather.c:191
 msgid "Heavy rain"
 msgstr "Сильный дождь"
 
-#: ../libgweather/weather.c:262
+#: ../libgweather/weather.c:191
 msgid "Rain showers"
 msgstr "Ливневый дождь"
 
-#: ../libgweather/weather.c:262
+#: ../libgweather/weather.c:191
 msgid "Freezing rain"
 msgstr "Дождь с градом"
 
 #. SNOW
-#: ../libgweather/weather.c:263
+#: ../libgweather/weather.c:192
 msgid "Snow"
 msgstr "Снег"
 
-#: ../libgweather/weather.c:263
+#: ../libgweather/weather.c:192
 msgid "Light snow"
 msgstr "Небольшой снег"
 
-#: ../libgweather/weather.c:263
+#: ../libgweather/weather.c:192
 msgid "Moderate snow"
 msgstr "Умеренный снег"
 
-#: ../libgweather/weather.c:263
+#: ../libgweather/weather.c:192
 msgid "Heavy snow"
 msgstr "Сильный снег"
 
-#: ../libgweather/weather.c:263
+#: ../libgweather/weather.c:192
 msgid "Snowstorm"
 msgstr "Метель"
 
-#: ../libgweather/weather.c:263
+#: ../libgweather/weather.c:192
 msgid "Blowing snowfall"
 msgstr "Снегопад"
 
-#: ../libgweather/weather.c:263
+#: ../libgweather/weather.c:192
 msgid "Snow showers"
 msgstr "Пурга"
 
-#: ../libgweather/weather.c:263
+#: ../libgweather/weather.c:192
 msgid "Drifting snow"
 msgstr "Снежные заносы"
 
 #. SNOW_GRAINS
-#: ../libgweather/weather.c:264
+#: ../libgweather/weather.c:193
 msgid "Snow grains"
 msgstr "Снежная крупа"
 
-#: ../libgweather/weather.c:264
+#: ../libgweather/weather.c:193
 msgid "Light snow grains"
 msgstr "Небольшая снежная крупа"
 
-#: ../libgweather/weather.c:264
+#: ../libgweather/weather.c:193
 msgid "Moderate snow grains"
 msgstr "Умеренная снежная крупа"
 
-#: ../libgweather/weather.c:264
+#: ../libgweather/weather.c:193
 msgid "Heavy snow grains"
 msgstr "Сильная снежная крупа"
 
 #. ICE_CRYSTALS
-#: ../libgweather/weather.c:265
+#: ../libgweather/weather.c:194
 msgid "Ice crystals"
 msgstr "Кристаллы льда"
 
 #. ICE_PELLETS
-#: ../libgweather/weather.c:266
+#: ../libgweather/weather.c:195
 msgid "Ice pellets"
 msgstr "Град"
 
-#: ../libgweather/weather.c:266
+#: ../libgweather/weather.c:195
 msgid "Few ice pellets"
 msgstr "Небольшой град"
 
-#: ../libgweather/weather.c:266
+#: ../libgweather/weather.c:195
 msgid "Moderate ice pellets"
 msgstr "Умеренный град"
 
-#: ../libgweather/weather.c:266
+#: ../libgweather/weather.c:195
 msgid "Heavy ice pellets"
 msgstr "Сильный град"
 
-#: ../libgweather/weather.c:266
+#: ../libgweather/weather.c:195
 msgid "Ice pellet storm"
 msgstr "Буря с градом"
 
-#: ../libgweather/weather.c:266
+#: ../libgweather/weather.c:195
 msgid "Showers of ice pellets"
 msgstr "Ливень с градом"
 
 #. HAIL
-#: ../libgweather/weather.c:267
+#: ../libgweather/weather.c:196
 msgid "Hail"
 msgstr "Град"
 
-#: ../libgweather/weather.c:267
+#: ../libgweather/weather.c:196
 msgid "Hailstorm"
 msgstr "Буря с градом"
 
-#: ../libgweather/weather.c:267
+#: ../libgweather/weather.c:196
 msgid "Hail showers"
 msgstr "Местами град"
 
 #. SMALL_HAIL
-#: ../libgweather/weather.c:268
+#: ../libgweather/weather.c:197
 msgid "Small hail"
 msgstr "Мелкий град"
 
-#: ../libgweather/weather.c:268
+#: ../libgweather/weather.c:197
 msgid "Small hailstorm"
 msgstr "Небольшая буря с градом"
 
-#: ../libgweather/weather.c:268
+#: ../libgweather/weather.c:197
 msgid "Showers of small hail"
 msgstr "Ливневый мелкий град"
 
 #. PRECIPITATION
-#: ../libgweather/weather.c:269
+#: ../libgweather/weather.c:198
 msgid "Unknown precipitation"
 msgstr "Неизвестные осадки"
 
 #. MIST
-#: ../libgweather/weather.c:270
+#: ../libgweather/weather.c:199
 msgid "Mist"
 msgstr "Приземный туман"
 
 #. FOG
-#: ../libgweather/weather.c:271
+#: ../libgweather/weather.c:200
 msgid "Fog"
 msgstr "Туман"
 
-#: ../libgweather/weather.c:271
+#: ../libgweather/weather.c:200
 msgid "Fog in the vicinity"
 msgstr "В окрестностях туман"
 
-#: ../libgweather/weather.c:271
+#: ../libgweather/weather.c:200
 msgid "Shallow fog"
 msgstr "Ливневый туман"
 
-#: ../libgweather/weather.c:271
+#: ../libgweather/weather.c:200
 msgid "Patches of fog"
 msgstr "Местами туман"
 
-#: ../libgweather/weather.c:271
+#: ../libgweather/weather.c:200
 msgid "Partial fog"
 msgstr "Временами туман"
 
-#: ../libgweather/weather.c:271
+#: ../libgweather/weather.c:200
 msgid "Freezing fog"
 msgstr "Замерзающий туман"
 
 #. SMOKE
-#: ../libgweather/weather.c:272
+#: ../libgweather/weather.c:201
 msgid "Smoke"
 msgstr "Дым"
 
 #. VOLCANIC_ASH
-#: ../libgweather/weather.c:273
+#: ../libgweather/weather.c:202
 msgid "Volcanic ash"
 msgstr "Вулканический пепел"
 
 #. SAND
-#: ../libgweather/weather.c:274
+#: ../libgweather/weather.c:203
 msgid "Sand"
 msgstr "Песчаная буря"
 
-#: ../libgweather/weather.c:274
+#: ../libgweather/weather.c:203
 msgid "Blowing sand"
 msgstr "Низовая песчаная буря"
 
-#: ../libgweather/weather.c:274
+#: ../libgweather/weather.c:203
 msgid "Drifting sand"
 msgstr "Песчаные заносы"
 
 #. HAZE
-#: ../libgweather/weather.c:275
+#: ../libgweather/weather.c:204
 msgid "Haze"
 msgstr "Пыльная мгла"
 
 #. SPRAY
-#: ../libgweather/weather.c:276
+#: ../libgweather/weather.c:205
 msgid "Blowing sprays"
 msgstr "Порывы ветра с пылью"
 
 #. DUST
-#: ../libgweather/weather.c:277
+#: ../libgweather/weather.c:206
 msgid "Dust"
 msgstr "Пыль"
 
-#: ../libgweather/weather.c:277
+#: ../libgweather/weather.c:206
 msgid "Blowing dust"
 msgstr "Пылевая буря"
 
-#: ../libgweather/weather.c:277
+#: ../libgweather/weather.c:206
 msgid "Drifting dust"
 msgstr "Пылевая буря"
 
 #. SQUALL
-#: ../libgweather/weather.c:278
+#: ../libgweather/weather.c:207
 msgid "Squall"
 msgstr "Шквал"
 
 #. SANDSTORM
-#: ../libgweather/weather.c:279
+#: ../libgweather/weather.c:208
 msgid "Sandstorm"
 msgstr "Песчаная буря"
 
-#: ../libgweather/weather.c:279
+#: ../libgweather/weather.c:208
 msgid "Sandstorm in the vicinity"
 msgstr "В окрестностях песчаная буря"
 
-#: ../libgweather/weather.c:279
+#: ../libgweather/weather.c:208
 msgid "Heavy sandstorm"
 msgstr "Сильная песчаная буря"
 
 #. DUSTSTORM
-#: ../libgweather/weather.c:280
+#: ../libgweather/weather.c:209
 msgid "Duststorm"
 msgstr "Пыльная буря"
 
-#: ../libgweather/weather.c:280
+#: ../libgweather/weather.c:209
 msgid "Duststorm in the vicinity"
 msgstr "В окрестностях пыльная буря"
 
-#: ../libgweather/weather.c:280
+#: ../libgweather/weather.c:209
 msgid "Heavy duststorm"
 msgstr "Сильная пыльная буря"
 
 #. FUNNEL_CLOUD
-#: ../libgweather/weather.c:281
+#: ../libgweather/weather.c:210
 msgid "Funnel cloud"
 msgstr "Смерч"
 
 #. TORNADO
-#: ../libgweather/weather.c:282
+#: ../libgweather/weather.c:211
 msgid "Tornado"
 msgstr "Торнадо"
 
 #. DUST_WHIRLS
-#: ../libgweather/weather.c:283
+#: ../libgweather/weather.c:212
 msgid "Dust whirls"
 msgstr "Пыльные вихри"
 
-#: ../libgweather/weather.c:283
+#: ../libgweather/weather.c:212
 msgid "Dust whirls in the vicinity"
 msgstr "В окрестностях пыльные вихри"
 
-#: ../libgweather/weather.c:612
+#: ../libgweather/weather.c:554
 msgid "%a, %b %d / %H:%M"
 msgstr "%a, %d %b / %H:%M"
 
-#: ../libgweather/weather.c:618
+#: ../libgweather/weather.c:560
 msgid "Unknown observation time"
 msgstr "Неизвестное время наблюдения"
 
-#: ../libgweather/weather.c:630 ../libgweather/weather.c:679
-#: ../libgweather/weather.c:694 ../libgweather/weather.c:710
-#: ../libgweather/weather.c:726 ../libgweather/weather.c:742
-#: ../libgweather/weather.c:759 ../libgweather/weather.c:779
-#: ../libgweather/weather.c:814 ../libgweather/weather.c:832
-#: ../libgweather/weather.c:861 ../libgweather/weather.c:893
-#: ../libgweather/weather.c:910 ../libgweather/weather.c:930
+#: ../libgweather/weather.c:572 ../libgweather/weather.c:621
+#: ../libgweather/weather.c:636 ../libgweather/weather.c:652
+#: ../libgweather/weather.c:668 ../libgweather/weather.c:684
+#: ../libgweather/weather.c:701 ../libgweather/weather.c:721
+#: ../libgweather/weather.c:751 ../libgweather/weather.c:769
+#: ../libgweather/weather.c:798 ../libgweather/weather.c:824
+#: ../libgweather/weather.c:841 ../libgweather/weather.c:858
 msgid "Unknown"
 msgstr "Неизвестно"
 
 #. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN)
-#: ../libgweather/weather.c:650
+#: ../libgweather/weather.c:592
 #, c-format
 msgid "%.1f °F"
 msgstr "%.1f °F"
 
 #. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN)
-#: ../libgweather/weather.c:653
+#: ../libgweather/weather.c:595
 #, c-format
 msgid "%d °F"
 msgstr "%d °F"
 
 #. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN)
-#: ../libgweather/weather.c:659
+#: ../libgweather/weather.c:601
 #, c-format
 msgid "%.1f °C"
 msgstr "%.1f °C"
 
 #. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN)
-#: ../libgweather/weather.c:662
+#: ../libgweather/weather.c:604
 #, c-format
 msgid "%d °C"
 msgstr "%d °C"
 
 #. TRANSLATOR: This is the temperature in kelvin
-#: ../libgweather/weather.c:668
+#: ../libgweather/weather.c:610
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
 #. TRANSLATOR: This is the temperature in kelvin
-#: ../libgweather/weather.c:671
+#: ../libgweather/weather.c:613
 #, c-format
 msgid "%d K"
 msgstr "%d K"
 
 #. TRANSLATOR: This is the humidity in percent
-#: ../libgweather/weather.c:762
+#: ../libgweather/weather.c:704
 #, c-format
 msgid "%.f%%"
 msgstr "%.f%%"
 
 #. TRANSLATOR: This is the wind speed in knots
-#: ../libgweather/weather.c:790
+#: ../libgweather/weather.c:732
 #, c-format
 msgid "%0.1f knots"
 msgstr "%0.1f узлов"
 
 #. TRANSLATOR: This is the wind speed in miles per hour
-#: ../libgweather/weather.c:794
+#: ../libgweather/weather.c:735
 #, c-format
 msgid "%.1f mph"
 msgstr "%.1f миль/ч"
 
 #. TRANSLATOR: This is the wind speed in kilometers per hour
-#: ../libgweather/weather.c:798
+#: ../libgweather/weather.c:738
 #, c-format
 msgid "%.1f km/h"
 msgstr "%.1f км/ч"
 
 #. TRANSLATOR: This is the wind speed in meters per second
-#: ../libgweather/weather.c:802
+#: ../libgweather/weather.c:741
 #, c-format
 msgid "%.1f m/s"
 msgstr "%.1f м/с"
@@ -518,88 +509,108 @@ msgstr "%.1f м/с"
 #. TRANSLATOR: This is the wind speed as a Beaufort force factor
 #. * (commonly used in nautical wind estimation).
 #.
-#: ../libgweather/weather.c:808
+#: ../libgweather/weather.c:746
 #, c-format
 msgid "Beaufort force %.1f"
 msgstr "%.1f баллов по шкале Бофорта"
 
-#: ../libgweather/weather.c:834
+#: ../libgweather/weather.c:771
 msgid "Calm"
 msgstr "Штиль"
 
 #. TRANSLATOR: This is 'wind direction' / 'wind speed'
-#: ../libgweather/weather.c:842
+#: ../libgweather/weather.c:779
 #, c-format
 msgid "%s / %s"
 msgstr "%s/%s"
 
 #. TRANSLATOR: This is pressure in inches of mercury
-#: ../libgweather/weather.c:866
+#: ../libgweather/weather.c:803
 #, c-format
 msgid "%.2f inHg"
 msgstr "%.2f дюймов рт. ст."
 
 #. TRANSLATOR: This is pressure in millimeters of mercury
-#: ../libgweather/weather.c:870
+#: ../libgweather/weather.c:806
 #, c-format
 msgid "%.1f mmHg"
 msgstr "%.2f мм рт. ст."
 
 #. TRANSLATOR: This is pressure in kiloPascals
-#: ../libgweather/weather.c:874
+#: ../libgweather/weather.c:809
 #, c-format
 msgid "%.2f kPa"
 msgstr "%.2f кПа"
 
 #. TRANSLATOR: This is pressure in hectoPascals
-#: ../libgweather/weather.c:878
+#: ../libgweather/weather.c:812
 #, c-format
 msgid "%.2f hPa"
 msgstr "%.2f гПа"
 
 #. TRANSLATOR: This is pressure in millibars
-#: ../libgweather/weather.c:882
+#: ../libgweather/weather.c:815
 #, c-format
 msgid "%.2f mb"
 msgstr "%.2f мбар"
 
 #. TRANSLATOR: This is pressure in atmospheres
-#: ../libgweather/weather.c:886
+#: ../libgweather/weather.c:818
 #, c-format
 msgid "%.3f atm"
 msgstr "%.3f атм"
 
 #. TRANSLATOR: This is the visibility in miles
-#: ../libgweather/weather.c:915
+#: ../libgweather/weather.c:846
 #, c-format
 msgid "%.1f miles"
 msgstr "%.1f миль"
 
 #. TRANSLATOR: This is the visibility in kilometers
-#: ../libgweather/weather.c:919
+#: ../libgweather/weather.c:849
 #, c-format
 msgid "%.1f km"
 msgstr "%.1f км"
 
 #. TRANSLATOR: This is the visibility in meters
-#: ../libgweather/weather.c:923
+#: ../libgweather/weather.c:852
 #, c-format
 msgid "%.0fm"
 msgstr "%.0f м"
 
-#: ../libgweather/weather.c:957 ../libgweather/weather.c:985
+#: ../libgweather/weather.c:882 ../libgweather/weather.c:907
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: ../libgweather/weather.c:1066
+#: ../libgweather/weather.c:1008
 msgid "Retrieval failed"
 msgstr "Произошёл сбой при получении"
 
-#: ../data/org.gnome.GWeather.gschema.xml.in.h:1
+#. Translators: %d is an error code, and %s the error string
+#: ../libgweather/weather-metar.c:523
+#, c-format
+msgid "Failed to get METAR data: %d %s.\n"
+msgstr "Не удалось получить данные METAR: %d %s.\n"
+
+#. The new (documented but not advertised) API is less strict in the
+#. format of the attribution, and just requires a generic CC-BY compatible
+#. attribution with a link to their service.
+#.
+#. That's very nice of them!
+#.
+#: ../libgweather/weather-yrno.c:416
+msgid ""
+"Weather data from the <a href=\"http://yr.no/\">Norwegian Meteorological "
+"Institute</a>"
+msgstr ""
+"Погодные данные из <a href=\"http://yr.no/\">Норвежского метеорологического "
+"института</a>"
+
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:1
 msgid "URL for the radar map"
 msgstr "Адрес для радарной карты"
 
-#: ../data/org.gnome.GWeather.gschema.xml.in.h:2
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:2
 msgid ""
 "The custom URL from where to retrieve a radar map, or empty for disabling "
 "radar maps."
@@ -609,15 +620,15 @@ msgstr ""
 
 #. TRANSLATORS: pick a temperature unit that should be used by default in your
 #. locale; values must be quoted
-#: ../data/org.gnome.GWeather.gschema.xml.in.h:5
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:5
 msgid "'fahrenheit'"
 msgstr "'centigrade'"
 
-#: ../data/org.gnome.GWeather.gschema.xml.in.h:6
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:6
 msgid "Temperature unit"
 msgstr "Единица измерения температуры"
 
-#: ../data/org.gnome.GWeather.gschema.xml.in.h:7
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:7
 msgid ""
 "The unit of temperature used for showing weather. Valid values are 'kelvin', "
 "'centigrade' and 'fahrenheit'."
@@ -627,15 +638,15 @@ msgstr ""
 
 #. TRANSLATORS: pick a default distance unit for your locale, see key description
 #. for valid values
-#: ../data/org.gnome.GWeather.gschema.xml.in.h:10
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:10
 msgid "'miles'"
 msgstr "'km'"
 
-#: ../data/org.gnome.GWeather.gschema.xml.in.h:11
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:11
 msgid "Distance unit"
 msgstr "Единица измерения расстояния"
 
-#: ../data/org.gnome.GWeather.gschema.xml.in.h:12
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:12
 msgid ""
 "The unit of distance used for showing weather (for example for visibility or "
 "for distance of important events). Valid values are 'meters', 'km' and "
@@ -647,15 +658,15 @@ msgstr ""
 
 #. TRANSLATORS: pick a default speed unit for your locale, see key description
 #. for valid values
-#: ../data/org.gnome.GWeather.gschema.xml.in.h:15
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:15
 msgid "'knots'"
 msgstr "'ms'"
 
-#: ../data/org.gnome.GWeather.gschema.xml.in.h:16
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:16
 msgid "Speed unit"
 msgstr "Единица измерения скорости"
 
-#: ../data/org.gnome.GWeather.gschema.xml.in.h:17
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:17
 msgid ""
 "The unit of speed used for showing weather (for example for wind speed). "
 "Valid values are 'ms' (meters per second), 'kph' (kilometers per hour), "
@@ -663,19 +674,20 @@ msgid ""
 msgstr ""
 "Единица измерения скорости, используемая для вывода погоды (например, "
 "скорость ветра). Возможные значения: «ms» (метров в секунду), "
-"«kph» (километров в час), «mph» (миль в час), «knots» и «bft» (шкала Бофорта)."
+"«kph» (километров в час), «mph» (миль в час), «knots» и «bft» (шкала "
+"Бофорта)."
 
 #. TRANSLATORS: pick a default pressure unit for your locale, see key description
 #. for valid values
-#: ../data/org.gnome.GWeather.gschema.xml.in.h:20
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:20
 msgid "'inch-hg'"
 msgstr "'mm-hg'"
 
-#: ../data/org.gnome.GWeather.gschema.xml.in.h:21
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:21
 msgid "Pressure unit"
 msgstr "Единица измерения давления"
 
-#: ../data/org.gnome.GWeather.gschema.xml.in.h:22
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:22
 msgid ""
 "The unit of pressure used for showing weather. Valid values are "
 "'kpa' (kilopascal), 'hpa' (hectopascal), 'mb' (millibar, mathematically "
@@ -688,18 +700,11 @@ msgstr ""
 "hg» (миллиметры ртутного столба), «inch-hg» (дюймы ртутного столба), "
 "«atm» (атмосферы)."
 
-#. TRANSLATORS: pick a default location to use in the weather applet. This should
-#. usually be the largest city or the capital of your country. If you're not picking
-#. a <location> in the database, don't forget to set name and coordinates.
-#: ../data/org.gnome.GWeather.gschema.xml.in.h:26
-msgid "('', 'KNYC', nothing)"
-msgstr "('', 'KNYC', ничего)"
-
-#: ../data/org.gnome.GWeather.gschema.xml.in.h:27
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:23
 msgid "Default location"
 msgstr "Расположение по умолчанию"
 
-#: ../data/org.gnome.GWeather.gschema.xml.in.h:28
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:24
 msgid ""
 "The default location for the weather applet. The first field is the name "
 "that will be shown. If empty, it will be taken from the locations database. "
@@ -718,6 +723,12 @@ msgstr ""
 "базы данных. Используется только вычислений восхода и фазы луны, а не для "
 "прогноза погоды."
 
+#~ msgid "WeatherInfo missing location"
+#~ msgstr "Отсутствует адрес WeatherInfo"
+
+#~ msgid "('', 'KNYC', nothing)"
+#~ msgstr "('', 'KNYC', ничего)"
+
 #~ msgid "DEFAULT_LOCATION"
 #~ msgstr "Москва - Шереметьево"