[libgweather] Updated Chinese (China) translation

From: Damned-Lies <translations src gnome org>
To: commits-list gnome org
Cc:
Subject: [libgweather] Updated Chinese (China) translation
Date: Sat, 8 Mar 2014 11:42:44 +0000 (UTC)
commit 253cb346efef9d052e40c0b71c9a6ca5dc0380b3
Author: Wylmer Wang <wantinghard gmail com>
Date:   Sat Mar 8 11:42:39 2014 +0000

    Updated Chinese (China) translation

 po/zh_CN.po |  307 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 168 insertions(+), 139 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ddb7bf4..25e9193 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,15 +10,16 @@
 # Ray Wang <wanglei1123 gmail com>, 2009.
 # Aron Xu <happyaron xu gmail com>, 2009, 2010.
 # Cheng Lu <chenglu1990 gmail com>, 2013.
+# Wylmer Wang <wantinghard gmail com>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: libgweather master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=libgweather&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-06-30 04:25+0000\n"
-"PO-Revision-Date: 2013-07-07 21:43+0800\n"
-"Last-Translator: Cheng Lu <chenglu1990 gmail com>\n"
+"POT-Creation-Date: 2014-03-08 10:43+0000\n"
+"PO-Revision-Date: 2014-03-08 19:40+0800\n"
+"Last-Translator: Wylmer Wang <wantinghard gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
@@ -43,109 +44,109 @@ msgstr "时区"
 msgid "GWeather"
 msgstr "GWeather"
 
-#: ../libgweather/gweather-timezone.c:316
+#: ../libgweather/gweather-timezone.c:340
 msgid "Greenwich Mean Time"
 msgstr "格林尼治标准时间(GMT)"
 
-#: ../libgweather/timezone-menu.c:276
+#: ../libgweather/timezone-menu.c:275
 msgctxt "timezone"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libgweather/weather.c:125
+#: ../libgweather/weather.c:114
 msgid "Variable"
 msgstr "变量"
 
-#: ../libgweather/weather.c:126
+#: ../libgweather/weather.c:115
 msgid "North"
 msgstr "北"
 
-#: ../libgweather/weather.c:126
+#: ../libgweather/weather.c:115
 msgid "North - NorthEast"
 msgstr "东北偏北"
 
-#: ../libgweather/weather.c:126
+#: ../libgweather/weather.c:115
 msgid "Northeast"
 msgstr "东北"
 
-#: ../libgweather/weather.c:126
+#: ../libgweather/weather.c:115
 msgid "East - NorthEast"
 msgstr "东北偏东"
 
-#: ../libgweather/weather.c:127
+#: ../libgweather/weather.c:116
 msgid "East"
 msgstr "东"
 
-#: ../libgweather/weather.c:127
+#: ../libgweather/weather.c:116
 msgid "East - Southeast"
 msgstr "东南偏东"
 
-#: ../libgweather/weather.c:127
+#: ../libgweather/weather.c:116
 msgid "Southeast"
 msgstr "东南"
 
-#: ../libgweather/weather.c:127
+#: ../libgweather/weather.c:116
 msgid "South - Southeast"
 msgstr "东南偏南"
 
-#: ../libgweather/weather.c:128
+#: ../libgweather/weather.c:117
 msgid "South"
 msgstr "南"
 
-#: ../libgweather/weather.c:128
+#: ../libgweather/weather.c:117
 msgid "South - Southwest"
 msgstr "西南偏南"
 
-#: ../libgweather/weather.c:128
+#: ../libgweather/weather.c:117
 msgid "Southwest"
 msgstr "西南"
 
-#: ../libgweather/weather.c:128
+#: ../libgweather/weather.c:117
 msgid "West - Southwest"
 msgstr "西南偏西"
 
-#: ../libgweather/weather.c:129
+#: ../libgweather/weather.c:118
 msgid "West"
 msgstr "西"
 
-#: ../libgweather/weather.c:129
+#: ../libgweather/weather.c:118
 msgid "West - Northwest"
 msgstr "西北偏西"
 
-#: ../libgweather/weather.c:129
+#: ../libgweather/weather.c:118
 msgid "Northwest"
 msgstr "西北"
 
-#: ../libgweather/weather.c:129
+#: ../libgweather/weather.c:118
 msgid "North - Northwest"
 msgstr "西北偏北"
 
-#: ../libgweather/weather.c:136
+#: ../libgweather/weather.c:125
 msgctxt "wind direction"
 msgid "Invalid"
 msgstr "无效"
 
-#: ../libgweather/weather.c:142
+#: ../libgweather/weather.c:131
 msgid "Clear Sky"
 msgstr "晴朗"
 
-#: ../libgweather/weather.c:143
+#: ../libgweather/weather.c:132
 msgid "Broken clouds"
 msgstr "碎云"
 
-#: ../libgweather/weather.c:144
+#: ../libgweather/weather.c:133
 msgid "Scattered clouds"
 msgstr "散云"
 
-#: ../libgweather/weather.c:145
+#: ../libgweather/weather.c:134
 msgid "Few clouds"
 msgstr "薄云"
 
-#: ../libgweather/weather.c:146
+#: ../libgweather/weather.c:135
 msgid "Overcast"
 msgstr "阴天"
 
-#: ../libgweather/weather.c:153 ../libgweather/weather.c:225
+#: ../libgweather/weather.c:142 ../libgweather/weather.c:214
 msgctxt "sky conditions"
 msgid "Invalid"
 msgstr "无效"
@@ -154,384 +155,395 @@ 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:185 ../libgweather/weather.c:187
+#: ../libgweather/weather.c:174 ../libgweather/weather.c:176
 msgid "Thunderstorm"
 msgstr "雷暴"
 
 #. DRIZZLE
-#: ../libgweather/weather.c:186
+#: ../libgweather/weather.c:175
 msgid "Drizzle"
 msgstr "细雨"
 
-#: ../libgweather/weather.c:186
+#: ../libgweather/weather.c:175
 msgid "Light drizzle"
 msgstr "小细雨"
 
-#: ../libgweather/weather.c:186
+#: ../libgweather/weather.c:175
 msgid "Moderate drizzle"
 msgstr "中细雨"
 
-#: ../libgweather/weather.c:186
+#: ../libgweather/weather.c:175
 msgid "Heavy drizzle"
 msgstr "大细雨"
 
-#: ../libgweather/weather.c:186
+#: ../libgweather/weather.c:175
 msgid "Freezing drizzle"
 msgstr "冻细雨"
 
 #. RAIN
-#: ../libgweather/weather.c:187
+#: ../libgweather/weather.c:176
 msgid "Rain"
 msgstr "雨"
 
-#: ../libgweather/weather.c:187
+#: ../libgweather/weather.c:176
 msgid "Light rain"
 msgstr "小雨"
 
-#: ../libgweather/weather.c:187
+#: ../libgweather/weather.c:176
 msgid "Moderate rain"
 msgstr "中雨"
 
-#: ../libgweather/weather.c:187
+#: ../libgweather/weather.c:176
 msgid "Heavy rain"
 msgstr "大雨"
 
-#: ../libgweather/weather.c:187
+#: ../libgweather/weather.c:176
 msgid "Rain showers"
 msgstr "阵雨"
 
-#: ../libgweather/weather.c:187
+#: ../libgweather/weather.c:176
 msgid "Freezing rain"
 msgstr "冻雨"
 
 #. SNOW
-#: ../libgweather/weather.c:188
+#: ../libgweather/weather.c:177
 msgid "Snow"
 msgstr "雪"
 
-#: ../libgweather/weather.c:188
+#: ../libgweather/weather.c:177
 msgid "Light snow"
 msgstr "小雪"
 
-#: ../libgweather/weather.c:188
+#: ../libgweather/weather.c:177
 msgid "Moderate snow"
 msgstr "中雪"
 
-#: ../libgweather/weather.c:188
+#: ../libgweather/weather.c:177
 msgid "Heavy snow"
 msgstr "大雪"
 
-#: ../libgweather/weather.c:188
+#: ../libgweather/weather.c:177
 msgid "Snowstorm"
 msgstr "暴雪"
 
-#: ../libgweather/weather.c:188
+#: ../libgweather/weather.c:177
 msgid "Blowing snowfall"
 msgstr "风雪"
 
-#: ../libgweather/weather.c:188
+#: ../libgweather/weather.c:177
 msgid "Snow showers"
 msgstr "阵雪"
 
-#: ../libgweather/weather.c:188
+#: ../libgweather/weather.c:177
 msgid "Drifting snow"
 msgstr "飘雪"
 
 #. SNOW_GRAINS
-#: ../libgweather/weather.c:189
+#: ../libgweather/weather.c:178
 msgid "Snow grains"
 msgstr "粒雪"
 
-#: ../libgweather/weather.c:189
+#: ../libgweather/weather.c:178
 msgid "Light snow grains"
 msgstr "小粒雪"
 
-#: ../libgweather/weather.c:189
+#: ../libgweather/weather.c:178
 msgid "Moderate snow grains"
 msgstr "中粒雪"
 
-#: ../libgweather/weather.c:189
+#: ../libgweather/weather.c:178
 msgid "Heavy snow grains"
 msgstr "大粒雪"
 
 #. ICE_CRYSTALS
-#: ../libgweather/weather.c:190
+#: ../libgweather/weather.c:179
 msgid "Ice crystals"
 msgstr "冰晶"
 
 #. ICE_PELLETS
-#: ../libgweather/weather.c:191
+#: ../libgweather/weather.c:180
 msgid "Sleet"
 msgstr "雨夹雪"
 
-#: ../libgweather/weather.c:191
+#: ../libgweather/weather.c:180
 msgid "Little sleet"
 msgstr "小雨夹雪"
 
-#: ../libgweather/weather.c:191
+#: ../libgweather/weather.c:180
 msgid "Moderate sleet"
 msgstr "中雨夹雪"
 
-#: ../libgweather/weather.c:191
+#: ../libgweather/weather.c:180
 msgid "Heavy sleet"
 msgstr "大雨夹雪"
 
-#: ../libgweather/weather.c:191
+#: ../libgweather/weather.c:180
 msgid "Sleet storm"
 msgstr "暴雨夹雪"
 
-#: ../libgweather/weather.c:191
+#: ../libgweather/weather.c:180
 msgid "Showers of sleet"
 msgstr "阵雨夹雪"
 
 #. HAIL
-#: ../libgweather/weather.c:192
+#: ../libgweather/weather.c:181
 msgid "Hail"
 msgstr "雹"
 
-#: ../libgweather/weather.c:192
+#: ../libgweather/weather.c:181
 msgid "Hailstorm"
 msgstr "雹暴"
 
-#: ../libgweather/weather.c:192
+#: ../libgweather/weather.c:181
 msgid "Hail showers"
 msgstr "阵雹"
 
 #. SMALL_HAIL
-#: ../libgweather/weather.c:193
+#: ../libgweather/weather.c:182
 msgid "Small hail"
 msgstr "小雹"
 
-#: ../libgweather/weather.c:193
+#: ../libgweather/weather.c:182
 msgid "Small hailstorm"
 msgstr "小雹暴"
 
-#: ../libgweather/weather.c:193
+#: ../libgweather/weather.c:182
 msgid "Showers of small hail"
 msgstr "小阵雹"
 
 #. PRECIPITATION
-#: ../libgweather/weather.c:194
+#: ../libgweather/weather.c:183
 msgid "Unknown precipitation"
 msgstr "未知预测"
 
 #. MIST
-#: ../libgweather/weather.c:195
+#: ../libgweather/weather.c:184
 msgid "Mist"
 msgstr "细雾"
 
 #. FOG
-#: ../libgweather/weather.c:196
+#: ../libgweather/weather.c:185
 msgid "Fog"
 msgstr "雾"
 
-#: ../libgweather/weather.c:196
+#: ../libgweather/weather.c:185
 msgid "Fog in the vicinity"
 msgstr "临近有雾"
 
-#: ../libgweather/weather.c:196
+#: ../libgweather/weather.c:185
 msgid "Shallow fog"
 msgstr "浅雾"
 
-#: ../libgweather/weather.c:196
+#: ../libgweather/weather.c:185
 msgid "Patches of fog"
 msgstr "局部地区有雾"
 
-#: ../libgweather/weather.c:196
+#: ../libgweather/weather.c:185
 msgid "Partial fog"
 msgstr "部分有雾"
 
-#: ../libgweather/weather.c:196
+#: ../libgweather/weather.c:185
 msgid "Freezing fog"
 msgstr "冻雾"
 
 #. SMOKE
-#: ../libgweather/weather.c:197
+#: ../libgweather/weather.c:186
 msgid "Smoke"
 msgstr "烟"
 
 #. VOLCANIC_ASH
-#: ../libgweather/weather.c:198
+#: ../libgweather/weather.c:187
 msgid "Volcanic ash"
 msgstr "火山灰"
 
 #. SAND
-#: ../libgweather/weather.c:199
+#: ../libgweather/weather.c:188
 msgid "Sand"
 msgstr "沙"
 
-#: ../libgweather/weather.c:199
+#: ../libgweather/weather.c:188
 msgid "Blowing sand"
 msgstr "高吹沙"
 
-#: ../libgweather/weather.c:199
+#: ../libgweather/weather.c:188
 msgid "Drifting sand"
 msgstr "流砂"
 
 #. HAZE
-#: ../libgweather/weather.c:200
+#: ../libgweather/weather.c:189
 msgid "Haze"
 msgstr "霾"
 
 #. SPRAY
-#: ../libgweather/weather.c:201
+#: ../libgweather/weather.c:190
 msgid "Blowing sprays"
 msgstr "有风冰雾"
 
 #. DUST
-#: ../libgweather/weather.c:202
+#: ../libgweather/weather.c:191
 msgid "Dust"
 msgstr "粉尘"
 
-#: ../libgweather/weather.c:202
+#: ../libgweather/weather.c:191
 msgid "Blowing dust"
 msgstr "有风粉尘"
 
-#: ../libgweather/weather.c:202
+#: ../libgweather/weather.c:191
 msgid "Drifting dust"
 msgstr "微风粉尘"
 
 #. SQUALL
-#: ../libgweather/weather.c:203
+#: ../libgweather/weather.c:192
 msgid "Squall"
 msgstr "暴风"
 
 #. SANDSTORM
-#: ../libgweather/weather.c:204
+#: ../libgweather/weather.c:193
 msgid "Sandstorm"
 msgstr "沙暴"
 
-#: ../libgweather/weather.c:204
+#: ../libgweather/weather.c:193
 msgid "Sandstorm in the vicinity"
 msgstr "临近有沙暴"
 
-#: ../libgweather/weather.c:204
+#: ../libgweather/weather.c:193
 msgid "Heavy sandstorm"
 msgstr "大沙暴"
 
 #. DUSTSTORM
-#: ../libgweather/weather.c:205
+#: ../libgweather/weather.c:194
 msgid "Duststorm"
 msgstr "尘暴"
 
-#: ../libgweather/weather.c:205
+#: ../libgweather/weather.c:194
 msgid "Duststorm in the vicinity"
 msgstr "临近有尘暴"
 
-#: ../libgweather/weather.c:205
+#: ../libgweather/weather.c:194
 msgid "Heavy duststorm"
 msgstr "大尘暴"
 
 #. FUNNEL_CLOUD
-#: ../libgweather/weather.c:206
+#: ../libgweather/weather.c:195
 msgid "Funnel cloud"
 msgstr "漏斗云"
 
 #. TORNADO
-#: ../libgweather/weather.c:207
+#: ../libgweather/weather.c:196
 msgid "Tornado"
 msgstr "龙卷风"
 
 #. DUST_WHIRLS
-#: ../libgweather/weather.c:208
+#: ../libgweather/weather.c:197
 msgid "Dust whirls"
 msgstr "尘卷风"
 
-#: ../libgweather/weather.c:208
+#: ../libgweather/weather.c:197
 msgid "Dust whirls in the vicinity"
 msgstr "邻近有尘卷风"
 
-#: ../libgweather/weather.c:656
+#: ../libgweather/weather.c:670
 msgid "%a, %b %d / %H∶%M"
 msgstr "%-m月%-d日%A %H:%M"
 
-#: ../libgweather/weather.c:662
+#: ../libgweather/weather.c:676
 msgid "Unknown observation time"
 msgstr "未知的观测时间"
 
-#: ../libgweather/weather.c:674
+#: ../libgweather/weather.c:688
 msgctxt "sky conditions"
 msgid "Unknown"
 msgstr "未知"
 
+#. Translate to the default units to use for presenting
+#. * lengths to the user. Translate to default:inch if you
+#. * want inches, otherwise translate to default:mm.
+#. * Do *not* translate it to "predefinito:mm", if it
+#. * it isn't default:mm or default:inch it will not work
+#.
+#: ../libgweather/weather.c:710
+#| msgid "Default"
+msgid "default:mm"
+msgstr "默认：毫米"
+
 #. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN)
-#: ../libgweather/weather.c:724
+#: ../libgweather/weather.c:755
 #, 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:727
+#: ../libgweather/weather.c:758
 #, 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:733
+#: ../libgweather/weather.c:764
 #, 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:736
+#: ../libgweather/weather.c:767
 #, c-format
 msgid "%d °C"
 msgstr "%d °C"
 
 #. TRANSLATOR: This is the temperature in kelvin
-#: ../libgweather/weather.c:742
+#: ../libgweather/weather.c:773
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
 #. TRANSLATOR: This is the temperature in kelvin
-#: ../libgweather/weather.c:745
+#: ../libgweather/weather.c:776
 #, c-format
 msgid "%d K"
 msgstr "%d K"
 
-#: ../libgweather/weather.c:768 ../libgweather/weather.c:784
-#: ../libgweather/weather.c:800 ../libgweather/weather.c:853
+#: ../libgweather/weather.c:799 ../libgweather/weather.c:815
+#: ../libgweather/weather.c:831 ../libgweather/weather.c:893
 msgctxt "temperature"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libgweather/weather.c:816
+#: ../libgweather/weather.c:853
 msgctxt "dew"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libgweather/weather.c:833
+#: ../libgweather/weather.c:873
 msgctxt "humidity"
 msgid "Unknown"
 msgstr "未知"
 
 #. TRANSLATOR: This is the humidity in percent
-#: ../libgweather/weather.c:836
+#: ../libgweather/weather.c:876
 #, c-format
 msgid "%.f%%"
 msgstr "%.f%%"
 
 #. TRANSLATOR: This is the wind speed in knots
-#: ../libgweather/weather.c:882
+#: ../libgweather/weather.c:922
 #, c-format
 msgid "%0.1f knots"
 msgstr "%0.1f 节"
 
 #. TRANSLATOR: This is the wind speed in miles per hour
-#: ../libgweather/weather.c:885
+#: ../libgweather/weather.c:925
 #, c-format
 msgid "%.1f mph"
 msgstr "%.1f 英里/小时"
 
 #. TRANSLATOR: This is the wind speed in kilometers per hour
-#: ../libgweather/weather.c:888
+#: ../libgweather/weather.c:928
 #, c-format
 msgid "%.1f km/h"
 msgstr "%.1f 千米/小时"
 
 #. TRANSLATOR: This is the wind speed in meters per second
-#: ../libgweather/weather.c:891
+#: ../libgweather/weather.c:931
 #, c-format
 msgid "%.1f m/s"
 msgstr "%.1f 米/秒"
@@ -539,95 +551,95 @@ msgstr "%.1f 米/秒"
 #. TRANSLATOR: This is the wind speed as a Beaufort force factor
 #. * (commonly used in nautical wind estimation).
 #.
-#: ../libgweather/weather.c:896
+#: ../libgweather/weather.c:936
 #, c-format
 msgid "Beaufort force %.1f"
 msgstr "蒲福级 %1.f"
 
-#: ../libgweather/weather.c:917
+#: ../libgweather/weather.c:957
 msgctxt "wind speed"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libgweather/weather.c:919
+#: ../libgweather/weather.c:959
 msgid "Calm"
 msgstr "平静"
 
 #. TRANSLATOR: This is 'wind direction' / 'wind speed'
-#: ../libgweather/weather.c:927
+#: ../libgweather/weather.c:967
 #, c-format
 msgid "%s / %s"
 msgstr "%s / %s"
 
-#: ../libgweather/weather.c:963
+#: ../libgweather/weather.c:1003
 msgctxt "pressure"
 msgid "Unknown"
 msgstr "未知"
 
 #. TRANSLATOR: This is pressure in inches of mercury
-#: ../libgweather/weather.c:969
+#: ../libgweather/weather.c:1009
 #, c-format
 msgid "%.2f inHg"
 msgstr "%.2f 英寸汞柱"
 
 #. TRANSLATOR: This is pressure in millimeters of mercury
-#: ../libgweather/weather.c:972
+#: ../libgweather/weather.c:1012
 #, c-format
 msgid "%.1f mmHg"
 msgstr "%.1f 毫米汞柱"
 
 #. TRANSLATOR: This is pressure in kiloPascals
-#: ../libgweather/weather.c:975
+#: ../libgweather/weather.c:1015
 #, c-format
 msgid "%.2f kPa"
 msgstr "%.2f 千帕"
 
 #. TRANSLATOR: This is pressure in hectoPascals
-#: ../libgweather/weather.c:978
+#: ../libgweather/weather.c:1018
 #, c-format
 msgid "%.2f hPa"
 msgstr "%.2f 百帕"
 
 #. TRANSLATOR: This is pressure in millibars
-#: ../libgweather/weather.c:981
+#: ../libgweather/weather.c:1021
 #, c-format
 msgid "%.2f mb"
 msgstr "%.2f 毫巴"
 
 #. TRANSLATOR: This is pressure in atmospheres
-#: ../libgweather/weather.c:984
+#: ../libgweather/weather.c:1024
 #, c-format
 msgid "%.3f atm"
 msgstr "%.3f 大气压"
 
-#: ../libgweather/weather.c:1022
+#: ../libgweather/weather.c:1062
 msgctxt "visibility"
 msgid "Unknown"
 msgstr "未知"
 
 #. TRANSLATOR: This is the visibility in miles
-#: ../libgweather/weather.c:1028
+#: ../libgweather/weather.c:1068
 #, c-format
 msgid "%.1f miles"
 msgstr "%.1f 英里"
 
 #. TRANSLATOR: This is the visibility in kilometers
-#: ../libgweather/weather.c:1031
+#: ../libgweather/weather.c:1071
 #, c-format
 msgid "%.1f km"
 msgstr "%.1f 千米"
 
 #. TRANSLATOR: This is the visibility in meters
-#: ../libgweather/weather.c:1034
+#: ../libgweather/weather.c:1074
 #, c-format
 msgid "%.0fm"
 msgstr "%.0f 米"
 
-#: ../libgweather/weather.c:1062 ../libgweather/weather.c:1087
+#: ../libgweather/weather.c:1102 ../libgweather/weather.c:1127
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: ../libgweather/weather.c:1188
+#: ../libgweather/weather.c:1221
 msgid "Retrieval failed"
 msgstr "获取失败"
 
@@ -637,11 +649,31 @@ msgstr "获取失败"
 msgid "Failed to get METAR data: %d %s.\n"
 msgstr "获取 METAR 数据失败：%d %s。\n"
 
-#: ../libgweather/weather-yrno.c:449
-#, c-format
+#: ../libgweather/weather-owm.c:385
+#| msgid ""
+#| "Weather data from the <a href=\"%s\">Norwegian Meteorological Institute</"
+#| "a>"
 msgid ""
-"Weather data from the <a href=\"%s\">Norwegian Meteorological Institute</a>"
-msgstr "天气数据来源于<a href=\"%s\">挪威气象研究所</a>"
+"Weather data from the <a href=\"http://openweathermap.org\";>Open Weather Map "
+"project</a>"
+msgstr "天气数据来源于<a href=\"http://openweathermap.org\";>Open Weather Map "
+"项目</a>"
+
+#. 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:445
+#| msgid ""
+#| "Weather data from the <a href=\"%s\">Norwegian Meteorological Institute</"
+#| "a>"
+msgid ""
+"Weather data from the <a href=\"http://yr.no/\";>Norwegian Meteorological "
+"Institute</a>"
+msgstr "天气数据来源于<a href=\"http://yr.no/\";>Norwegian Meteorological "
+"Institute</a>"
 
 #: ../schemas/org.gnome.GWeather.gschema.xml.h:1
 msgid "URL for the radar map"
@@ -768,9 +800,6 @@ msgstr ""
 #~ msgid "DEFAULT_COORDINATES"
 #~ msgstr "39-54N 116-28E"
 
-#~ msgid "Default"
-#~ msgstr "默认值"
-
 #~ msgid "K"
 #~ msgstr "K"
 
@@ -862,8 +891,8 @@ msgstr ""
 #~ msgstr "如果为 true，则从“radar”键中指定的位置取回雷达图。"
 
 #~ msgid ""
-#~ "Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-SS"
-#~ "[EW]."
+#~ "Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+#~ "SS[EW]."
 #~ msgstr "您所在位置的经纬度，格式为“度-分-秒[NS] 度-分-秒[EW]”"
 
 #~ msgid "Nearby city"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]