Author: minton
Date: 2015-12-07 20:18:22 +0100 (Mon, 07 Dec 2015)
New Revision: 95509
Modified:
trunk/lcn/zh_CN/po/zypp.zh_CN.po
Log:
Merged zypp.pot for zh_CN
Modified: trunk/lcn/zh_CN/po/zypp.zh_CN.po
===================================================================
--- trunk/lcn/zh_CN/po/zypp.zh_CN.po 2015-12-07 19:18:21 UTC (rev 95508)
+++ trunk/lcn/zh_CN/po/zypp.zh_CN.po 2015-12-07 19:18:22 UTC (rev 95509)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-23 01:13+0200\n"
+"POT-Creation-Date: 2015-11-16 12:34+0100\n"
"PO-Revision-Date: 2015-10-27 20:19+0800\n"
"Last-Translator: marguerite \n"
"Language-Team: Chinese \n"
@@ -22,7 +22,7 @@
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Lokalize 2.0\n"
-#: zypp/solver/detail/SATResolver.cc:1159
+#: zypp/solver/detail/SATResolver.cc:1080
msgid ""
"\n"
"uninstallable providers: "
@@ -35,57 +35,57 @@
msgid " SSL certificate problem, verify that the CA cert is OK for '%s'."
msgstr " SSL 证书问题,请校验 '%s' 的 CA 证书。"
-#: zypp/target/TargetImpl.cc:439
+#: zypp/target/TargetImpl.cc:453
msgid " executed"
msgstr " 已执行"
-#: zypp/target/TargetImpl.cc:461
+#: zypp/target/TargetImpl.cc:475
msgid " execution failed"
msgstr " 执行失败"
-#: zypp/target/TargetImpl.cc:588
+#: zypp/target/TargetImpl.cc:602
msgid " execution skipped while aborting"
msgstr " 执行在中止时被跳过"
#. translators: We may find the same script content in files with different names.
#. Only the first occurence is executed, subsequent ones are skipped. It's a one-line
#. message for a log file. Preferably start translation with "%s"
-#: zypp/target/TargetImpl.cc:578
+#: zypp/target/TargetImpl.cc:592
#, c-format, boost-format
msgid "%s already executed as %s)"
msgstr "%s 早已作为 %s 执行了)"
-#: zypp/solver/detail/SATResolver.cc:1101
+#: zypp/solver/detail/SATResolver.cc:1022
#, c-format, boost-format
msgid "%s conflicts with %s provided by %s"
msgstr "%s 与 %s 冲突,后者由 %s 提供"
-#: zypp/solver/detail/SATResolver.cc:1054
+#: zypp/solver/detail/SATResolver.cc:975
#, c-format, boost-format
msgid "%s does not belong to a distupgrade repository"
msgstr "%s 不属于发行版升级源"
-#: zypp/solver/detail/SATResolver.cc:1058
+#: zypp/solver/detail/SATResolver.cc:979
#, c-format, boost-format
msgid "%s has inferior architecture"
msgstr "%s 架构不对应"
-#: zypp/solver/detail/SATResolver.cc:1086
+#: zypp/solver/detail/SATResolver.cc:1007
#, c-format, boost-format
msgid "%s is not installable"
msgstr "%s 不可安装"
-#: zypp/solver/detail/SATResolver.cc:1082
+#: zypp/solver/detail/SATResolver.cc:1003
#, c-format, boost-format
msgid "%s is provided by the system and cannot be erased"
msgstr "%s 由系统提供,无法擦除"
-#: zypp/solver/detail/SATResolver.cc:1106
+#: zypp/solver/detail/SATResolver.cc:1027
#, c-format, boost-format
msgid "%s obsoletes %s provided by %s"
msgstr "%s 淘汰了 %s,后者由 %s 提供"
-#: zypp/solver/detail/SATResolver.cc:1147
+#: zypp/solver/detail/SATResolver.cc:1068
#, c-format, boost-format
msgid "%s requires %s, but this requirement cannot be provided"
msgstr "%s 依赖 %s,但无法提供此依赖"
@@ -101,31 +101,39 @@
msgstr "(未过期)"
#. translators: an annotation to a gpg keys expiry date
+#: zypp/PublicKey.cc:133
+#, fuzzy, c-format, boost-format
+#| msgid "(expires within 24h)"
+msgid "(expires in %d day)"
+msgid_plural "(expires in %d days)"
+msgstr[0] "(24 小时内过期)"
+
+#. translators: an annotation to a gpg keys expiry date
#: zypp/PublicKey.cc:129
msgid "(expires within 24h)"
msgstr "(24 小时内过期)"
#. language code: abk ab
-#: zypp/LanguageCode.cc:208
+#: zypp/LanguageCode.cc:163
msgid "Abkhazian"
msgstr "阿布哈兹语"
#. language code: ace
-#: zypp/LanguageCode.cc:210
+#: zypp/LanguageCode.cc:165
msgid "Achinese"
msgstr "亚齐语"
#. language code: ach
-#: zypp/LanguageCode.cc:212
+#: zypp/LanguageCode.cc:167
msgid "Acoli"
msgstr "阿乔利方言"
#. language code: ada
-#: zypp/LanguageCode.cc:214
+#: zypp/LanguageCode.cc:169
msgid "Adangme"
msgstr "阿当梅语"
-#: zypp/RepoManager.cc:1511
+#: zypp/RepoManager.cc:1541
#, c-format, boost-format
msgid "Adding repository '%s'"
msgstr "正在添加软件源 '%s'"
@@ -136,97 +144,97 @@
#. report additional rpm output in finish
#. TranslatorExplanation Text is followed by a ':' and the actual output.
-#: zypp/target/rpm/RpmDb.cc:2059 zypp/target/rpm/RpmDb.cc:2206
+#: zypp/target/rpm/RpmDb.cc:2057 zypp/target/rpm/RpmDb.cc:2203
msgid "Additional rpm output"
msgstr "额外的 RPM 输出"
#. language code: ady
-#: zypp/LanguageCode.cc:216
+#: zypp/LanguageCode.cc:171
msgid "Adyghe"
msgstr "阿地盖语"
#. language code: aar aa
-#: zypp/LanguageCode.cc:206
+#: zypp/LanguageCode.cc:161
msgid "Afar"
msgstr "阿法尔语"
#. :ARE:784:
-#: zypp/CountryCode.cc:204
+#: zypp/CountryCode.cc:160
msgid "Afghanistan"
msgstr "阿富汗"
#. language code: afh
-#: zypp/LanguageCode.cc:220
+#: zypp/LanguageCode.cc:175
msgid "Afrihili"
msgstr "阿弗里希利语"
#. language code: afr af
-#: zypp/LanguageCode.cc:222
+#: zypp/LanguageCode.cc:177
msgid "Afrikaans"
msgstr "南非荷兰语"
#. language code: afa
-#: zypp/LanguageCode.cc:218
+#: zypp/LanguageCode.cc:173
msgid "Afro-Asiatic (Other)"
msgstr "亚非诸语言 (其它)"
#. language code: ain
-#: zypp/LanguageCode.cc:224
+#: zypp/LanguageCode.cc:179
msgid "Ainu"
msgstr "阿伊努语"
#. language code: aka ak
-#: zypp/LanguageCode.cc:226
+#: zypp/LanguageCode.cc:181
msgid "Akan"
msgstr "阿坎语"
#. language code: akk
-#: zypp/LanguageCode.cc:228
+#: zypp/LanguageCode.cc:183
msgid "Akkadian"
msgstr "阿卡德语"
#. :ABW:533:
-#: zypp/CountryCode.cc:217
+#: zypp/CountryCode.cc:173
msgid "Aland Islands"
msgstr "奥兰群岛"
#. :AIA:660:
-#: zypp/CountryCode.cc:207
+#: zypp/CountryCode.cc:163
msgid "Albania"
msgstr "阿尔巴尼亚"
#. language code: alb sqi sq
-#: zypp/LanguageCode.cc:230 zypp/LanguageCode.cc:232
+#: zypp/LanguageCode.cc:185 zypp/LanguageCode.cc:187
msgid "Albanian"
msgstr "阿尔巴尼亚语"
#. language code: ale
-#: zypp/LanguageCode.cc:234
+#: zypp/LanguageCode.cc:189
msgid "Aleut"
msgstr "阿留申语"
#. :DOM:214:
-#: zypp/CountryCode.cc:261
+#: zypp/CountryCode.cc:217
msgid "Algeria"
msgstr "阿尔及利亚"
#. language code: alg
-#: zypp/LanguageCode.cc:236
+#: zypp/LanguageCode.cc:191
msgid "Algonquian Languages"
msgstr "阿冈昆语"
#. language code: tut
-#: zypp/LanguageCode.cc:1118
+#: zypp/LanguageCode.cc:1073
msgid "Altaic (Other)"
msgstr "阿尔泰语 (其它)"
#. :ARG:032:
-#: zypp/CountryCode.cc:213
+#: zypp/CountryCode.cc:169
msgid "American Samoa"
msgstr "美属萨摩亚"
#. language code: amh am
-#: zypp/LanguageCode.cc:240
+#: zypp/LanguageCode.cc:195
msgid "Amharic"
msgstr "阿姆哈拉语"
@@ -234,122 +242,122 @@
msgid "An additional customer contract is necessary for getting support."
msgstr "签署一份额外的客户合同后才能获得支持。"
-#: zypp/CountryCode.cc:202
+#: zypp/CountryCode.cc:158
msgid "Andorra"
msgstr "安道尔共和国"
#. :ANT:530:
-#: zypp/CountryCode.cc:210
+#: zypp/CountryCode.cc:166
msgid "Angola"
msgstr "安哥拉"
#. :ATG:028:
-#: zypp/CountryCode.cc:206
+#: zypp/CountryCode.cc:162
msgid "Anguilla"
msgstr "安圭拉岛"
#. :AGO:024:
-#: zypp/CountryCode.cc:211
+#: zypp/CountryCode.cc:167
msgid "Antarctica"
msgstr "南极洲"
#. :AFG:004:
-#: zypp/CountryCode.cc:205
+#: zypp/CountryCode.cc:161
msgid "Antigua and Barbuda"
msgstr "安提瓜岛和巴布达岛"
#. language code: apa
-#: zypp/LanguageCode.cc:244
+#: zypp/LanguageCode.cc:199
msgid "Apache Languages"
msgstr "阿帕切语"
#. language code: ara ar
-#: zypp/LanguageCode.cc:246
+#: zypp/LanguageCode.cc:201
msgid "Arabic"
msgstr "阿拉伯语"
#. language code: arg an
-#: zypp/LanguageCode.cc:250
+#: zypp/LanguageCode.cc:205
msgid "Aragonese"
msgstr "阿拉贡语"
#. language code: arc
-#: zypp/LanguageCode.cc:248
+#: zypp/LanguageCode.cc:203
msgid "Aramaic"
msgstr "亚拉姆语"
#. language code: arp
-#: zypp/LanguageCode.cc:258
+#: zypp/LanguageCode.cc:213
msgid "Arapaho"
msgstr "阿拉帕霍语"
#. language code: arn
-#: zypp/LanguageCode.cc:256
+#: zypp/LanguageCode.cc:211
msgid "Araucanian"
msgstr "阿劳干语"
#. language code: arw
-#: zypp/LanguageCode.cc:262
+#: zypp/LanguageCode.cc:217
msgid "Arawak"
msgstr "阿拉瓦克语"
#. :ATA:010:
-#: zypp/CountryCode.cc:212
+#: zypp/CountryCode.cc:168
msgid "Argentina"
msgstr "阿根廷"
#. :ALB:008:
-#: zypp/CountryCode.cc:208
+#: zypp/CountryCode.cc:164
msgid "Armenia"
msgstr "亚美尼亚"
#. language code: arm hye hy
-#: zypp/LanguageCode.cc:252 zypp/LanguageCode.cc:254
+#: zypp/LanguageCode.cc:207 zypp/LanguageCode.cc:209
msgid "Armenian"
msgstr "亚美尼亚语"
#. language code: art
-#: zypp/LanguageCode.cc:260
+#: zypp/LanguageCode.cc:215
msgid "Artificial (Other)"
msgstr "人工语言 (其它)"
#. :AUS:036:
-#: zypp/CountryCode.cc:216
+#: zypp/CountryCode.cc:172
msgid "Aruba"
msgstr "阿鲁巴岛"
#. language code: asm as
-#: zypp/LanguageCode.cc:264
+#: zypp/LanguageCode.cc:219
msgid "Assamese"
msgstr "阿萨姆语"
#. language code: ast
-#: zypp/LanguageCode.cc:266
+#: zypp/LanguageCode.cc:221
msgid "Asturian"
msgstr "阿斯图里亚斯语"
#. language code: ath
-#: zypp/LanguageCode.cc:268
+#: zypp/LanguageCode.cc:223
msgid "Athapascan Languages"
msgstr "阿撒巴斯卡语"
#. :AUT:040:
-#: zypp/CountryCode.cc:215
+#: zypp/CountryCode.cc:171
msgid "Australia"
msgstr "澳大利亚"
#. language code: aus
-#: zypp/LanguageCode.cc:270
+#: zypp/LanguageCode.cc:225
msgid "Australian Languages"
msgstr "澳洲语"
#. :ASM:016:
-#: zypp/CountryCode.cc:214
+#: zypp/CountryCode.cc:170
msgid "Austria"
msgstr "奥地利"
#. language code: map
-#: zypp/LanguageCode.cc:762
+#: zypp/LanguageCode.cc:717
msgid "Austronesian (Other)"
msgstr "新西兰南岛诸语言 (其它)"
@@ -360,32 +368,32 @@
msgstr "'%s' 需要认证"
#. language code: ava av
-#: zypp/LanguageCode.cc:272
+#: zypp/LanguageCode.cc:227
msgid "Avaric"
msgstr "阿法语"
#. language code: ave ae
-#: zypp/LanguageCode.cc:274
+#: zypp/LanguageCode.cc:229
msgid "Avestan"
msgstr "阿维斯陀语"
#. language code: awa
-#: zypp/LanguageCode.cc:276
+#: zypp/LanguageCode.cc:231
msgid "Awadhi"
msgstr "阿瓦乔语"
#. language code: aym ay
-#: zypp/LanguageCode.cc:278
+#: zypp/LanguageCode.cc:233
msgid "Aymara"
msgstr "艾马拉语"
#. :ALA:248:
-#: zypp/CountryCode.cc:218
+#: zypp/CountryCode.cc:174
msgid "Azerbaijan"
msgstr "阿塞拜疆"
#. language code: aze az
-#: zypp/LanguageCode.cc:280
+#: zypp/LanguageCode.cc:235
msgid "Azerbaijani"
msgstr "阿塞拜疆语"
@@ -399,272 +407,272 @@
msgstr "介质挂载点错误"
#. :BRA:076:
-#: zypp/CountryCode.cc:232
+#: zypp/CountryCode.cc:188
msgid "Bahamas"
msgstr "巴哈马群岛"
#. :BGR:100:
-#: zypp/CountryCode.cc:225
+#: zypp/CountryCode.cc:181
msgid "Bahrain"
msgstr "巴林"
#. language code: ban
-#: zypp/LanguageCode.cc:292
+#: zypp/LanguageCode.cc:247
msgid "Balinese"
msgstr "巴厘语"
#. language code: bat
-#: zypp/LanguageCode.cc:300
+#: zypp/LanguageCode.cc:255
msgid "Baltic (Other)"
msgstr "波罗的海诸语言 (其它)"
#. language code: bal
-#: zypp/LanguageCode.cc:288
+#: zypp/LanguageCode.cc:243
msgid "Baluchi"
msgstr "俾路支语"
#. language code: bam bm
-#: zypp/LanguageCode.cc:290
+#: zypp/LanguageCode.cc:245
msgid "Bambara"
msgstr "班巴拉语"
#. language code: bai
-#: zypp/LanguageCode.cc:284
+#: zypp/LanguageCode.cc:239
msgid "Bamileke Languages"
msgstr "巴米累克语"
#. language code: bad
-#: zypp/LanguageCode.cc:282
+#: zypp/LanguageCode.cc:237
msgid "Banda"
msgstr "班达语"
#. :BRB:052:
-#: zypp/CountryCode.cc:221
+#: zypp/CountryCode.cc:177
msgid "Bangladesh"
msgstr "孟加拉国"
#. language code: bnt
-#: zypp/LanguageCode.cc:324
+#: zypp/LanguageCode.cc:279
msgid "Bantu (Other)"
msgstr "班图语 (其它)"
#. :BIH:070:
-#: zypp/CountryCode.cc:220
+#: zypp/CountryCode.cc:176
msgid "Barbados"
msgstr "巴巴多斯岛"
#. language code: bas
-#: zypp/LanguageCode.cc:298
+#: zypp/LanguageCode.cc:253
msgid "Basa"
msgstr "巴萨语"
#. language code: bak ba
-#: zypp/LanguageCode.cc:286
+#: zypp/LanguageCode.cc:241
msgid "Bashkir"
msgstr "巴什基尔语"
#. language code: baq eus eu
-#: zypp/LanguageCode.cc:294 zypp/LanguageCode.cc:296
+#: zypp/LanguageCode.cc:249 zypp/LanguageCode.cc:251
msgid "Basque"
msgstr "巴斯克语"
#. language code: btk
-#: zypp/LanguageCode.cc:332
+#: zypp/LanguageCode.cc:287
msgid "Batak (Indonesia)"
msgstr "巴塔克语 (印度尼西亚)"
#. language code: bej
-#: zypp/LanguageCode.cc:302
+#: zypp/LanguageCode.cc:257
msgid "Beja"
msgstr "别札语"
#. :BWA:072:
-#: zypp/CountryCode.cc:236
+#: zypp/CountryCode.cc:192
msgid "Belarus"
msgstr "白俄罗斯"
#. language code: bel be
-#: zypp/LanguageCode.cc:304
+#: zypp/LanguageCode.cc:259
msgid "Belarusian"
msgstr "白俄罗斯语"
#. :BGD:050:
-#: zypp/CountryCode.cc:222
+#: zypp/CountryCode.cc:178
msgid "Belgium"
msgstr "比利时"
#. :BLR:112:
-#: zypp/CountryCode.cc:237
+#: zypp/CountryCode.cc:193
msgid "Belize"
msgstr "伯利兹城"
#. language code: bem
-#: zypp/LanguageCode.cc:306
+#: zypp/LanguageCode.cc:261
msgid "Bemba"
msgstr "别姆巴语"
#. language code: ben bn
-#: zypp/LanguageCode.cc:308
+#: zypp/LanguageCode.cc:263
msgid "Bengali"
msgstr "孟加拉语"
#. :BDI:108:
-#: zypp/CountryCode.cc:227
+#: zypp/CountryCode.cc:183
msgid "Benin"
msgstr "贝宁湾"
#. language code: ber
-#: zypp/LanguageCode.cc:310
+#: zypp/LanguageCode.cc:265
msgid "Berber (Other)"
msgstr "柏柏尔语 (其它)"
#. :BEN:204:
-#: zypp/CountryCode.cc:228
+#: zypp/CountryCode.cc:184
msgid "Bermuda"
msgstr "百慕大群岛"
#. language code: bho
-#: zypp/LanguageCode.cc:312
+#: zypp/LanguageCode.cc:267
msgid "Bhojpuri"
msgstr "博杰普尔语"
#. :BHS:044:
-#: zypp/CountryCode.cc:233
+#: zypp/CountryCode.cc:189
msgid "Bhutan"
msgstr "不丹"
#. language code: bih bh
-#: zypp/LanguageCode.cc:314
+#: zypp/LanguageCode.cc:269
msgid "Bihari"
msgstr "比哈里语"
#. language code: bik
-#: zypp/LanguageCode.cc:316
+#: zypp/LanguageCode.cc:271
msgid "Bikol"
msgstr "比口语"
#. language code: bin
-#: zypp/LanguageCode.cc:318
+#: zypp/LanguageCode.cc:273
msgid "Bini"
msgstr "比尼语"
#. language code: bis bi
-#: zypp/LanguageCode.cc:320
+#: zypp/LanguageCode.cc:275
msgid "Bislama"
msgstr "比利兹语"
#. language code: byn
-#: zypp/LanguageCode.cc:344
+#: zypp/LanguageCode.cc:299
msgid "Blin"
msgstr "布林语"
#. :BRN:096:
-#: zypp/CountryCode.cc:230
+#: zypp/CountryCode.cc:186
msgid "Bolivia"
msgstr "玻利维亚"
#. :AZE:031:
-#: zypp/CountryCode.cc:219
+#: zypp/CountryCode.cc:175
msgid "Bosnia and Herzegovina"
msgstr "波斯尼亚和黑塞哥维那"
#. language code: bos bs
-#: zypp/LanguageCode.cc:326
+#: zypp/LanguageCode.cc:281
msgid "Bosnian"
msgstr "波斯尼亚语"
#. :BVT:074:
-#: zypp/CountryCode.cc:235
+#: zypp/CountryCode.cc:191
msgid "Botswana"
msgstr "博茨瓦纳"
#. :BTN:064:
-#: zypp/CountryCode.cc:234
+#: zypp/CountryCode.cc:190
msgid "Bouvet Island"
msgstr "布维岛"
#. language code: bra
-#: zypp/LanguageCode.cc:328
+#: zypp/LanguageCode.cc:283
msgid "Braj"
msgstr "布拉杰语"
#. :BOL:068:
-#: zypp/CountryCode.cc:231
+#: zypp/CountryCode.cc:187
msgid "Brazil"
msgstr "巴西"
#. language code: bre br
-#: zypp/LanguageCode.cc:330
+#: zypp/LanguageCode.cc:285
msgid "Breton"
msgstr "布里多尼语"
#. :IND:356:
-#: zypp/CountryCode.cc:306
+#: zypp/CountryCode.cc:262
msgid "British Indian Ocean Territory"
msgstr "英属印度洋领地"
#. :VEN:862:
-#: zypp/CountryCode.cc:437
+#: zypp/CountryCode.cc:393
msgid "British Virgin Islands"
msgstr "英属维尔京群岛"
#. :BMU:060:
-#: zypp/CountryCode.cc:229
+#: zypp/CountryCode.cc:185
msgid "Brunei Darussalam"
msgstr "文莱达鲁萨兰国"
#. language code: bug
-#: zypp/LanguageCode.cc:336
+#: zypp/LanguageCode.cc:291
msgid "Buginese"
msgstr "布吉语"
-#: zypp/RepoManager.cc:1211
+#: zypp/RepoManager.cc:1212
#, c-format, boost-format
msgid "Building repository '%s' cache"
msgstr "正在构建软件源 '%s' 的缓存"
#. :BFA:854:
-#: zypp/CountryCode.cc:224
+#: zypp/CountryCode.cc:180
msgid "Bulgaria"
msgstr "保加利亚"
#. language code: bul bg
-#: zypp/LanguageCode.cc:338
+#: zypp/LanguageCode.cc:293
msgid "Bulgarian"
msgstr "保加利亚语"
#. language code: bua
-#: zypp/LanguageCode.cc:334
+#: zypp/LanguageCode.cc:289
msgid "Buriat"
msgstr "布利亚特语"
#. :BEL:056:
-#: zypp/CountryCode.cc:223
+#: zypp/CountryCode.cc:179
msgid "Burkina Faso"
msgstr "布基纳法索"
#. language code: bur mya my
-#: zypp/LanguageCode.cc:340 zypp/LanguageCode.cc:342
+#: zypp/LanguageCode.cc:295 zypp/LanguageCode.cc:297
msgid "Burmese"
msgstr "缅甸语"
#. :BHR:048:
-#: zypp/CountryCode.cc:226
+#: zypp/CountryCode.cc:182
msgid "Burundi"
msgstr "布隆迪"
#. language code: cad
-#: zypp/LanguageCode.cc:346
+#: zypp/LanguageCode.cc:301
msgid "Caddo"
msgstr "卡多语"
#. :KGZ:417:
-#: zypp/CountryCode.cc:317
+#: zypp/CountryCode.cc:273
msgid "Cambodia"
msgstr "柬埔寨"
#. :CHL:152:
-#: zypp/CountryCode.cc:247
+#: zypp/CountryCode.cc:203
msgid "Cameroon"
msgstr "喀麦隆"
@@ -691,22 +699,22 @@
msgid "Can't chroot to '%s' (%s)."
msgstr "无法 chroot 到 '%s' (%s)。"
-#: zypp/RepoManager.cc:1061 zypp/RepoManager.cc:1169 zypp/RepoManager.cc:1225
+#: zypp/RepoManager.cc:1062 zypp/RepoManager.cc:1170 zypp/RepoManager.cc:1226
#, c-format, boost-format
msgid "Can't create %s"
msgstr "无法创建 %s"
-#: zypp/RepoManager.cc:1231
+#: zypp/RepoManager.cc:1232
#, c-format, boost-format
msgid "Can't create cache at %s - no writing permissions."
msgstr "无法在 %s 创建缓存 - 无写入权限。"
-#: zypp/RepoManager.cc:1069
+#: zypp/RepoManager.cc:1070
msgid "Can't create metadata cache directory."
msgstr "无法创建元数据缓存文件夹。"
#. TranslatorExplanation '%s' is a filename
-#: zypp/RepoManager.cc:1688 zypp/RepoManager.cc:1885
+#: zypp/RepoManager.cc:1718 zypp/RepoManager.cc:1915
#, c-format, boost-format
msgid "Can't delete '%s'"
msgstr "无法删除 '%s'"
@@ -717,11 +725,11 @@
msgid "Can't exec '%s' (%s)."
msgstr "无法执行 '%s' (%s)。"
-#: zypp/RepoManager.cc:1676 zypp/RepoManager.cc:1752
+#: zypp/RepoManager.cc:1706 zypp/RepoManager.cc:1782
msgid "Can't figure out where the repo is stored."
msgstr "找不到软件源存储位置。"
-#: zypp/RepoManager.cc:1873 zypp/RepoManager.cc:2249
+#: zypp/RepoManager.cc:1903 zypp/RepoManager.cc:2336
msgid "Can't figure out where the service is stored."
msgstr "找不到服务存储位置。"
@@ -739,8 +747,8 @@
msgstr "无法初始化递归的 mutex"
#. TranslatorExplanation '%s' is a filename
-#: zypp/RepoManager.cc:651 zypp/RepoManager.cc:1550 zypp/RepoManager.cc:1632
-#: zypp/RepoManager.cc:1706 zypp/RepoManager.cc:1771 zypp/RepoManager.cc:1897
+#: zypp/RepoManager.cc:652 zypp/RepoManager.cc:1580 zypp/RepoManager.cc:1662
+#: zypp/RepoManager.cc:1736 zypp/RepoManager.cc:1801 zypp/RepoManager.cc:1927
#, c-format, boost-format
msgid "Can't open file '%s' for writing."
msgstr "无法打开并写入 '%s' 文件。"
@@ -774,7 +782,7 @@
msgstr "无法设置递归的 mutex 属性"
#. :BLZ:084:
-#: zypp/CountryCode.cc:238
+#: zypp/CountryCode.cc:194
msgid "Canada"
msgstr "加拿大"
@@ -808,164 +816,164 @@
msgstr "无法写入文件 '%s'。"
#. :CUB:192:
-#: zypp/CountryCode.cc:252
+#: zypp/CountryCode.cc:208
msgid "Cape Verde"
msgstr "佛得角"
#. language code: car
-#: zypp/LanguageCode.cc:350
+#: zypp/LanguageCode.cc:305
msgid "Carib"
msgstr "加勒比语"
#. language code: cat ca
-#: zypp/LanguageCode.cc:352
+#: zypp/LanguageCode.cc:307
msgid "Catalan"
msgstr "加泰罗尼亚语"
#. language code: cau
-#: zypp/LanguageCode.cc:354
+#: zypp/LanguageCode.cc:309
msgid "Caucasian (Other)"
msgstr "高加索语 (其它)"
#. :KWT:414:
-#: zypp/CountryCode.cc:324
+#: zypp/CountryCode.cc:280
msgid "Cayman Islands"
msgstr "开曼群岛"
#. language code: ceb
-#: zypp/LanguageCode.cc:356
+#: zypp/LanguageCode.cc:311
msgid "Cebuano"
msgstr "宿务语"
#. language code: cel
-#: zypp/LanguageCode.cc:358
+#: zypp/LanguageCode.cc:313
msgid "Celtic (Other)"
msgstr "塞尔特语(其它)"
#. :COD:180:
-#: zypp/CountryCode.cc:241
+#: zypp/CountryCode.cc:197
msgid "Central African Republic"
msgstr "中非共和国"
#. language code: cai
-#: zypp/LanguageCode.cc:348
+#: zypp/LanguageCode.cc:303
msgid "Central American Indian (Other)"
msgstr "中美洲印第安语 (其它)"
#. :TCA:796:
-#: zypp/CountryCode.cc:413
+#: zypp/CountryCode.cc:369
msgid "Chad"
msgstr "乍得湖"
#. language code: chg
-#: zypp/LanguageCode.cc:366
+#: zypp/LanguageCode.cc:321
msgid "Chagatai"
msgstr "查加语"
#. language code: cmc
-#: zypp/LanguageCode.cc:390
+#: zypp/LanguageCode.cc:345
msgid "Chamic Languages"
msgstr "查米克语"
#. language code: cha ch
-#: zypp/LanguageCode.cc:360
+#: zypp/LanguageCode.cc:315
msgid "Chamorro"
msgstr "查莫罗语"
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: zypp/target/rpm/RpmDb.cc:1850
+#: zypp/target/rpm/RpmDb.cc:1849
#, c-format, boost-format
msgid "Changed configuration files for %s:"
msgstr "%s 的有改动的配置文件:"
#. language code: che ce
-#: zypp/LanguageCode.cc:364
+#: zypp/LanguageCode.cc:319
msgid "Chechen"
msgstr "车臣语"
#. language code: chr
-#: zypp/LanguageCode.cc:382
+#: zypp/LanguageCode.cc:337
msgid "Cherokee"
msgstr "彻罗基语"
#. language code: chy
-#: zypp/LanguageCode.cc:388
+#: zypp/LanguageCode.cc:343
msgid "Cheyenne"
msgstr "夏延语"
#. language code: chb
-#: zypp/LanguageCode.cc:362
+#: zypp/LanguageCode.cc:317
msgid "Chibcha"
msgstr "契布卡语"
#. language code: nya ny
-#: zypp/LanguageCode.cc:864
+#: zypp/LanguageCode.cc:819
msgid "Chichewa"
msgstr "齐切瓦语"
#. :COK:184:
-#: zypp/CountryCode.cc:246
+#: zypp/CountryCode.cc:202
msgid "Chile"
msgstr "智利"
#. :CMR:120:
-#: zypp/CountryCode.cc:248
+#: zypp/CountryCode.cc:204
msgid "China"
msgstr "中国"
#. language code: chi zho zh
-#: zypp/LanguageCode.cc:368 zypp/LanguageCode.cc:370
+#: zypp/LanguageCode.cc:323 zypp/LanguageCode.cc:325
msgid "Chinese"
msgstr "中文"
#. language code: chn
-#: zypp/LanguageCode.cc:376
+#: zypp/LanguageCode.cc:331
msgid "Chinook Jargon"
msgstr "契努克语"
#. language code: chp
-#: zypp/LanguageCode.cc:380
+#: zypp/LanguageCode.cc:335
msgid "Chipewyan"
msgstr "奇帕维安语"
#. language code: cho
-#: zypp/LanguageCode.cc:378
+#: zypp/LanguageCode.cc:333
msgid "Choctaw"
msgstr "乔克托语"
#. :CPV:132:
-#: zypp/CountryCode.cc:253
+#: zypp/CountryCode.cc:209
msgid "Christmas Island"
msgstr "圣诞岛"
#. language code: chu cu
-#: zypp/LanguageCode.cc:384
+#: zypp/LanguageCode.cc:339
msgid "Church Slavic"
msgstr "宗教斯拉夫语"
#. language code: chk
-#: zypp/LanguageCode.cc:372
+#: zypp/LanguageCode.cc:327
msgid "Chuukese"
msgstr "楚克语"
#. language code: chv cv
-#: zypp/LanguageCode.cc:386
+#: zypp/LanguageCode.cc:341
msgid "Chuvash"
msgstr "楚瓦什语"
#. language code: nwc
-#: zypp/LanguageCode.cc:862
+#: zypp/LanguageCode.cc:817
msgid "Classical Newari"
msgstr "古典尼瓦尔语"
#. :CAN:124:
-#: zypp/CountryCode.cc:239
+#: zypp/CountryCode.cc:195
msgid "Cocos (Keeling) Islands"
msgstr "科科斯 (基林) 群岛"
#. :CHN:156:
-#: zypp/CountryCode.cc:249
+#: zypp/CountryCode.cc:205
msgid "Colombia"
msgstr "哥伦比亚"
@@ -984,7 +992,7 @@
msgstr "命令已被信号 %d (%s) 杀死。"
#. :KIR:296:
-#: zypp/CountryCode.cc:319
+#: zypp/CountryCode.cc:275
msgid "Comoros"
msgstr "科摩罗"
@@ -994,172 +1002,172 @@
#. :CCK:166:
#. :CAF:140:
-#: zypp/CountryCode.cc:240 zypp/CountryCode.cc:242
+#: zypp/CountryCode.cc:196 zypp/CountryCode.cc:198
msgid "Congo"
msgstr "刚果"
#. :CIV:384:
-#: zypp/CountryCode.cc:245
+#: zypp/CountryCode.cc:201
msgid "Cook Islands"
msgstr "库克群岛"
#. language code: cop
-#: zypp/LanguageCode.cc:392
+#: zypp/LanguageCode.cc:347
msgid "Coptic"
msgstr "科普特语"
#. language code: cor kw
-#: zypp/LanguageCode.cc:394
+#: zypp/LanguageCode.cc:349
msgid "Cornish"
msgstr "凯尔特语"
#. language code: cos co
-#: zypp/LanguageCode.cc:396
+#: zypp/LanguageCode.cc:351
msgid "Corsican"
msgstr "科西嘉语"
#. :COL:170:
-#: zypp/CountryCode.cc:250
+#: zypp/CountryCode.cc:206
msgid "Costa Rica"
msgstr "哥斯达黎加"
#. :CHE:756:
-#: zypp/CountryCode.cc:244
+#: zypp/CountryCode.cc:200
msgid "Cote D'Ivoire"
msgstr "科特迪瓦共和国"
#. language code: cre cr
-#: zypp/LanguageCode.cc:404
+#: zypp/LanguageCode.cc:359
msgid "Cree"
msgstr "克里族语"
#. language code: mus
-#: zypp/LanguageCode.cc:810
+#: zypp/LanguageCode.cc:765
msgid "Creek"
msgstr "克里克语"
#. language code: crp
-#: zypp/LanguageCode.cc:408
+#: zypp/LanguageCode.cc:363
msgid "Creoles and Pidgins (Other)"
msgstr "克里奥尔语和皮钦语 (其它)"
#. language code: cpe
-#: zypp/LanguageCode.cc:398
+#: zypp/LanguageCode.cc:353
msgid "Creoles and Pidgins, English-Based (Other)"
msgstr "基于英语的克里奥尔语和皮钦语 (其它)"
#. language code: cpf
-#: zypp/LanguageCode.cc:400
+#: zypp/LanguageCode.cc:355
msgid "Creoles and Pidgins, French-Based (Other)"
msgstr "基于法语的克里奥尔语和皮钦语 (其它)"
#. language code: cpp
-#: zypp/LanguageCode.cc:402
+#: zypp/LanguageCode.cc:357
msgid "Creoles and Pidgins, Portuguese-Based (Other)"
msgstr "基于葡萄牙语的克里奥尔语和皮钦语 (其它)"
#. language code: crh
-#: zypp/LanguageCode.cc:406
+#: zypp/LanguageCode.cc:361
msgid "Crimean Tatar"
msgstr "克里米亚鞑靼语"
#. :HND:340:
-#: zypp/CountryCode.cc:298
+#: zypp/CountryCode.cc:254
msgid "Croatia"
msgstr "克罗地亚"
#. language code: scr hrv hr
-#: zypp/LanguageCode.cc:976 zypp/LanguageCode.cc:978
+#: zypp/LanguageCode.cc:931 zypp/LanguageCode.cc:933
msgid "Croatian"
msgstr "克罗地亚语"
#. :CRI:188:
-#: zypp/CountryCode.cc:251
+#: zypp/CountryCode.cc:207
msgid "Cuba"
msgstr "古巴"
#. language code: cus
-#: zypp/LanguageCode.cc:412
+#: zypp/LanguageCode.cc:367
msgid "Cushitic (Other)"
msgstr "库希特语 (其它)"
#. :CXR:162:
-#: zypp/CountryCode.cc:254
+#: zypp/CountryCode.cc:210
msgid "Cyprus"
msgstr "塞浦路斯"
#. language code: cze ces cs
-#: zypp/LanguageCode.cc:414 zypp/LanguageCode.cc:416
+#: zypp/LanguageCode.cc:369 zypp/LanguageCode.cc:371
msgid "Czech"
msgstr "捷克语"
#. :CYP:196:
-#: zypp/CountryCode.cc:255
+#: zypp/CountryCode.cc:211
msgid "Czech Republic"
msgstr "捷克共和国"
#. language code: dak
-#: zypp/LanguageCode.cc:418
+#: zypp/LanguageCode.cc:373
msgid "Dakota"
msgstr "达科他语"
#. language code: dan da
-#: zypp/LanguageCode.cc:420
+#: zypp/LanguageCode.cc:375
msgid "Danish"
msgstr "丹麦语"
#. language code: dar
-#: zypp/LanguageCode.cc:422
+#: zypp/LanguageCode.cc:377
msgid "Dargwa"
msgstr "特拉华语"
#. language code: day
-#: zypp/LanguageCode.cc:424
+#: zypp/LanguageCode.cc:379
msgid "Dayak"
msgstr "达雅语"
#. language code: del
-#: zypp/LanguageCode.cc:426
+#: zypp/LanguageCode.cc:381
msgid "Delaware"
msgstr "特拉瓦印第安人语"
#. :DJI:262:
-#: zypp/CountryCode.cc:258
+#: zypp/CountryCode.cc:214
msgid "Denmark"
msgstr "丹麦"
#. language code: din
-#: zypp/LanguageCode.cc:432
+#: zypp/LanguageCode.cc:387
msgid "Dinka"
msgstr "丁卡语"
#. language code: div dv
-#: zypp/LanguageCode.cc:434
+#: zypp/LanguageCode.cc:389
msgid "Divehi"
msgstr "迪蔚希语"
#. :DEU:276:
-#: zypp/CountryCode.cc:257
+#: zypp/CountryCode.cc:213
msgid "Djibouti"
msgstr "吉布提"
#. language code: doi
-#: zypp/LanguageCode.cc:436
+#: zypp/LanguageCode.cc:391
msgid "Dogri"
msgstr "多格来语"
#. language code: dgr
-#: zypp/LanguageCode.cc:430
+#: zypp/LanguageCode.cc:385
msgid "Dogrib"
msgstr "多格里布语"
#. :DNK:208:
-#: zypp/CountryCode.cc:259
+#: zypp/CountryCode.cc:215
msgid "Dominica"
msgstr "多米尼加"
#. :DMA:212:
-#: zypp/CountryCode.cc:260
+#: zypp/CountryCode.cc:216
msgid "Dominican Republic"
msgstr "多米尼加共和国"
@@ -1181,12 +1189,12 @@
msgstr "下载(curl) '%s' 时初始化失败"
#. language code: dra
-#: zypp/LanguageCode.cc:438
+#: zypp/LanguageCode.cc:393
msgid "Dravidian (Other)"
msgstr "达罗毗荼语 (其它)"
#. language code: dua
-#: zypp/LanguageCode.cc:442
+#: zypp/LanguageCode.cc:397
msgid "Duala"
msgstr "都阿拉语"
@@ -1197,62 +1205,62 @@
msgstr "可疑类型 '%s',在 %u 字节,校验和 '%s'"
#. language code: dut nld nl
-#: zypp/LanguageCode.cc:446 zypp/LanguageCode.cc:448
+#: zypp/LanguageCode.cc:401 zypp/LanguageCode.cc:403
msgid "Dutch"
msgstr "荷兰语"
#. language code: dum
-#: zypp/LanguageCode.cc:444
+#: zypp/LanguageCode.cc:399
msgid "Dutch, Middle (ca.1050-1350)"
msgstr "中古荷兰语 (约 1050-1350)"
#. language code: dyu
-#: zypp/LanguageCode.cc:450
+#: zypp/LanguageCode.cc:405
msgid "Dyula"
msgstr "迪尤拉语"
#. language code: dzo dz
-#: zypp/LanguageCode.cc:452
+#: zypp/LanguageCode.cc:407
msgid "Dzongkha"
msgstr "不丹语"
#. :TON:776:
-#: zypp/CountryCode.cc:422
+#: zypp/CountryCode.cc:378
msgid "East Timor"
msgstr "东帝汶"
#. :DZA:012:
-#: zypp/CountryCode.cc:262
+#: zypp/CountryCode.cc:218
msgid "Ecuador"
msgstr "厄瓜多尔"
#. language code: efi
-#: zypp/LanguageCode.cc:454
+#: zypp/LanguageCode.cc:409
msgid "Efik"
msgstr "艾非克语"
#. :EST:233:
-#: zypp/CountryCode.cc:264
+#: zypp/CountryCode.cc:220
msgid "Egypt"
msgstr "埃及"
#. language code: egy
-#: zypp/LanguageCode.cc:456
+#: zypp/LanguageCode.cc:411
msgid "Egyptian (Ancient)"
msgstr "古埃及语"
#. language code: eka
-#: zypp/LanguageCode.cc:458
+#: zypp/LanguageCode.cc:413
msgid "Ekajuk"
msgstr "艾卡朱克语"
#. :STP:678:
-#: zypp/CountryCode.cc:409
+#: zypp/CountryCode.cc:365
msgid "El Salvador"
msgstr "萨尔瓦多"
#. language code: elx
-#: zypp/LanguageCode.cc:460
+#: zypp/LanguageCode.cc:415
msgid "Elamite"
msgstr "艾拉米特语"
@@ -1273,17 +1281,17 @@
msgstr "编码的字符串包含了一个 NUL 字节"
#. language code: eng en
-#: zypp/LanguageCode.cc:462
+#: zypp/LanguageCode.cc:417
msgid "English"
msgstr "英语"
#. language code: enm
-#: zypp/LanguageCode.cc:464
+#: zypp/LanguageCode.cc:419
msgid "English, Middle (1100-1500)"
msgstr "中古英语 (1100-1500)"
#. language code: ang
-#: zypp/LanguageCode.cc:242
+#: zypp/LanguageCode.cc:197
msgid "English, Old (ca.450-1100)"
msgstr "古代英语 (约 450-1100)"
@@ -1292,12 +1300,12 @@
msgstr "扩展"
#. :GLP:312:
-#: zypp/CountryCode.cc:288
+#: zypp/CountryCode.cc:244
msgid "Equatorial Guinea"
msgstr "赤道几内亚"
#. :ESH:732:
-#: zypp/CountryCode.cc:266
+#: zypp/CountryCode.cc:222
msgid "Eritrea"
msgstr "厄立特里亚"
@@ -1307,9 +1315,9 @@
msgid "Error occurred while setting download (curl) options for '%s':"
msgstr "为 '%s' 设置下载 (curl) 选项时出错:"
-#: zypp/target/TargetImpl.cc:643 zypp/target/TargetImpl.cc:663
-#: zypp/target/TargetImpl.cc:691 zypp/target/TargetImpl.cc:728
-#: zypp/target/TargetImpl.cc:736
+#: zypp/target/TargetImpl.cc:657 zypp/target/TargetImpl.cc:677
+#: zypp/target/TargetImpl.cc:705 zypp/target/TargetImpl.cc:742
+#: zypp/target/TargetImpl.cc:750
msgid "Error sending update message notification."
msgstr "发送更新消息通知出错。"
@@ -1319,47 +1327,47 @@
#. on ftp file-not-found(bnc #335906). Instead we'll check another types
#. before throwing.
#. TranslatorExplanation '%s' is an URL
-#: zypp/RepoManager.cc:1336 zypp/RepoManager.cc:2315
+#: zypp/RepoManager.cc:1344 zypp/RepoManager.cc:2402
#, c-format, boost-format
msgid "Error trying to read from '%s'"
msgstr "试图读取 '%s' 出错"
#. language code: myv
-#: zypp/LanguageCode.cc:818
+#: zypp/LanguageCode.cc:773
msgid "Erzya"
msgstr "厄尔兹亚语"
#. language code: epo eo
-#: zypp/LanguageCode.cc:466
+#: zypp/LanguageCode.cc:421
msgid "Esperanto"
msgstr "世界语"
#. :ECU:218:
-#: zypp/CountryCode.cc:263
+#: zypp/CountryCode.cc:219
msgid "Estonia"
msgstr "爱沙尼亚"
#. language code: est et
-#: zypp/LanguageCode.cc:468
+#: zypp/LanguageCode.cc:423
msgid "Estonian"
msgstr "爱沙尼亚语"
#. :ESP:724:
-#: zypp/CountryCode.cc:268
+#: zypp/CountryCode.cc:224
msgid "Ethiopia"
msgstr "埃塞俄比亚"
#. language code: ewe ee
-#: zypp/LanguageCode.cc:470
+#: zypp/LanguageCode.cc:425
msgid "Ewe"
msgstr "幽语"
#. language code: ewo
-#: zypp/LanguageCode.cc:472
+#: zypp/LanguageCode.cc:427
msgid "Ewondo"
msgstr "埃翁多语"
-#: zypp/RepoManager.cc:1295
+#: zypp/RepoManager.cc:1296
#, c-format, boost-format
msgid "Failed to cache repo (%d)."
msgstr "缓存软件源 (%d) 失败。"
@@ -1368,7 +1376,7 @@
msgid "Failed to delete key."
msgstr "删除密钥失败。"
-#: zypp/target/rpm/RpmDb.cc:1128
+#: zypp/target/rpm/RpmDb.cc:1127
#, c-format, boost-format
msgid "Failed to import public key from file %s: %s"
msgstr "从文件 %s 中导入公钥失败:%s"
@@ -1385,13 +1393,13 @@
msgstr "未能提供软件包 %s。您想要重试撷取吗?"
#. TranslatorExplanation '%s' is a pathname
-#: zypp/RepoManager.cc:235 zypp/RepoManager.cc:696 zypp/RepoManager.cc:1423
+#: zypp/RepoManager.cc:235 zypp/RepoManager.cc:697 zypp/RepoManager.cc:1453
#: zypp/repo/PluginServices.cc:49
#, c-format, boost-format
msgid "Failed to read directory '%s'"
msgstr "读取文件夹 '%s' 失败"
-#: zypp/target/rpm/RpmDb.cc:1199
+#: zypp/target/rpm/RpmDb.cc:1198
#, c-format, boost-format
msgid "Failed to remove public key %s: %s"
msgstr "移除公钥 %s 失败:%s"
@@ -1402,42 +1410,42 @@
msgstr "卸载 %s 失败"
#. :FJI:242:
-#: zypp/CountryCode.cc:271
+#: zypp/CountryCode.cc:227
msgid "Falkland Islands (Malvinas)"
msgstr "福克兰群岛 (马尔维纳斯群岛)"
#. language code: fan
-#: zypp/LanguageCode.cc:474
+#: zypp/LanguageCode.cc:429
msgid "Fang"
msgstr "芳语"
#. language code: fat
-#: zypp/LanguageCode.cc:478
+#: zypp/LanguageCode.cc:433
msgid "Fanti"
msgstr "芳蒂语"
#. :FSM:583:
-#: zypp/CountryCode.cc:273
+#: zypp/CountryCode.cc:229
msgid "Faroe Islands"
msgstr "法罗群岛"
#. language code: fao fo
-#: zypp/LanguageCode.cc:476
+#: zypp/LanguageCode.cc:431
msgid "Faroese"
msgstr "法罗语"
#. :FLK:238:
-#: zypp/CountryCode.cc:272
+#: zypp/CountryCode.cc:228
msgid "Federated States of Micronesia"
msgstr "密克罗尼西亚联邦"
#. :FIN:246:
-#: zypp/CountryCode.cc:270
+#: zypp/CountryCode.cc:226
msgid "Fiji"
msgstr "斐济"
#. language code: fij fj
-#: zypp/LanguageCode.cc:480
+#: zypp/LanguageCode.cc:435
msgid "Fijian"
msgstr "斐济语"
@@ -1601,27 +1609,27 @@
msgstr "文件 '%s' 未在介质 '%s' 上找到。"
#. translators: possible rpm package signature check result [brief]
-#: zypp/target/rpm/RpmDb.cc:2379
+#: zypp/target/rpm/RpmDb.cc:2376
msgid "File does not exist or signature can't be checked"
msgstr "文件不存在或无法检查其签名"
#. language code: fil
-#: zypp/LanguageCode.cc:482
+#: zypp/LanguageCode.cc:437
msgid "Filipino"
msgstr "菲律宾语"
#. :ETH:231:
-#: zypp/CountryCode.cc:269
+#: zypp/CountryCode.cc:225
msgid "Finland"
msgstr "芬兰"
#. language code: fin fi
-#: zypp/LanguageCode.cc:484
+#: zypp/LanguageCode.cc:439
msgid "Finnish"
msgstr "芬兰语"
#. language code: fiu
-#: zypp/LanguageCode.cc:486
+#: zypp/LanguageCode.cc:441
msgid "Finno-Ugrian (Other)"
msgstr "芬兰乌戈尔语 (其它)"
@@ -1630,261 +1638,261 @@
msgstr "将执行以下动作:"
#. language code: fon
-#: zypp/LanguageCode.cc:488
+#: zypp/LanguageCode.cc:443
msgid "Fon"
msgstr "丰语"
#. :FRO:234:
-#: zypp/CountryCode.cc:274
+#: zypp/CountryCode.cc:230
msgid "France"
msgstr "法国"
#. language code: fre fra fr
-#: zypp/LanguageCode.cc:490 zypp/LanguageCode.cc:492
+#: zypp/LanguageCode.cc:445 zypp/LanguageCode.cc:447
msgid "French"
msgstr "法语"
#. :GEO:268:
-#: zypp/CountryCode.cc:280
+#: zypp/CountryCode.cc:236
msgid "French Guiana"
msgstr "法属圭亚那"
#. :PER:604:
-#: zypp/CountryCode.cc:375
+#: zypp/CountryCode.cc:331
msgid "French Polynesia"
msgstr "法属波利尼西亚"
#. :TCD:148:
-#: zypp/CountryCode.cc:414
+#: zypp/CountryCode.cc:370
msgid "French Southern Territories"
msgstr "法属南部领土"
#. language code: frm
-#: zypp/LanguageCode.cc:494
+#: zypp/LanguageCode.cc:449
msgid "French, Middle (ca.1400-1600)"
msgstr "中古法语 (约 1050-1600)"
#. language code: fro
-#: zypp/LanguageCode.cc:496
+#: zypp/LanguageCode.cc:451
msgid "French, Old (842-ca.1400)"
msgstr "古法语 (842-约 1400)"
#. language code: fry fy
-#: zypp/LanguageCode.cc:498
+#: zypp/LanguageCode.cc:453
msgid "Frisian"
msgstr "弗里西语"
#. language code: fur
-#: zypp/LanguageCode.cc:502
+#: zypp/LanguageCode.cc:457
msgid "Friulian"
msgstr "弗留利语"
#. language code: ful ff
-#: zypp/LanguageCode.cc:500
+#: zypp/LanguageCode.cc:455
msgid "Fulah"
msgstr "富拉语"
#. language code: gaa
-#: zypp/LanguageCode.cc:504
+#: zypp/LanguageCode.cc:459
msgid "Ga"
msgstr "加语"
#. :FXX:249:
-#: zypp/CountryCode.cc:276
+#: zypp/CountryCode.cc:232
msgid "Gabon"
msgstr "加蓬"
#. language code: gla gd
-#: zypp/LanguageCode.cc:524
+#: zypp/LanguageCode.cc:479
msgid "Gaelic"
msgstr "盖尔语"
#. language code: glg gl
-#: zypp/LanguageCode.cc:528
+#: zypp/LanguageCode.cc:483
msgid "Galician"
msgstr "加利西亚语"
#. :GRL:304:
-#: zypp/CountryCode.cc:285
+#: zypp/CountryCode.cc:241
msgid "Gambia"
msgstr "冈比亚"
#. language code: lug lg
-#: zypp/LanguageCode.cc:730
+#: zypp/LanguageCode.cc:685
msgid "Ganda"
msgstr "干达语"
#. language code: gay
-#: zypp/LanguageCode.cc:506
+#: zypp/LanguageCode.cc:461
msgid "Gayo"
msgstr "卡约语"
#. language code: gba
-#: zypp/LanguageCode.cc:508
+#: zypp/LanguageCode.cc:463
msgid "Gbaya"
msgstr "巴亚语"
#. language code: gez
-#: zypp/LanguageCode.cc:520
+#: zypp/LanguageCode.cc:475
msgid "Geez"
msgstr "吉兹语"
#. :GRD:308:
-#: zypp/CountryCode.cc:279
+#: zypp/CountryCode.cc:235
msgid "Georgia"
msgstr "乔治亚州"
#. language code: geo kat ka
-#: zypp/LanguageCode.cc:512 zypp/LanguageCode.cc:514
+#: zypp/LanguageCode.cc:467 zypp/LanguageCode.cc:469
msgid "Georgian"
msgstr "乔治亚语"
#. language code: ger deu de
-#: zypp/LanguageCode.cc:516 zypp/LanguageCode.cc:518
+#: zypp/LanguageCode.cc:471 zypp/LanguageCode.cc:473
msgid "German"
msgstr "德语"
#. language code: gmh
-#: zypp/LanguageCode.cc:532
+#: zypp/LanguageCode.cc:487
msgid "German, Middle High (ca.1050-1500)"
msgstr "中古高地德语 (约 1050-1500)"
#. language code: goh
-#: zypp/LanguageCode.cc:534
+#: zypp/LanguageCode.cc:489
msgid "German, Old High (ca.750-1050)"
msgstr "古高地德语 (约 750-1050)"
#. language code: gem
-#: zypp/LanguageCode.cc:510
+#: zypp/LanguageCode.cc:465
msgid "Germanic (Other)"
msgstr "日尔曼语 (其它)"
#. :CZE:203:
-#: zypp/CountryCode.cc:256
+#: zypp/CountryCode.cc:212
msgid "Germany"
msgstr "德国"
-#: zypp/CountryCode.cc:282
+#: zypp/CountryCode.cc:238
msgid "Ghana"
msgstr "加纳"
#. :GHA:288:
-#: zypp/CountryCode.cc:283
+#: zypp/CountryCode.cc:239
msgid "Gibraltar"
msgstr "直布罗陀"
#. language code: gil
-#: zypp/LanguageCode.cc:522
+#: zypp/LanguageCode.cc:477
msgid "Gilbertese"
msgstr "吉尔伯特语"
#. language code: gon
-#: zypp/LanguageCode.cc:536
+#: zypp/LanguageCode.cc:491
msgid "Gondi"
msgstr "贡德语"
#. language code: gor
-#: zypp/LanguageCode.cc:538
+#: zypp/LanguageCode.cc:493
msgid "Gorontalo"
msgstr "哥伦打洛语"
#. language code: got
-#: zypp/LanguageCode.cc:540
+#: zypp/LanguageCode.cc:495
msgid "Gothic"
msgstr "哥特语"
#. language code: grb
-#: zypp/LanguageCode.cc:542
+#: zypp/LanguageCode.cc:497
msgid "Grebo"
msgstr "格列博语"
#. :GNQ:226:
-#: zypp/CountryCode.cc:289
+#: zypp/CountryCode.cc:245
msgid "Greece"
msgstr "希腊"
#. language code: grc
-#: zypp/LanguageCode.cc:544
+#: zypp/LanguageCode.cc:499
msgid "Greek, Ancient (to 1453)"
msgstr "古希腊语 (1453 以前)"
#. language code: gre ell el
-#: zypp/LanguageCode.cc:546 zypp/LanguageCode.cc:548
+#: zypp/LanguageCode.cc:501 zypp/LanguageCode.cc:503
msgid "Greek, Modern (1453-)"
msgstr "现代希腊语 (1453-)"
#. :GIB:292:
-#: zypp/CountryCode.cc:284
+#: zypp/CountryCode.cc:240
msgid "Greenland"
msgstr "格陵兰"
#. :GBR:826:
-#: zypp/CountryCode.cc:278
+#: zypp/CountryCode.cc:234
msgid "Grenada"
msgstr "格林纳达"
#. :GIN:324:
-#: zypp/CountryCode.cc:287
+#: zypp/CountryCode.cc:243
msgid "Guadeloupe"
msgstr "瓜德罗普岛"
#. :GTM:320:
-#: zypp/CountryCode.cc:292
+#: zypp/CountryCode.cc:248
msgid "Guam"
msgstr "关岛"
#. language code: grn gn
-#: zypp/LanguageCode.cc:550
+#: zypp/LanguageCode.cc:505
msgid "Guarani"
msgstr "瓜拉尼语"
#. :SGS:239:
-#: zypp/CountryCode.cc:291
+#: zypp/CountryCode.cc:247
msgid "Guatemala"
msgstr "危地马拉"
#. :GUF:254:
-#: zypp/CountryCode.cc:281
+#: zypp/CountryCode.cc:237
msgid "Guernsey"
msgstr "格恩西"
#. :GMB:270:
-#: zypp/CountryCode.cc:286
+#: zypp/CountryCode.cc:242
msgid "Guinea"
msgstr "几内亚"
#. :GUM:316:
-#: zypp/CountryCode.cc:293
+#: zypp/CountryCode.cc:249
msgid "Guinea-Bissau"
msgstr "几内亚比绍共和国"
#. language code: guj gu
-#: zypp/LanguageCode.cc:552
+#: zypp/LanguageCode.cc:507
msgid "Gujarati"
msgstr "印度古哈拉地语"
#. :GNB:624:
-#: zypp/CountryCode.cc:294
+#: zypp/CountryCode.cc:250
msgid "Guyana"
msgstr "圭亚那"
#. language code: gwi
-#: zypp/LanguageCode.cc:554
+#: zypp/LanguageCode.cc:509
msgid "Gwich'in"
msgstr "库臣语"
#. language code: hai
-#: zypp/LanguageCode.cc:556
+#: zypp/LanguageCode.cc:511
msgid "Haida"
msgstr "海达语"
#. :HRV:191:
-#: zypp/CountryCode.cc:299
+#: zypp/CountryCode.cc:255
msgid "Haiti"
msgstr "海地"
#. language code: hat ht
-#: zypp/LanguageCode.cc:558
+#: zypp/LanguageCode.cc:513
msgid "Haitian"
msgstr "海地语"
@@ -1906,52 +1914,51 @@
msgstr "HalVolume 未初始化"
#. language code: hau ha
-#: zypp/LanguageCode.cc:560
+#: zypp/LanguageCode.cc:515
msgid "Hausa"
msgstr "豪撒语"
-#: zypp/solver/detail/SATResolver.cc:1072
-#: zypp/solver/detail/SATResolver.cc:1076
+#: zypp/solver/detail/SATResolver.cc:993 zypp/solver/detail/SATResolver.cc:997
msgid "Have you enabled all requested repositories?"
msgstr "您启用了全部请求的软件源了吗?"
#. language code: haw
-#: zypp/LanguageCode.cc:562
+#: zypp/LanguageCode.cc:517
msgid "Hawaiian"
msgstr "夏威夷语"
#. :HKG:344:
-#: zypp/CountryCode.cc:296
+#: zypp/CountryCode.cc:252
msgid "Heard Island and McDonald Islands"
msgstr "赫德岛和麦克唐纳岛"
#. language code: heb he
-#: zypp/LanguageCode.cc:564
+#: zypp/LanguageCode.cc:519
msgid "Hebrew"
msgstr "希伯来语"
#. language code: her hz
-#: zypp/LanguageCode.cc:566
+#: zypp/LanguageCode.cc:521
msgid "Herero"
msgstr "赫雷罗语"
#. language code: hil
-#: zypp/LanguageCode.cc:568
+#: zypp/LanguageCode.cc:523
msgid "Hiligaynon"
msgstr "希利盖农语"
#. language code: him
-#: zypp/LanguageCode.cc:570
+#: zypp/LanguageCode.cc:525
msgid "Himachali"
msgstr "喜马偕尔语"
#. language code: hin hi
-#: zypp/LanguageCode.cc:572
+#: zypp/LanguageCode.cc:527
msgid "Hindi"
msgstr "北印度语"
#. language code: hmo ho
-#: zypp/LanguageCode.cc:578
+#: zypp/LanguageCode.cc:533
msgid "Hiri Motu"
msgstr "希里莫图语"
@@ -1961,137 +1968,137 @@
msgstr "历史:"
#. language code: hit
-#: zypp/LanguageCode.cc:574
+#: zypp/LanguageCode.cc:529
msgid "Hittite"
msgstr "赫梯语"
#. language code: hmn
-#: zypp/LanguageCode.cc:576
+#: zypp/LanguageCode.cc:531
msgid "Hmong"
msgstr "蒙 (苗) 语"
#. :UZB:860:
-#: zypp/CountryCode.cc:434
+#: zypp/CountryCode.cc:390
msgid "Holy See (Vatican City State)"
msgstr "梵蒂冈 (梵蒂冈城国)"
#. :HMD:334:
-#: zypp/CountryCode.cc:297
+#: zypp/CountryCode.cc:253
msgid "Honduras"
msgstr "洪都拉斯"
#. :GUY:328:
-#: zypp/CountryCode.cc:295
+#: zypp/CountryCode.cc:251
msgid "Hong Kong"
msgstr "中国香港特别行政区"
#. language code: hun hu
-#: zypp/LanguageCode.cc:582
+#: zypp/LanguageCode.cc:537
msgid "Hungarian"
msgstr "匈牙利语"
#. :HTI:332:
-#: zypp/CountryCode.cc:300
+#: zypp/CountryCode.cc:256
msgid "Hungary"
msgstr "匈牙利"
#. language code: hup
-#: zypp/LanguageCode.cc:584
+#: zypp/LanguageCode.cc:539
msgid "Hupa"
msgstr "胡帕语"
#. language code: iba
-#: zypp/LanguageCode.cc:586
+#: zypp/LanguageCode.cc:541
msgid "Iban"
msgstr "伊班语"
#. :IRN:364:
-#: zypp/CountryCode.cc:309
+#: zypp/CountryCode.cc:265
msgid "Iceland"
msgstr "冰岛"
#. language code: ice isl is
-#: zypp/LanguageCode.cc:590 zypp/LanguageCode.cc:592
+#: zypp/LanguageCode.cc:545 zypp/LanguageCode.cc:547
msgid "Icelandic"
msgstr "冰岛语"
#. language code: ido io
-#: zypp/LanguageCode.cc:594
+#: zypp/LanguageCode.cc:549
msgid "Ido"
msgstr "伊多语"
#. language code: ibo ig
-#: zypp/LanguageCode.cc:588
+#: zypp/LanguageCode.cc:543
msgid "Igbo"
msgstr "伊博语"
#. language code: ijo
-#: zypp/LanguageCode.cc:598
+#: zypp/LanguageCode.cc:553
msgid "Ijo"
msgstr "伊乔语"
#. language code: ilo
-#: zypp/LanguageCode.cc:604
+#: zypp/LanguageCode.cc:559
msgid "Iloko"
msgstr "伊洛卡诺语"
#. language code: smn
-#: zypp/LanguageCode.cc:1014
+#: zypp/LanguageCode.cc:969
msgid "Inari Sami"
msgstr "伊纳里萨摩斯语"
-#: zypp/CountryCode.cc:305
+#: zypp/CountryCode.cc:261
msgid "India"
msgstr "印度"
#. language code: inc
-#: zypp/LanguageCode.cc:608
+#: zypp/LanguageCode.cc:563
msgid "Indic (Other)"
msgstr "印度语 (其它)"
#. language code: ine
-#: zypp/LanguageCode.cc:612
+#: zypp/LanguageCode.cc:567
msgid "Indo-European (Other)"
msgstr "印欧诸语言 (其它)"
#. :HUN:348:
-#: zypp/CountryCode.cc:301
+#: zypp/CountryCode.cc:257
msgid "Indonesia"
msgstr "印度尼西亚"
#. language code: ind id
-#: zypp/LanguageCode.cc:610
+#: zypp/LanguageCode.cc:565
msgid "Indonesian"
msgstr "印度尼西亚语"
#. language code: inh
-#: zypp/LanguageCode.cc:614
+#: zypp/LanguageCode.cc:569
msgid "Ingush"
msgstr "英古什语"
-#: zypp/target/TargetImpl.cc:1372 zypp/target/TargetImpl.cc:1441
-#: zypp/target/TargetImpl.cc:1770
+#: zypp/target/TargetImpl.cc:1377 zypp/target/TargetImpl.cc:1446
+#: zypp/target/TargetImpl.cc:1798
#: zypp/target/TargetImpl.commitFindFileConflicts.cc:166
msgid "Installation has been aborted as directed."
msgstr "安装已按指示中止。"
#. language code: ina ia
-#: zypp/LanguageCode.cc:606
+#: zypp/LanguageCode.cc:561
msgid "Interlingua (International Auxiliary Language Association)"
msgstr "国际语 (国际辅助语协会)"
#. language code: ile ie
-#: zypp/LanguageCode.cc:602
+#: zypp/LanguageCode.cc:557
msgid "Interlingue"
msgstr "国际语"
#. language code: iku iu
-#: zypp/LanguageCode.cc:600
+#: zypp/LanguageCode.cc:555
msgid "Inuktitut"
msgstr "伊努伊特语"
#. language code: ipk ik
-#: zypp/LanguageCode.cc:616
+#: zypp/LanguageCode.cc:571
msgid "Inupiaq"
msgstr "依努皮亚语"
@@ -2145,373 +2152,373 @@
msgid "Invalid port component '%s'"
msgstr "无效的端口组件 '%s'"
-#: zypp/base/StrMatcher.cc:157
+#: zypp/base/StrMatcher.cc:158
#, c-format, boost-format
msgid "Invalid regular expression '%s'"
msgstr "无效的正则表达式 '%s'"
-#: zypp/base/StrMatcher.cc:156
+#: zypp/base/StrMatcher.cc:157
#, c-format, boost-format
msgid "Invalid regular expression '%s': regcomp returned %d"
msgstr "无效的正则表达式 '%s':regcomp 返回 %d"
#. TranslatorExplanation '%s' is an URL
-#: zypp/RepoManager.cc:1618
+#: zypp/RepoManager.cc:1648
#, c-format, boost-format
msgid "Invalid repo file name at '%s'"
msgstr "无效的源文件名于 '%s'"
#. :IRQ:368:
-#: zypp/CountryCode.cc:308
+#: zypp/CountryCode.cc:264
msgid "Iran"
msgstr "伊朗"
#. language code: ira
-#: zypp/LanguageCode.cc:618
+#: zypp/LanguageCode.cc:573
msgid "Iranian (Other)"
msgstr "伊朗语 (其它)"
#. :IOT:086:
-#: zypp/CountryCode.cc:307
+#: zypp/CountryCode.cc:263
msgid "Iraq"
msgstr "伊拉克"
#. :IDN:360:
-#: zypp/CountryCode.cc:302
+#: zypp/CountryCode.cc:258
msgid "Ireland"
msgstr "爱尔兰"
#. language code: gle ga
-#: zypp/LanguageCode.cc:526
+#: zypp/LanguageCode.cc:481
msgid "Irish"
msgstr "爱尔兰语"
#. language code: mga
-#: zypp/LanguageCode.cc:778
+#: zypp/LanguageCode.cc:733
msgid "Irish, Middle (900-1200)"
msgstr "中古爱尔兰语 (900-1200)"
#. language code: sga
-#: zypp/LanguageCode.cc:984
+#: zypp/LanguageCode.cc:939
msgid "Irish, Old (to 900)"
msgstr "古爱尔兰语 (900 以前)"
#. language code: iro
-#: zypp/LanguageCode.cc:620
+#: zypp/LanguageCode.cc:575
msgid "Iroquoian Languages"
msgstr "易洛魁语"
#. :ISR:376:
-#: zypp/CountryCode.cc:304
+#: zypp/CountryCode.cc:260
msgid "Isle of Man"
msgstr "马恩岛"
#. :IRL:372:
-#: zypp/CountryCode.cc:303
+#: zypp/CountryCode.cc:259
msgid "Israel"
msgstr "以色列"
#. language code: ita it
-#: zypp/LanguageCode.cc:622
+#: zypp/LanguageCode.cc:577
msgid "Italian"
msgstr "意大利语"
#. :ISL:352:
-#: zypp/CountryCode.cc:310
+#: zypp/CountryCode.cc:266
msgid "Italy"
msgstr "意大利"
-#: zypp/CountryCode.cc:312
+#: zypp/CountryCode.cc:268
msgid "Jamaica"
msgstr "牙买加"
#. :JOR:400:
-#: zypp/CountryCode.cc:314
+#: zypp/CountryCode.cc:270
msgid "Japan"
msgstr "日本"
#. language code: jpn ja
-#: zypp/LanguageCode.cc:628
+#: zypp/LanguageCode.cc:583
msgid "Japanese"
msgstr "日语"
#. language code: jav jv
-#: zypp/LanguageCode.cc:624
+#: zypp/LanguageCode.cc:579
msgid "Javanese"
msgstr "爪哇语"
#. :ITA:380:
-#: zypp/CountryCode.cc:311
+#: zypp/CountryCode.cc:267
msgid "Jersey"
msgstr "新泽西州"
#. :JAM:388:
-#: zypp/CountryCode.cc:313
+#: zypp/CountryCode.cc:269
msgid "Jordan"
msgstr "约旦"
#. language code: jrb
-#: zypp/LanguageCode.cc:632
+#: zypp/LanguageCode.cc:587
msgid "Judeo-Arabic"
msgstr "犹太-阿拉伯语"
#. language code: jpr
-#: zypp/LanguageCode.cc:630
+#: zypp/LanguageCode.cc:585
msgid "Judeo-Persian"
msgstr "犹太-波斯语"
#. language code: kbd
-#: zypp/LanguageCode.cc:656
+#: zypp/LanguageCode.cc:611
msgid "Kabardian"
msgstr "卡巴尔德语"
#. language code: kab
-#: zypp/LanguageCode.cc:636
+#: zypp/LanguageCode.cc:591
msgid "Kabyle"
msgstr "卡比尔语"
#. language code: kac
-#: zypp/LanguageCode.cc:638
+#: zypp/LanguageCode.cc:593
msgid "Kachin"
msgstr "克钦语"
#. language code: kal kl
-#: zypp/LanguageCode.cc:640
+#: zypp/LanguageCode.cc:595
msgid "Kalaallisut"
msgstr "格陵兰语"
#. language code: xal
-#: zypp/LanguageCode.cc:1170
+#: zypp/LanguageCode.cc:1125
msgid "Kalmyk"
msgstr "卡尔梅克语"
#. language code: kam
-#: zypp/LanguageCode.cc:642
+#: zypp/LanguageCode.cc:597
msgid "Kamba"
msgstr "坎巴语"
#. language code: kan kn
-#: zypp/LanguageCode.cc:644
+#: zypp/LanguageCode.cc:599
msgid "Kannada"
msgstr "加拿大语"
#. language code: kau kr
-#: zypp/LanguageCode.cc:650
+#: zypp/LanguageCode.cc:605
msgid "Kanuri"
msgstr "卡努里语"
#. language code: kaa
-#: zypp/LanguageCode.cc:634
+#: zypp/LanguageCode.cc:589
msgid "Kara-Kalpak"
msgstr "卡拉卡尔帕克语"
#. language code: krc
-#: zypp/LanguageCode.cc:686
+#: zypp/LanguageCode.cc:641
msgid "Karachay-Balkar"
msgstr "卡拉恰伊-巴尔卡尔语"
#. language code: kar
-#: zypp/LanguageCode.cc:646
+#: zypp/LanguageCode.cc:601
msgid "Karen"
msgstr "克伦语"
#. language code: kas ks
-#: zypp/LanguageCode.cc:648
+#: zypp/LanguageCode.cc:603
msgid "Kashmiri"
msgstr "克什米尔语"
#. language code: csb
-#: zypp/LanguageCode.cc:410
+#: zypp/LanguageCode.cc:365
msgid "Kashubian"
msgstr "卡舒比语"
#. language code: kaw
-#: zypp/LanguageCode.cc:652
+#: zypp/LanguageCode.cc:607
msgid "Kawi"
msgstr "卡威语"
#. language code: kaz kk
-#: zypp/LanguageCode.cc:654
+#: zypp/LanguageCode.cc:609
msgid "Kazakh"
msgstr "哈萨克语"
#. :CYM:136:
-#: zypp/CountryCode.cc:325
+#: zypp/CountryCode.cc:281
msgid "Kazakhstan"
msgstr "哈萨克斯坦"
#. :JPN:392:
-#: zypp/CountryCode.cc:315
+#: zypp/CountryCode.cc:271
msgid "Kenya"
msgstr "肯尼亚"
#. language code: kha
-#: zypp/LanguageCode.cc:658
+#: zypp/LanguageCode.cc:613
msgid "Khasi"
msgstr "卡西语"
#. language code: khm km
-#: zypp/LanguageCode.cc:662
+#: zypp/LanguageCode.cc:617
msgid "Khmer"
msgstr "高棉语"
#. language code: khi
-#: zypp/LanguageCode.cc:660
+#: zypp/LanguageCode.cc:615
msgid "Khoisan (Other)"
msgstr "科伊桑语 (其它)"
#. language code: kho
-#: zypp/LanguageCode.cc:664
+#: zypp/LanguageCode.cc:619
msgid "Khotanese"
msgstr "和阗(和田)语"
#. language code: kik ki
-#: zypp/LanguageCode.cc:666
+#: zypp/LanguageCode.cc:621
msgid "Kikuyu"
msgstr "基库尤语"
#. language code: kmb
-#: zypp/LanguageCode.cc:672
+#: zypp/LanguageCode.cc:627
msgid "Kimbundu"
msgstr "金本杜语"
#. language code: kin rw
-#: zypp/LanguageCode.cc:668
+#: zypp/LanguageCode.cc:623
msgid "Kinyarwanda"
msgstr "加泰隆语"
#. language code: kir ky
-#: zypp/LanguageCode.cc:670
+#: zypp/LanguageCode.cc:625
msgid "Kirghiz"
msgstr "吉尔吉斯语"
#. :KHM:116:
-#: zypp/CountryCode.cc:318
+#: zypp/CountryCode.cc:274
msgid "Kiribati"
msgstr "基里巴斯"
#. language code: tlh
-#: zypp/LanguageCode.cc:1092
+#: zypp/LanguageCode.cc:1047
msgid "Klingon"
msgstr "克林贡"
#. language code: kom kv
-#: zypp/LanguageCode.cc:676
+#: zypp/LanguageCode.cc:631
msgid "Komi"
msgstr "科米语"
#. language code: kon kg
-#: zypp/LanguageCode.cc:678
+#: zypp/LanguageCode.cc:633
msgid "Kongo"
msgstr "刚果语"
#. language code: kok
-#: zypp/LanguageCode.cc:674
+#: zypp/LanguageCode.cc:629
msgid "Konkani"
msgstr "孔卡尼语"
#. language code: kor ko
-#: zypp/LanguageCode.cc:680
+#: zypp/LanguageCode.cc:635
msgid "Korean"
msgstr "韩语"
#. language code: kos
-#: zypp/LanguageCode.cc:682
+#: zypp/LanguageCode.cc:637
msgid "Kosraean"
msgstr "科斯拉伊语"
#. language code: kpe
-#: zypp/LanguageCode.cc:684
+#: zypp/LanguageCode.cc:639
msgid "Kpelle"
msgstr "克佩勒语"
#. language code: kro
-#: zypp/LanguageCode.cc:688
+#: zypp/LanguageCode.cc:643
msgid "Kru"
msgstr "克鲁语"
#. language code: kua kj
-#: zypp/LanguageCode.cc:692
+#: zypp/LanguageCode.cc:647
msgid "Kuanyama"
msgstr "宽亚玛语"
#. language code: kum
-#: zypp/LanguageCode.cc:694
+#: zypp/LanguageCode.cc:649
msgid "Kumyk"
msgstr "库密克语"
#. language code: kur ku
-#: zypp/LanguageCode.cc:696
+#: zypp/LanguageCode.cc:651
msgid "Kurdish"
msgstr "库尔德语"
#. language code: kru
-#: zypp/LanguageCode.cc:690
+#: zypp/LanguageCode.cc:645
msgid "Kurukh"
msgstr "库卢克语"
#. language code: kut
-#: zypp/LanguageCode.cc:698
+#: zypp/LanguageCode.cc:653
msgid "Kutenai"
msgstr "库特内语"
#. :KOR:410:
-#: zypp/CountryCode.cc:323
+#: zypp/CountryCode.cc:279
msgid "Kuwait"
msgstr "科威特"
#. :KEN:404:
-#: zypp/CountryCode.cc:316
+#: zypp/CountryCode.cc:272
msgid "Kyrgyzstan"
msgstr "吉尔吉斯斯坦"
#. language code: lad
-#: zypp/LanguageCode.cc:700
+#: zypp/LanguageCode.cc:655
msgid "Ladino"
msgstr "拉迪诺语"
#. language code: lah
-#: zypp/LanguageCode.cc:702
+#: zypp/LanguageCode.cc:657
msgid "Lahnda"
msgstr "拉亨达语"
#. language code: lam
-#: zypp/LanguageCode.cc:704
+#: zypp/LanguageCode.cc:659
msgid "Lamba"
msgstr "兰巴语"
#. language code: lao lo
-#: zypp/LanguageCode.cc:706
+#: zypp/LanguageCode.cc:661
msgid "Lao"
msgstr "老挝语"
#. :KAZ:398:
-#: zypp/CountryCode.cc:326
+#: zypp/CountryCode.cc:282
msgid "Lao People's Democratic Republic"
msgstr "老挝人民民主共和国"
#. language code: lat la
-#: zypp/LanguageCode.cc:708
+#: zypp/LanguageCode.cc:663
msgid "Latin"
msgstr "拉丁语"
#. :LUX:442:
-#: zypp/CountryCode.cc:335
+#: zypp/CountryCode.cc:291
msgid "Latvia"
msgstr "拉脱维亚"
#. language code: lav lv
-#: zypp/LanguageCode.cc:710
+#: zypp/LanguageCode.cc:665
msgid "Latvian"
msgstr "拉脱维亚语"
#. :LAO:418:
-#: zypp/CountryCode.cc:327
+#: zypp/CountryCode.cc:283
msgid "Lebanon"
msgstr "黎巴嫩"
#. :LBR:430:
-#: zypp/CountryCode.cc:332
+#: zypp/CountryCode.cc:288
msgid "Lesotho"
msgstr "莱索托"
@@ -2528,42 +2535,42 @@
msgstr "级别 3"
#. language code: lez
-#: zypp/LanguageCode.cc:712
+#: zypp/LanguageCode.cc:667
msgid "Lezghian"
msgstr "列兹金语"
#. :LKA:144:
-#: zypp/CountryCode.cc:331
+#: zypp/CountryCode.cc:287
msgid "Liberia"
msgstr "利比里亚"
#. :LVA:428:
-#: zypp/CountryCode.cc:336
+#: zypp/CountryCode.cc:292
msgid "Libya"
msgstr "利比亚"
#. :LCA:662:
-#: zypp/CountryCode.cc:329
+#: zypp/CountryCode.cc:285
msgid "Liechtenstein"
msgstr "列支敦士登"
#. language code: lim li
-#: zypp/LanguageCode.cc:714
+#: zypp/LanguageCode.cc:669
msgid "Limburgan"
msgstr "林堡干语"
#. language code: lin ln
-#: zypp/LanguageCode.cc:716
+#: zypp/LanguageCode.cc:671
msgid "Lingala"
msgstr "林加拉语"
#. :LSO:426:
-#: zypp/CountryCode.cc:333
+#: zypp/CountryCode.cc:289
msgid "Lithuania"
msgstr "立陶宛"
#. language code: lit lt
-#: zypp/LanguageCode.cc:718
+#: zypp/LanguageCode.cc:673
msgid "Lithuanian"
msgstr "立陶宛语"
@@ -2573,136 +2580,136 @@
msgstr "位置 '%s' 暂时无法访问。"
#. language code: jbo
-#: zypp/LanguageCode.cc:626
+#: zypp/LanguageCode.cc:581
msgid "Lojban"
msgstr "逻辑语"
#. language code: nds
-#: zypp/LanguageCode.cc:836
+#: zypp/LanguageCode.cc:791
msgid "Low German"
msgstr "低地德语"
#. language code: dsb
-#: zypp/LanguageCode.cc:440
+#: zypp/LanguageCode.cc:395
msgid "Lower Sorbian"
msgstr "下索布语"
#. language code: loz
-#: zypp/LanguageCode.cc:722
+#: zypp/LanguageCode.cc:677
msgid "Lozi"
msgstr "洛齐语"
#. language code: lub lu
-#: zypp/LanguageCode.cc:728
+#: zypp/LanguageCode.cc:683
msgid "Luba-Katanga"
msgstr "卢巴-加丹加语"
#. language code: lua
-#: zypp/LanguageCode.cc:726
+#: zypp/LanguageCode.cc:681
msgid "Luba-Lulua"
msgstr "卢巴-卢拉语"
#. language code: lui
-#: zypp/LanguageCode.cc:732
+#: zypp/LanguageCode.cc:687
msgid "Luiseno"
msgstr "卢伊塞诺语"
#. language code: smj
-#: zypp/LanguageCode.cc:1012
+#: zypp/LanguageCode.cc:967
msgid "Lule Sami"
msgstr "鲁乐萨摩斯语"
#. language code: lun
-#: zypp/LanguageCode.cc:734
+#: zypp/LanguageCode.cc:689
msgid "Lunda"
msgstr "隆达语"
#. language code: luo
-#: zypp/LanguageCode.cc:736
+#: zypp/LanguageCode.cc:691
msgid "Luo (Kenya and Tanzania)"
msgstr "卢奥语 (肯尼亚和坦桑尼亚)"
#. language code: lus
-#: zypp/LanguageCode.cc:738
+#: zypp/LanguageCode.cc:693
msgid "Lushai"
msgstr "卢萨语"
#. :LTU:440:
-#: zypp/CountryCode.cc:334
+#: zypp/CountryCode.cc:290
msgid "Luxembourg"
msgstr "卢森堡公国"
#. language code: ltz lb
-#: zypp/LanguageCode.cc:724
+#: zypp/LanguageCode.cc:679
msgid "Luxembourgish"
msgstr "卢森堡语"
#. :MNG:496:
-#: zypp/CountryCode.cc:348
+#: zypp/CountryCode.cc:304
msgid "Macao"
msgstr "中国澳门行政特区"
#. :MHL:584:
-#: zypp/CountryCode.cc:344
+#: zypp/CountryCode.cc:300
msgid "Macedonia"
msgstr "马其顿王国"
#. language code: mac mkd mk
-#: zypp/LanguageCode.cc:740 zypp/LanguageCode.cc:742
+#: zypp/LanguageCode.cc:695 zypp/LanguageCode.cc:697
msgid "Macedonian"
msgstr "马其顿语"
-#: zypp/CountryCode.cc:342
+#: zypp/CountryCode.cc:298
msgid "Madagascar"
msgstr "马达加斯加岛"
#. language code: mad
-#: zypp/LanguageCode.cc:744
+#: zypp/LanguageCode.cc:699
msgid "Madurese"
msgstr "马都拉语"
#. language code: mag
-#: zypp/LanguageCode.cc:746
+#: zypp/LanguageCode.cc:701
msgid "Magahi"
msgstr "马加赫语"
#. language code: mai
-#: zypp/LanguageCode.cc:750
+#: zypp/LanguageCode.cc:705
msgid "Maithili"
msgstr "米德勒语"
#. language code: mak
-#: zypp/LanguageCode.cc:752
+#: zypp/LanguageCode.cc:707
msgid "Makasar"
msgstr "望加锡语"
#. language code: mlg mg
-#: zypp/LanguageCode.cc:788
+#: zypp/LanguageCode.cc:743
msgid "Malagasy"
msgstr "马达加斯加语"
#. :MDV:462:
-#: zypp/CountryCode.cc:356
+#: zypp/CountryCode.cc:312
msgid "Malawi"
msgstr "马拉维"
#. language code: may msa ms
-#: zypp/LanguageCode.cc:768 zypp/LanguageCode.cc:770
+#: zypp/LanguageCode.cc:723 zypp/LanguageCode.cc:725
msgid "Malay"
msgstr "马来语"
#. language code: mal ml
-#: zypp/LanguageCode.cc:754
+#: zypp/LanguageCode.cc:709
msgid "Malayalam"
msgstr "马拉雅拉姆语"
#. :MEX:484:
-#: zypp/CountryCode.cc:358
+#: zypp/CountryCode.cc:314
msgid "Malaysia"
msgstr "马来群岛"
#. :MUS:480:
-#: zypp/CountryCode.cc:355
+#: zypp/CountryCode.cc:311
msgid "Maldives"
msgstr "马尔代夫"
@@ -2711,107 +2718,107 @@
msgstr "异常的 URI"
#. :MKD:807:
-#: zypp/CountryCode.cc:345
+#: zypp/CountryCode.cc:301
msgid "Mali"
msgstr "马里"
#. :MSR:500:
-#: zypp/CountryCode.cc:353
+#: zypp/CountryCode.cc:309
msgid "Malta"
msgstr "马耳他"
#. language code: mlt mt
-#: zypp/LanguageCode.cc:790
+#: zypp/LanguageCode.cc:745
msgid "Maltese"
msgstr "马耳他语"
#. language code: mnc
-#: zypp/LanguageCode.cc:792
+#: zypp/LanguageCode.cc:747
msgid "Manchu"
msgstr "满语"
#. language code: mdr
-#: zypp/LanguageCode.cc:774
+#: zypp/LanguageCode.cc:729
msgid "Mandar"
msgstr "曼达语"
#. language code: man
-#: zypp/LanguageCode.cc:756
+#: zypp/LanguageCode.cc:711
msgid "Mandingo"
msgstr "曼丁哥语"
#. language code: mni
-#: zypp/LanguageCode.cc:794
+#: zypp/LanguageCode.cc:749
msgid "Manipuri"
msgstr "曼尼普尔语"
#. language code: mno
-#: zypp/LanguageCode.cc:796
+#: zypp/LanguageCode.cc:751
msgid "Manobo Languages"
msgstr "马诺博诸语言"
#. language code: glv gv
-#: zypp/LanguageCode.cc:530
+#: zypp/LanguageCode.cc:485
msgid "Manx"
msgstr "马恩岛语"
#. language code: mao mri mi
-#: zypp/LanguageCode.cc:758 zypp/LanguageCode.cc:760
+#: zypp/LanguageCode.cc:713 zypp/LanguageCode.cc:715
msgid "Maori"
msgstr "毛利语"
#. language code: mar mr
-#: zypp/LanguageCode.cc:764
+#: zypp/LanguageCode.cc:719
msgid "Marathi"
msgstr "马拉地语"
#. language code: chm
-#: zypp/LanguageCode.cc:374
+#: zypp/LanguageCode.cc:329
msgid "Mari"
msgstr "马里语"
#. :MDG:450:
-#: zypp/CountryCode.cc:343
+#: zypp/CountryCode.cc:299
msgid "Marshall Islands"
msgstr "马绍尔群岛"
#. language code: mah mh
-#: zypp/LanguageCode.cc:748
+#: zypp/LanguageCode.cc:703
msgid "Marshallese"
msgstr "马绍尔语"
#. :MNP:580:
-#: zypp/CountryCode.cc:350
+#: zypp/CountryCode.cc:306
msgid "Martinique"
msgstr "马提尼克岛"
#. language code: mwr
-#: zypp/LanguageCode.cc:814
+#: zypp/LanguageCode.cc:769
msgid "Marwari"
msgstr "马尔瓦利语"
#. language code: mas
-#: zypp/LanguageCode.cc:766
+#: zypp/LanguageCode.cc:721
msgid "Masai"
msgstr "马萨伊语"
#. :MTQ:474:
-#: zypp/CountryCode.cc:351
+#: zypp/CountryCode.cc:307
msgid "Mauritania"
msgstr "毛利塔尼亚"
#. :MLT:470:
-#: zypp/CountryCode.cc:354
+#: zypp/CountryCode.cc:310
msgid "Mauritius"
msgstr "毛里求斯"
#. language code: myn
-#: zypp/LanguageCode.cc:816
+#: zypp/LanguageCode.cc:771
msgid "Mayan Languages"
msgstr "玛雅诸语言"
#. :YEM:887:
-#: zypp/CountryCode.cc:444
+#: zypp/CountryCode.cc:400
msgid "Mayotte"
msgstr "马约特岛"
@@ -2835,248 +2842,248 @@
msgstr "当试图执行动作 '%s' 时,介质没有打开。"
#. language code: men
-#: zypp/LanguageCode.cc:776
+#: zypp/LanguageCode.cc:731
msgid "Mende"
msgstr "门德语"
#. :FRA:250:
-#: zypp/CountryCode.cc:275
+#: zypp/CountryCode.cc:231
msgid "Metropolitan France"
msgstr "法属美特罗波利坦"
#. :MWI:454:
-#: zypp/CountryCode.cc:357
+#: zypp/CountryCode.cc:313
msgid "Mexico"
msgstr "墨西哥"
#. language code: mic
-#: zypp/LanguageCode.cc:780
+#: zypp/LanguageCode.cc:735
msgid "Mi'kmaq"
msgstr "密克马克语"
#. language code: min
-#: zypp/LanguageCode.cc:782
+#: zypp/LanguageCode.cc:737
msgid "Minangkabau"
msgstr "米南卡保语"
#. language code: mwl
-#: zypp/LanguageCode.cc:812
+#: zypp/LanguageCode.cc:767
msgid "Mirandese"
msgstr "米兰德语"
#. language code: mis
-#: zypp/LanguageCode.cc:784
+#: zypp/LanguageCode.cc:739
msgid "Miscellaneous Languages"
msgstr "杂项语言"
#. language code: moh
-#: zypp/LanguageCode.cc:798
+#: zypp/LanguageCode.cc:753
msgid "Mohawk"
msgstr "莫霍克语"
#. language code: mdf
-#: zypp/LanguageCode.cc:772
+#: zypp/LanguageCode.cc:727
msgid "Moksha"
msgstr "莫克沙语"
#. language code: mol mo
-#: zypp/LanguageCode.cc:800
+#: zypp/LanguageCode.cc:755
msgid "Moldavian"
msgstr "摩尔达维亚语"
#. :MCO:492:
-#: zypp/CountryCode.cc:339
+#: zypp/CountryCode.cc:295
msgid "Moldova"
msgstr "摩尔多瓦"
#. language code: mkh
-#: zypp/LanguageCode.cc:786
+#: zypp/LanguageCode.cc:741
msgid "Mon-Khmer (Other)"
msgstr "孟高棉语 (其它)"
#. :MAR:504:
-#: zypp/CountryCode.cc:338
+#: zypp/CountryCode.cc:294
msgid "Monaco"
msgstr "摩纳哥"
#. language code: lol
-#: zypp/LanguageCode.cc:720
+#: zypp/LanguageCode.cc:675
msgid "Mongo"
msgstr "蒙古语"
#. :MMR:104:
-#: zypp/CountryCode.cc:347
+#: zypp/CountryCode.cc:303
msgid "Mongolia"
msgstr "蒙古"
#. language code: mon mn
-#: zypp/LanguageCode.cc:802
+#: zypp/LanguageCode.cc:757
msgid "Mongolian"
msgstr "蒙古语"
#. :MDA:498:
-#: zypp/CountryCode.cc:340
+#: zypp/CountryCode.cc:296
msgid "Montenegro"
msgstr "黑山"
#. :MRT:478:
-#: zypp/CountryCode.cc:352
+#: zypp/CountryCode.cc:308
msgid "Montserrat"
msgstr "蒙特塞拉特岛"
#. :LBY:434:
-#: zypp/CountryCode.cc:337
+#: zypp/CountryCode.cc:293
msgid "Morocco"
msgstr "摩洛哥"
#. language code: mos
-#: zypp/LanguageCode.cc:804
+#: zypp/LanguageCode.cc:759
msgid "Mossi"
msgstr "莫西语"
#. :MYS:458:
-#: zypp/CountryCode.cc:359
+#: zypp/CountryCode.cc:315
msgid "Mozambique"
msgstr "莫桑比克"
#. language code: mul
-#: zypp/LanguageCode.cc:806
+#: zypp/LanguageCode.cc:761
msgid "Multiple Languages"
msgstr "多语种"
#. language code: mun
-#: zypp/LanguageCode.cc:808
+#: zypp/LanguageCode.cc:763
msgid "Munda languages"
msgstr "蒙达诸语言"
#. :MLI:466:
-#: zypp/CountryCode.cc:346
+#: zypp/CountryCode.cc:302
msgid "Myanmar"
msgstr "缅甸"
#. language code: nah
-#: zypp/LanguageCode.cc:820
+#: zypp/LanguageCode.cc:775
msgid "Nahuatl"
msgstr "纳瓦特尔语"
#. :MOZ:508:
-#: zypp/CountryCode.cc:360
+#: zypp/CountryCode.cc:316
msgid "Namibia"
msgstr "纳米比亚"
#. :NPL:524:
#. language code: nau na
-#: zypp/CountryCode.cc:369 zypp/LanguageCode.cc:826
+#: zypp/CountryCode.cc:325 zypp/LanguageCode.cc:781
msgid "Nauru"
msgstr "瑙鲁语"
#. language code: nav nv
-#: zypp/LanguageCode.cc:828
+#: zypp/LanguageCode.cc:783
msgid "Navajo"
msgstr "纳瓦霍语"
#. language code: nde nd
-#: zypp/LanguageCode.cc:832
+#: zypp/LanguageCode.cc:787
msgid "Ndebele, North"
msgstr "北部恩德贝勒语"
#. language code: nbl nr
-#: zypp/LanguageCode.cc:830
+#: zypp/LanguageCode.cc:785
msgid "Ndebele, South"
msgstr "南部恩德贝勒语"
#. language code: ndo ng
-#: zypp/LanguageCode.cc:834
+#: zypp/LanguageCode.cc:789
msgid "Ndonga"
msgstr "恩敦加语"
#. language code: nap
-#: zypp/LanguageCode.cc:824
+#: zypp/LanguageCode.cc:779
msgid "Neapolitan"
msgstr "那不勒斯语"
#. :NOR:578:
-#: zypp/CountryCode.cc:368
+#: zypp/CountryCode.cc:324
msgid "Nepal"
msgstr "尼泊尔"
#. language code: new
-#: zypp/LanguageCode.cc:840
+#: zypp/LanguageCode.cc:795
msgid "Nepal Bhasa"
msgstr "尼泊尔 Bhasa 语"
#. language code: nep ne
-#: zypp/LanguageCode.cc:838
+#: zypp/LanguageCode.cc:793
msgid "Nepali"
msgstr "尼泊尔语"
#. :NIC:558:
-#: zypp/CountryCode.cc:366
+#: zypp/CountryCode.cc:322
msgid "Netherlands"
msgstr "荷兰"
#. :ARM:051:
-#: zypp/CountryCode.cc:209
+#: zypp/CountryCode.cc:165
msgid "Netherlands Antilles"
msgstr "荷属安的列斯"
#. :NAM:516:
-#: zypp/CountryCode.cc:361
+#: zypp/CountryCode.cc:317
msgid "New Caledonia"
msgstr "新喀里多尼亚"
#. :NIU:570:
-#: zypp/CountryCode.cc:371
+#: zypp/CountryCode.cc:327
msgid "New Zealand"
msgstr "新西兰"
-#: zypp/target/TargetImpl.cc:787
+#: zypp/target/TargetImpl.cc:801
msgid "New update message"
msgstr "新更新消息"
#. language code: nia
-#: zypp/LanguageCode.cc:842
+#: zypp/LanguageCode.cc:797
msgid "Nias"
msgstr "尼亚斯语"
#. :NGA:566:
-#: zypp/CountryCode.cc:365
+#: zypp/CountryCode.cc:321
msgid "Nicaragua"
msgstr "尼加拉瓜"
#. :NCL:540:
-#: zypp/CountryCode.cc:362
+#: zypp/CountryCode.cc:318
msgid "Niger"
msgstr "尼日尔"
#. language code: nic
-#: zypp/LanguageCode.cc:844
+#: zypp/LanguageCode.cc:799
msgid "Niger-Kordofanian (Other)"
msgstr "尼日尔-科尔多凡语 (其它)"
#. :NFK:574:
-#: zypp/CountryCode.cc:364
+#: zypp/CountryCode.cc:320
msgid "Nigeria"
msgstr "尼日利亚"
#. language code: ssa
-#: zypp/LanguageCode.cc:1040
+#: zypp/LanguageCode.cc:995
msgid "Nilo-Saharan (Other)"
msgstr "尼罗-撒哈拉语 (其它)"
#. :NRU:520:
-#: zypp/CountryCode.cc:370
+#: zypp/CountryCode.cc:326
msgid "Niue"
msgstr "纽埃岛"
#. language code: niu
-#: zypp/LanguageCode.cc:846
+#: zypp/LanguageCode.cc:801
msgid "Niuean"
msgstr "纽埃语"
#. Defined CountryCode constants
#. Defined LanguageCode constants
-#: zypp/CountryCode.cc:193 zypp/LanguageCode.cc:193
+#: zypp/CountryCode.cc:149 zypp/LanguageCode.cc:148
msgid "No Code"
msgstr "无代码"
@@ -3085,62 +3092,62 @@
msgstr "软件源中没有 url。"
#. language code: nog
-#: zypp/LanguageCode.cc:852
+#: zypp/LanguageCode.cc:807
msgid "Nogai"
msgstr "诺盖语"
#. :NER:562:
-#: zypp/CountryCode.cc:363
+#: zypp/CountryCode.cc:319
msgid "Norfolk Island"
msgstr "诺福克岛"
#. language code: non
-#: zypp/LanguageCode.cc:854
+#: zypp/LanguageCode.cc:809
msgid "Norse, Old"
msgstr "古诺尔斯语"
#. language code: nai
-#: zypp/LanguageCode.cc:822
+#: zypp/LanguageCode.cc:777
msgid "North American Indian"
msgstr "北美印第安语"
#. :KNA:659:
-#: zypp/CountryCode.cc:321
+#: zypp/CountryCode.cc:277
msgid "North Korea"
msgstr "北朝鲜"
#. :MAC:446:
-#: zypp/CountryCode.cc:349
+#: zypp/CountryCode.cc:305
msgid "Northern Mariana Islands"
msgstr "北马里亚纳群岛"
#. language code: sme se
-#: zypp/LanguageCode.cc:1008
+#: zypp/LanguageCode.cc:963
msgid "Northern Sami"
msgstr "北萨摩斯语"
#. language code: nso
-#: zypp/LanguageCode.cc:858
+#: zypp/LanguageCode.cc:813
msgid "Northern Sotho"
msgstr "北梭托语"
#. :NLD:528:
-#: zypp/CountryCode.cc:367
+#: zypp/CountryCode.cc:323
msgid "Norway"
msgstr "挪威"
#. language code: nor no
-#: zypp/LanguageCode.cc:856
+#: zypp/LanguageCode.cc:811
msgid "Norwegian"
msgstr "挪威语"
#. language code: nob nb
-#: zypp/LanguageCode.cc:850
+#: zypp/LanguageCode.cc:805
msgid "Norwegian Bokmal"
msgstr "挪威布克摩尔语"
#. language code: nno nn
-#: zypp/LanguageCode.cc:848
+#: zypp/LanguageCode.cc:803
msgid "Norwegian Nynorsk"
msgstr "挪威 Nynorsk 语"
@@ -3149,27 +3156,27 @@
msgstr "不是一个 CDROM 驱动器"
#. language code: nub
-#: zypp/LanguageCode.cc:860
+#: zypp/LanguageCode.cc:815
msgid "Nubian Languages"
msgstr "努比亚诸语言"
#. language code: nym
-#: zypp/LanguageCode.cc:866
+#: zypp/LanguageCode.cc:821
msgid "Nyamwezi"
msgstr "尼扬韦齐语"
#. language code: nyn
-#: zypp/LanguageCode.cc:868
+#: zypp/LanguageCode.cc:823
msgid "Nyankole"
msgstr "尼扬科勒语"
#. language code: nyo
-#: zypp/LanguageCode.cc:870
+#: zypp/LanguageCode.cc:825
msgid "Nyoro"
msgstr "尼奥罗语"
#. language code: nzi
-#: zypp/LanguageCode.cc:872
+#: zypp/LanguageCode.cc:827
msgid "Nzima"
msgstr "恩济马语"
@@ -3178,21 +3185,21 @@
msgstr "淘汰"
#. language code: oci oc
-#: zypp/LanguageCode.cc:874
+#: zypp/LanguageCode.cc:829
msgid "Occitan (post 1500)"
msgstr "欧西坦语 (1500 前)"
#. language code: oji oj
-#: zypp/LanguageCode.cc:876
+#: zypp/LanguageCode.cc:831
msgid "Ojibwa"
msgstr "奥吉布瓦语"
#. :NZL:554:
-#: zypp/CountryCode.cc:372
+#: zypp/CountryCode.cc:328
msgid "Oman"
msgstr "阿曼"
-#: zypp/parser/RepoindexFileReader.cc:199
+#: zypp/parser/RepoindexFileReader.cc:209
#, c-format, boost-format
msgid "One or both of '%s' or '%s' attributes is required."
msgstr "需要 '%s' 或 '%s' 属性中的一项或两项。"
@@ -3202,105 +3209,103 @@
msgstr "介质不支持此操作"
#. language code: ori or
-#: zypp/LanguageCode.cc:878
+#: zypp/LanguageCode.cc:833
msgid "Oriya"
msgstr "奥里亚语"
#. language code: orm om
-#: zypp/LanguageCode.cc:880
+#: zypp/LanguageCode.cc:835
msgid "Oromo"
msgstr "奥罗莫语"
#. language code: osa
-#: zypp/LanguageCode.cc:882
+#: zypp/LanguageCode.cc:837
msgid "Osage"
msgstr "奥萨格语"
#. language code: oss os
-#: zypp/LanguageCode.cc:884
+#: zypp/LanguageCode.cc:839
msgid "Ossetian"
msgstr "奥塞梯语"
#. language code: oto
-#: zypp/LanguageCode.cc:888
+#: zypp/LanguageCode.cc:843
msgid "Otomian Languages"
msgstr "古奥斯曼诸语言"
#. TranslatorExplanation %s = package being checked for integrity
#: zypp/repo/PackageProvider.cc:157
#, c-format, boost-format
-msgid ""
-"Package %s seems to be corrupted during transfer. Do you want to retry "
-"retrieval?"
+msgid "Package %s seems to be corrupted during transfer. Do you want to retry retrieval?"
msgstr "软件包 %s 似乎在传输时损坏了。您想要重试撷取吗?"
#. language code: pal
-#: zypp/LanguageCode.cc:894
+#: zypp/LanguageCode.cc:849
msgid "Pahlavi"
msgstr "钵罗钵语"
#. :PHL:608:
-#: zypp/CountryCode.cc:378
+#: zypp/CountryCode.cc:334
msgid "Pakistan"
msgstr "巴基斯坦"
#. :PRT:620:
-#: zypp/CountryCode.cc:385
+#: zypp/CountryCode.cc:341
msgid "Palau"
msgstr "帕劳群岛"
#. language code: pau
-#: zypp/LanguageCode.cc:902
+#: zypp/LanguageCode.cc:857
msgid "Palauan"
msgstr "帕劳语"
#. :PRI:630:
-#: zypp/CountryCode.cc:383
+#: zypp/CountryCode.cc:339
msgid "Palestinian Territory"
msgstr "巴基斯坦领土"
#. language code: pli pi
-#: zypp/LanguageCode.cc:914
+#: zypp/LanguageCode.cc:869
msgid "Pali"
msgstr "巴利语"
#. language code: pam
-#: zypp/LanguageCode.cc:896
+#: zypp/LanguageCode.cc:851
msgid "Pampanga"
msgstr "邦板牙语"
#. :OMN:512:
-#: zypp/CountryCode.cc:373
+#: zypp/CountryCode.cc:329
msgid "Panama"
msgstr "巴拿马"
#. language code: pag
-#: zypp/LanguageCode.cc:892
+#: zypp/LanguageCode.cc:847
msgid "Pangasinan"
msgstr "邦阿西楠语"
#. language code: pan pa
-#: zypp/LanguageCode.cc:898
+#: zypp/LanguageCode.cc:853
msgid "Panjabi"
msgstr "旁遮普语"
#. language code: pap
-#: zypp/LanguageCode.cc:900
+#: zypp/LanguageCode.cc:855
msgid "Papiamento"
msgstr "帕皮亚门托语"
#. :PYF:258:
-#: zypp/CountryCode.cc:376
+#: zypp/CountryCode.cc:332
msgid "Papua New Guinea"
msgstr "巴布亚新几内亚"
#. language code: paa
-#: zypp/LanguageCode.cc:890
+#: zypp/LanguageCode.cc:845
msgid "Papuan (Other)"
msgstr "巴布亚语 (其它)"
#. :PLW:585:
-#: zypp/CountryCode.cc:386
+#: zypp/CountryCode.cc:342
msgid "Paraguay"
msgstr "巴拉圭"
@@ -3320,71 +3325,71 @@
msgstr "访问 '%s' 的准入请求被拒绝。"
#. language code: per fas fa
-#: zypp/LanguageCode.cc:906 zypp/LanguageCode.cc:908
+#: zypp/LanguageCode.cc:861 zypp/LanguageCode.cc:863
msgid "Persian"
msgstr "波斯语"
#. language code: peo
-#: zypp/LanguageCode.cc:904
+#: zypp/LanguageCode.cc:859
msgid "Persian, Old (ca.600-400 B.C.)"
msgstr "古波斯语 (约公元前 600-400)"
#. :PAN:591:
-#: zypp/CountryCode.cc:374
+#: zypp/CountryCode.cc:330
msgid "Peru"
msgstr "秘鲁"
#. language code: phi
-#: zypp/LanguageCode.cc:910
+#: zypp/LanguageCode.cc:865
msgid "Philippine (Other)"
msgstr "菲律宾语 (其它)"
#. :PNG:598:
-#: zypp/CountryCode.cc:377
+#: zypp/CountryCode.cc:333
msgid "Philippines"
msgstr "菲律宾共和国"
#. language code: phn
-#: zypp/LanguageCode.cc:912
+#: zypp/LanguageCode.cc:867
msgid "Phoenician"
msgstr "腓尼基语"
#. :SPM:666:
-#: zypp/CountryCode.cc:381
+#: zypp/CountryCode.cc:337
msgid "Pitcairn"
msgstr "皮特克恩岛"
-#: zypp/misc/CheckAccessDeleted.cc:239
+#: zypp/misc/CheckAccessDeleted.cc:242
msgid "Please install package 'lsof' first."
msgstr "请先安装 'lsof' 软件包。"
#. language code: pon
-#: zypp/LanguageCode.cc:918
+#: zypp/LanguageCode.cc:873
msgid "Pohnpeian"
msgstr "波纳佩语"
#. :PAK:586:
-#: zypp/CountryCode.cc:379
+#: zypp/CountryCode.cc:335
msgid "Poland"
msgstr "波兰"
#. language code: pol pl
-#: zypp/LanguageCode.cc:916
+#: zypp/LanguageCode.cc:871
msgid "Polish"
msgstr "波兰语"
#. :PSE:275:
-#: zypp/CountryCode.cc:384
+#: zypp/CountryCode.cc:340
msgid "Portugal"
msgstr "葡萄牙"
#. language code: por pt
-#: zypp/LanguageCode.cc:920
+#: zypp/LanguageCode.cc:875
msgid "Portuguese"
msgstr "葡萄牙语"
#. language code: pra
-#: zypp/LanguageCode.cc:922
+#: zypp/LanguageCode.cc:877
msgid "Prakrit Languages"
msgstr "古印度方言"
@@ -3393,35 +3398,19 @@
msgstr "前提"
#: zypp/VendorSupportOptions.cc:45
-msgid ""
-"Problem determination, which means technical support designed to provide "
-"compatibility information, installation assistance, usage support, on-going "
-"maintenance and basic troubleshooting. Level 1 Support is not intended to "
-"correct product defect errors."
-msgstr ""
-"问题判定,该技术支持设计用于提供兼容性信息、安装辅助、使用帮助、持续维护和基"
-"础甄错。一级支持并不意在修正产品缺陷错误。"
+msgid "Problem determination, which means technical support designed to provide compatibility information, installation assistance, usage support, on-going maintenance and basic troubleshooting. Level 1 Support is not intended to correct product defect errors."
+msgstr "问题判定,该技术支持设计用于提供兼容性信息、安装辅助、使用帮助、持续维护和基础甄错。一级支持并不意在修正产品缺陷错误。"
#: zypp/VendorSupportOptions.cc:48
-msgid ""
-"Problem isolation, which means technical support designed to duplicate "
-"customer problems, isolate problem area and provide resolution for problems "
-"not resolved by Level 1 Support."
-msgstr ""
-"问题隔离,该技术支持设计用于重现客户问题、孤立问题领域并提供一级支持不能解决"
-"的问题的解决方案。"
+msgid "Problem isolation, which means technical support designed to duplicate customer problems, isolate problem area and provide resolution for problems not resolved by Level 1 Support."
+msgstr "问题隔离,该技术支持设计用于重现客户问题、孤立问题领域并提供一级支持不能解决的问题的解决方案。"
#: zypp/VendorSupportOptions.cc:51
-msgid ""
-"Problem resolution, which means technical support designed to resolve "
-"complex problems by engaging engineering in resolution of product defects "
-"which have been identified by Level 2 Support."
-msgstr ""
-"问题解决,该技术支持设计用来解决复杂的问题,通过工程解决二级支持中确认的产品"
-"缺陷。"
+msgid "Problem resolution, which means technical support designed to resolve complex problems by engaging engineering in resolution of product defects which have been identified by Level 2 Support."
+msgstr "问题解决,该技术支持设计用来解决复杂的问题,通过工程解决二级支持中确认的产品缺陷。"
#. language code: pro
-#: zypp/LanguageCode.cc:924
+#: zypp/LanguageCode.cc:879
msgid "Provencal, Old (to 1500)"
msgstr "古普罗旺斯语 (1500 以前)"
@@ -3430,22 +3419,22 @@
msgstr "提供"
#. :PCN:612:
-#: zypp/CountryCode.cc:382
+#: zypp/CountryCode.cc:338
msgid "Puerto Rico"
msgstr "波多黎各"
#. language code: pus ps
-#: zypp/LanguageCode.cc:926
+#: zypp/LanguageCode.cc:881
msgid "Pushto"
msgstr "普什图语"
#. :PRY:600:
-#: zypp/CountryCode.cc:387
+#: zypp/CountryCode.cc:343
msgid "Qatar"
msgstr "卡塔尔"
#. language code: que qu
-#: zypp/LanguageCode.cc:928
+#: zypp/LanguageCode.cc:883
msgid "Quechua"
msgstr "盖丘亚语"
@@ -3455,28 +3444,28 @@
#. TranslatorExplanation after semicolon is error message
#. TranslatorExplanation the colon is followed by an error message
-#: zypp/target/rpm/RpmDb.cc:850 zypp/target/rpm/RpmDb.cc:2045
-#: zypp/target/rpm/RpmDb.cc:2192
+#: zypp/target/rpm/RpmDb.cc:850 zypp/target/rpm/RpmDb.cc:2044
+#: zypp/target/rpm/RpmDb.cc:2190
msgid "RPM failed: "
msgstr "RPM 失败:"
#. language code: roh rm
-#: zypp/LanguageCode.cc:938
+#: zypp/LanguageCode.cc:893
msgid "Raeto-Romance"
msgstr "罗曼语"
#. language code: raj
-#: zypp/LanguageCode.cc:930
+#: zypp/LanguageCode.cc:885
msgid "Rajasthani"
msgstr "拉贾斯坦语"
#. language code: rap
-#: zypp/LanguageCode.cc:932
+#: zypp/LanguageCode.cc:887
msgid "Rapanui"
msgstr "拉帕努伊语"
#. language code: rar
-#: zypp/LanguageCode.cc:934
+#: zypp/LanguageCode.cc:889
msgid "Rarotongan"
msgstr "拉罗汤加语"
@@ -3488,7 +3477,7 @@
msgid "Relative path not allowed if authority exists"
msgstr "若存在认证则不允许相对路径"
-#: zypp/RepoManager.cc:1657
+#: zypp/RepoManager.cc:1687
#, c-format, boost-format
msgid "Removing repository '%s'"
msgstr "正在移除软件源 '%s'"
@@ -3497,7 +3486,7 @@
msgid "Repository alias cannot start with dot."
msgstr "软件源别名不能以点开头。"
-#: zypp/parser/RepoindexFileReader.cc:187
+#: zypp/parser/RepoindexFileReader.cc:197
#, c-format, boost-format
msgid "Required attribute '%s' is missing."
msgstr "缺失所需属性 '%s' 。"
@@ -3507,180 +3496,180 @@
msgstr "需要"
#. :QAT:634:
-#: zypp/CountryCode.cc:388
+#: zypp/CountryCode.cc:344
msgid "Reunion"
msgstr "留尼旺"
#. language code: roa
-#: zypp/LanguageCode.cc:936
+#: zypp/LanguageCode.cc:891
msgid "Romance (Other)"
msgstr "罗曼语 (其它)"
#. :REU:638:
-#: zypp/CountryCode.cc:389
+#: zypp/CountryCode.cc:345
msgid "Romania"
msgstr "罗马尼亚"
#. language code: rum ron ro
-#: zypp/LanguageCode.cc:942 zypp/LanguageCode.cc:944
+#: zypp/LanguageCode.cc:897 zypp/LanguageCode.cc:899
msgid "Romanian"
msgstr "罗马尼亚语"
#. language code: rom
-#: zypp/LanguageCode.cc:940
+#: zypp/LanguageCode.cc:895
msgid "Romany"
msgstr "吉普赛语"
#. language code: run rn
-#: zypp/LanguageCode.cc:946
+#: zypp/LanguageCode.cc:901
msgid "Rundi"
msgstr "隆迪语"
#. language code: rus ru
-#: zypp/LanguageCode.cc:948
+#: zypp/LanguageCode.cc:903
msgid "Russian"
msgstr "俄语"
-#: zypp/CountryCode.cc:391
+#: zypp/CountryCode.cc:347
msgid "Russian Federation"
msgstr "俄联邦"
#. :RUS:643:
-#: zypp/CountryCode.cc:392
+#: zypp/CountryCode.cc:348
msgid "Rwanda"
msgstr "卢旺达"
#. :SGP:702:
-#: zypp/CountryCode.cc:399
+#: zypp/CountryCode.cc:355
msgid "Saint Helena"
msgstr "圣赫勒拿"
#. :COM:174:
-#: zypp/CountryCode.cc:320
+#: zypp/CountryCode.cc:276
msgid "Saint Kitts and Nevis"
msgstr "圣基茨和尼维斯"
#. :LBN:422:
-#: zypp/CountryCode.cc:328
+#: zypp/CountryCode.cc:284
msgid "Saint Lucia"
msgstr "圣卢西亚岛"
-#: zypp/CountryCode.cc:341
+#: zypp/CountryCode.cc:297
msgid "Saint Martin"
msgstr "圣马丁"
#. :POL:616:
-#: zypp/CountryCode.cc:380
+#: zypp/CountryCode.cc:336
msgid "Saint Pierre and Miquelon"
msgstr "圣皮埃尔和密克隆"
#. :VAT:336:
-#: zypp/CountryCode.cc:435
+#: zypp/CountryCode.cc:391
msgid "Saint Vincent and the Grenadines"
msgstr "圣文森特和格林纳丁斯"
#. language code: sal
-#: zypp/LanguageCode.cc:958
+#: zypp/LanguageCode.cc:913
msgid "Salishan Languages"
msgstr "萨利什诸语言"
#. language code: sam
-#: zypp/LanguageCode.cc:960
+#: zypp/LanguageCode.cc:915
msgid "Samaritan Aramaic"
msgstr "萨马利亚阿拉米语"
#. language code: smi
-#: zypp/LanguageCode.cc:1010
+#: zypp/LanguageCode.cc:965
msgid "Sami Languages (Other)"
msgstr "萨米诸语言 (其它)"
#. :WLF:876:
-#: zypp/CountryCode.cc:442
+#: zypp/CountryCode.cc:398
msgid "Samoa"
msgstr "萨摩亚群岛"
#. language code: smo sm
-#: zypp/LanguageCode.cc:1016
+#: zypp/LanguageCode.cc:971
msgid "Samoan"
msgstr "萨摩亚语"
#. :SLE:694:
-#: zypp/CountryCode.cc:404
+#: zypp/CountryCode.cc:360
msgid "San Marino"
msgstr "圣马力诺"
#. language code: sad
-#: zypp/LanguageCode.cc:950
+#: zypp/LanguageCode.cc:905
msgid "Sandawe"
msgstr "桑达韦语"
#. language code: sag sg
-#: zypp/LanguageCode.cc:952
+#: zypp/LanguageCode.cc:907
msgid "Sango"
msgstr "桑戈语"
#. language code: san sa
-#: zypp/LanguageCode.cc:962
+#: zypp/LanguageCode.cc:917
msgid "Sanskrit"
msgstr "梵语"
#. language code: sat
-#: zypp/LanguageCode.cc:966
+#: zypp/LanguageCode.cc:921
msgid "Santali"
msgstr "桑塔利语"
#. :SUR:740:
-#: zypp/CountryCode.cc:408
+#: zypp/CountryCode.cc:364
msgid "Sao Tome and Principe"
msgstr "圣多美和普林西比"
#. language code: srd sc
-#: zypp/LanguageCode.cc:1036
+#: zypp/LanguageCode.cc:991
msgid "Sardinian"
msgstr "撒丁语"
#. language code: sas
-#: zypp/LanguageCode.cc:964
+#: zypp/LanguageCode.cc:919
msgid "Sasak"
msgstr "萨萨克语"
#. :RWA:646:
-#: zypp/CountryCode.cc:393
+#: zypp/CountryCode.cc:349
msgid "Saudi Arabia"
msgstr "沙特阿拉伯"
#. language code: sco
-#: zypp/LanguageCode.cc:974
+#: zypp/LanguageCode.cc:929
msgid "Scots"
msgstr "苏格兰语"
#. language code: sel
-#: zypp/LanguageCode.cc:980
+#: zypp/LanguageCode.cc:935
msgid "Selkup"
msgstr "塞尔库普语"
#. language code: sem
-#: zypp/LanguageCode.cc:982
+#: zypp/LanguageCode.cc:937
msgid "Semitic (Other)"
msgstr "闪米特语 (其它)"
#. :SMR:674:
-#: zypp/CountryCode.cc:405
+#: zypp/CountryCode.cc:361
msgid "Senegal"
msgstr "塞内加尔"
#. :ROU:642:
-#: zypp/CountryCode.cc:390
+#: zypp/CountryCode.cc:346
msgid "Serbia"
msgstr "塞尔维亚"
#. language code: scc srp sr
-#: zypp/LanguageCode.cc:968 zypp/LanguageCode.cc:970
+#: zypp/LanguageCode.cc:923 zypp/LanguageCode.cc:925
msgid "Serbian"
msgstr "塞尔维亚语"
#. language code: srr
-#: zypp/LanguageCode.cc:1038
+#: zypp/LanguageCode.cc:993
msgid "Serer"
msgstr "塞雷尔语"
@@ -3693,47 +3682,47 @@
msgstr "服务插件不支持修改属性。"
#. :SLB:090:
-#: zypp/CountryCode.cc:395
+#: zypp/CountryCode.cc:351
msgid "Seychelles"
msgstr "塞舌尔"
#. language code: shn
-#: zypp/LanguageCode.cc:988
+#: zypp/LanguageCode.cc:943
msgid "Shan"
msgstr "掸语"
#. language code: sna sn
-#: zypp/LanguageCode.cc:1020
+#: zypp/LanguageCode.cc:975
msgid "Shona"
msgstr "修纳语"
#. language code: iii ii
-#: zypp/LanguageCode.cc:596
+#: zypp/LanguageCode.cc:551
msgid "Sichuan Yi"
msgstr "四川彝语"
#. language code: scn
-#: zypp/LanguageCode.cc:972
+#: zypp/LanguageCode.cc:927
msgid "Sicilian"
msgstr "西西里岛语"
#. language code: sid
-#: zypp/LanguageCode.cc:990
+#: zypp/LanguageCode.cc:945
msgid "Sidamo"
msgstr "锡达莫语"
#. :SVK:703:
-#: zypp/CountryCode.cc:403
+#: zypp/CountryCode.cc:359
msgid "Sierra Leone"
msgstr "塞拉利昂"
#. language code: sgn
-#: zypp/LanguageCode.cc:986
+#: zypp/LanguageCode.cc:941
msgid "Sign Languages"
msgstr "手语"
#. translators: possible rpm package signature check result [brief]
-#: zypp/target/rpm/RpmDb.cc:2373
+#: zypp/target/rpm/RpmDb.cc:2370
msgid "Signature does not verify"
msgstr "无法核实签名"
@@ -3743,12 +3732,12 @@
msgstr "未找到签名文件 %s"
#. translators: possible rpm package signature check result [brief]
-#: zypp/target/rpm/RpmDb.cc:2369
+#: zypp/target/rpm/RpmDb.cc:2366
msgid "Signature is OK"
msgstr "签名正确"
#. translators: possible rpm package signature check result [brief]
-#: zypp/target/rpm/RpmDb.cc:2375
+#: zypp/target/rpm/RpmDb.cc:2372
msgid "Signature is OK, but key is not trusted"
msgstr "签名正确,但密钥是非受信的"
@@ -3757,107 +3746,107 @@
msgstr "签名校验失败"
#. translators: possible rpm package signature check result [brief]
-#: zypp/target/rpm/RpmDb.cc:2377
+#: zypp/target/rpm/RpmDb.cc:2374
msgid "Signatures public key is not available"
msgstr "签名公钥不可用"
#. language code: bla
-#: zypp/LanguageCode.cc:322
+#: zypp/LanguageCode.cc:277
msgid "Siksika"
msgstr "西克西卡语"
#. language code: snd sd
-#: zypp/LanguageCode.cc:1022
+#: zypp/LanguageCode.cc:977
msgid "Sindhi"
msgstr "信德语"
#. :SWE:752:
-#: zypp/CountryCode.cc:398
+#: zypp/CountryCode.cc:354
msgid "Singapore"
msgstr "新加坡"
#. language code: sin si
-#: zypp/LanguageCode.cc:992
+#: zypp/LanguageCode.cc:947
msgid "Sinhala"
msgstr "僧伽罗语"
#. language code: sit
-#: zypp/LanguageCode.cc:996
+#: zypp/LanguageCode.cc:951
msgid "Sino-Tibetan (Other)"
msgstr "汉藏诸语言 (其它)"
#. language code: sio
-#: zypp/LanguageCode.cc:994
+#: zypp/LanguageCode.cc:949
msgid "Siouan Languages"
msgstr "苏语诸语言"
#. language code: sms
-#: zypp/LanguageCode.cc:1018
+#: zypp/LanguageCode.cc:973
msgid "Skolt Sami"
msgstr "斯考特萨摩斯语"
#. language code: den
-#: zypp/LanguageCode.cc:428
+#: zypp/LanguageCode.cc:383
msgid "Slave (Athapascan)"
msgstr "阿萨巴斯卡奴隶语"
#. language code: sla
-#: zypp/LanguageCode.cc:998
+#: zypp/LanguageCode.cc:953
msgid "Slavic (Other)"
msgstr "斯拉夫语 (其它)"
#. language code: slo slk sk
-#: zypp/LanguageCode.cc:1000 zypp/LanguageCode.cc:1002
+#: zypp/LanguageCode.cc:955 zypp/LanguageCode.cc:957
msgid "Slovak"
msgstr "斯洛伐克语"
#. :SJM:744:
-#: zypp/CountryCode.cc:402
+#: zypp/CountryCode.cc:358
msgid "Slovakia"
msgstr "斯洛伐克"
#. :SHN:654:
-#: zypp/CountryCode.cc:400
+#: zypp/CountryCode.cc:356
msgid "Slovenia"
msgstr "斯洛文尼亚"
#. language code: slv sl
-#: zypp/LanguageCode.cc:1004
+#: zypp/LanguageCode.cc:959
msgid "Slovenian"
msgstr "斯洛文尼亚语"
#. language code: sog
-#: zypp/LanguageCode.cc:1026
+#: zypp/LanguageCode.cc:981
msgid "Sogdian"
msgstr "粟特语"
#. :SAU:682:
-#: zypp/CountryCode.cc:394
+#: zypp/CountryCode.cc:350
msgid "Solomon Islands"
msgstr "所罗门群岛"
#. language code: som so
-#: zypp/LanguageCode.cc:1028
+#: zypp/LanguageCode.cc:983
msgid "Somali"
msgstr "索马里语"
#. :SEN:686:
-#: zypp/CountryCode.cc:406
+#: zypp/CountryCode.cc:362
msgid "Somalia"
msgstr "索马里"
#. language code: son
-#: zypp/LanguageCode.cc:1030
+#: zypp/LanguageCode.cc:985
msgid "Songhai"
msgstr "桑海语"
#. language code: snk
-#: zypp/LanguageCode.cc:1024
+#: zypp/LanguageCode.cc:979
msgid "Soninke"
msgstr "索宁克语"
#. language code: wen
-#: zypp/LanguageCode.cc:1164
+#: zypp/LanguageCode.cc:1119
msgid "Sorbian Languages"
msgstr "索布诸语言"
@@ -3866,57 +3855,57 @@
msgstr "对不起,本版 libzypp 没有编译 HAL 支持。"
#. language code: sot st
-#: zypp/LanguageCode.cc:1032
+#: zypp/LanguageCode.cc:987
msgid "Sotho, Southern"
msgstr "南部索托语"
#. :MYT:175:
-#: zypp/CountryCode.cc:445
+#: zypp/CountryCode.cc:401
msgid "South Africa"
msgstr "南非"
#. language code: sai
-#: zypp/LanguageCode.cc:956
+#: zypp/LanguageCode.cc:911
msgid "South American Indian (Other)"
msgstr "南美洲印第安语 (其它)"
#. :GRC:300:
-#: zypp/CountryCode.cc:290
+#: zypp/CountryCode.cc:246
msgid "South Georgia and the South Sandwich Islands"
msgstr "南乔治亚岛和南三维治群岛"
#. :PRK:408:
-#: zypp/CountryCode.cc:322
+#: zypp/CountryCode.cc:278
msgid "South Korea"
msgstr "南韩"
#. language code: alt
-#: zypp/LanguageCode.cc:238
+#: zypp/LanguageCode.cc:193
msgid "Southern Altai"
msgstr "南阿尔泰语"
#. language code: sma
-#: zypp/LanguageCode.cc:1006
+#: zypp/LanguageCode.cc:961
msgid "Southern Sami"
msgstr "南萨摩斯语"
#. :ERI:232:
-#: zypp/CountryCode.cc:267
+#: zypp/CountryCode.cc:223
msgid "Spain"
msgstr "西班牙"
#. language code: spa es
-#: zypp/LanguageCode.cc:1034
+#: zypp/LanguageCode.cc:989
msgid "Spanish"
msgstr "西班牙语"
#. :LIE:438:
-#: zypp/CountryCode.cc:330
+#: zypp/CountryCode.cc:286
msgid "Sri Lanka"
msgstr "斯里兰卡"
#. :SYC:690:
-#: zypp/CountryCode.cc:396
+#: zypp/CountryCode.cc:352
msgid "Sudan"
msgstr "苏丹"
@@ -3925,17 +3914,17 @@
msgstr "建议"
#. language code: suk
-#: zypp/LanguageCode.cc:1044
+#: zypp/LanguageCode.cc:999
msgid "Sukuma"
msgstr "苏库马语"
#. language code: sux
-#: zypp/LanguageCode.cc:1050
+#: zypp/LanguageCode.cc:1005
msgid "Sumerian"
msgstr "苏美尔语"
#. language code: sun su
-#: zypp/LanguageCode.cc:1046
+#: zypp/LanguageCode.cc:1001
msgid "Sundanese"
msgstr "巽他语"
@@ -3944,57 +3933,57 @@
msgstr "补充"
#. :SOM:706:
-#: zypp/CountryCode.cc:407
+#: zypp/CountryCode.cc:363
msgid "Suriname"
msgstr "苏里南"
#. language code: sus
-#: zypp/LanguageCode.cc:1048
+#: zypp/LanguageCode.cc:1003
msgid "Susu"
msgstr "苏苏语"
#. :SVN:705:
-#: zypp/CountryCode.cc:401
+#: zypp/CountryCode.cc:357
msgid "Svalbard and Jan Mayen"
msgstr "斯瓦尔巴岛和扬马延岛"
#. language code: swa sw
-#: zypp/LanguageCode.cc:1052
+#: zypp/LanguageCode.cc:1007
msgid "Swahili"
msgstr "斯瓦希里语"
#. language code: ssw ss
-#: zypp/LanguageCode.cc:1042
+#: zypp/LanguageCode.cc:997
msgid "Swati"
msgstr "斯瓦特语"
#. :SYR:760:
-#: zypp/CountryCode.cc:411
+#: zypp/CountryCode.cc:367
msgid "Swaziland"
msgstr "斯威士兰"
#. :SDN:736:
-#: zypp/CountryCode.cc:397
+#: zypp/CountryCode.cc:353
msgid "Sweden"
msgstr "瑞典"
#. language code: swe sv
-#: zypp/LanguageCode.cc:1054
+#: zypp/LanguageCode.cc:1009
msgid "Swedish"
msgstr "瑞典语"
#. :COG:178:
-#: zypp/CountryCode.cc:243
+#: zypp/CountryCode.cc:199
msgid "Switzerland"
msgstr "瑞士"
#. :SLV:222:
-#: zypp/CountryCode.cc:410
+#: zypp/CountryCode.cc:366
msgid "Syria"
msgstr "叙利亚共和国"
#. language code: syr
-#: zypp/LanguageCode.cc:1056
+#: zypp/LanguageCode.cc:1011
msgid "Syriac"
msgstr "古叙利亚语"
@@ -4013,77 +4002,77 @@
"请关闭此应用程序再试。"
#. language code: tgl tl
-#: zypp/LanguageCode.cc:1076
+#: zypp/LanguageCode.cc:1031
msgid "Tagalog"
msgstr "塔加路语"
#. language code: tah ty
-#: zypp/LanguageCode.cc:1058
+#: zypp/LanguageCode.cc:1013
msgid "Tahitian"
msgstr "塔希提语"
#. language code: tai
-#: zypp/LanguageCode.cc:1060
+#: zypp/LanguageCode.cc:1015
msgid "Tai (Other)"
msgstr "傣语 (其它)"
#. :TUV:798:
-#: zypp/CountryCode.cc:426
+#: zypp/CountryCode.cc:382
msgid "Taiwan"
msgstr "中国台湾"
#. language code: tgk tg
-#: zypp/LanguageCode.cc:1074
+#: zypp/LanguageCode.cc:1029
msgid "Tajik"
msgstr "塔吉克语"
#. :THA:764:
-#: zypp/CountryCode.cc:417
+#: zypp/CountryCode.cc:373
msgid "Tajikistan"
msgstr "塔吉克斯坦"
#. language code: tmh
-#: zypp/LanguageCode.cc:1096
+#: zypp/LanguageCode.cc:1051
msgid "Tamashek"
msgstr "塔马奇克语"
#. language code: tam ta
-#: zypp/LanguageCode.cc:1062
+#: zypp/LanguageCode.cc:1017
msgid "Tamil"
msgstr "泰米尔语"
#. :TWN:158:
-#: zypp/CountryCode.cc:427
+#: zypp/CountryCode.cc:383
msgid "Tanzania"
msgstr "坦桑尼亚"
#. language code: tat tt
-#: zypp/LanguageCode.cc:1064
+#: zypp/LanguageCode.cc:1019
msgid "Tatar"
msgstr "鞑靼语"
#. language code: tel te
-#: zypp/LanguageCode.cc:1066
+#: zypp/LanguageCode.cc:1021
msgid "Telugu"
msgstr "泰卢固语"
#. language code: ter
-#: zypp/LanguageCode.cc:1070
+#: zypp/LanguageCode.cc:1025
msgid "Tereno"
msgstr "特列纳语"
#. language code: tet
-#: zypp/LanguageCode.cc:1072
+#: zypp/LanguageCode.cc:1027
msgid "Tetum"
msgstr "特塔姆语"
#. language code: tha th
-#: zypp/LanguageCode.cc:1078
+#: zypp/LanguageCode.cc:1033
msgid "Thai"
msgstr "泰国语"
#. :TGO:768:
-#: zypp/CountryCode.cc:416
+#: zypp/CountryCode.cc:372
msgid "Thailand"
msgstr "泰国"
@@ -4099,23 +4088,23 @@
msgid "This action is being run by another program already."
msgstr "此动作正在由另一个程序运行着。"
-#: zypp/solver/detail/SATResolver.cc:1294
-#: zypp/solver/detail/SATResolver.cc:1315
+#: zypp/solver/detail/SATResolver.cc:1215
+#: zypp/solver/detail/SATResolver.cc:1236
msgid "This request will break your system!"
msgstr "此请求将破坏您的系统!"
#. language code: tib bod bo
-#: zypp/LanguageCode.cc:1080 zypp/LanguageCode.cc:1082
+#: zypp/LanguageCode.cc:1035 zypp/LanguageCode.cc:1037
msgid "Tibetan"
msgstr "藏语"
#. language code: tig
-#: zypp/LanguageCode.cc:1084
+#: zypp/LanguageCode.cc:1039
msgid "Tigre"
msgstr "提格雷语"
#. language code: tir ti
-#: zypp/LanguageCode.cc:1086
+#: zypp/LanguageCode.cc:1041
msgid "Tigrinya"
msgstr "提格里尼亚语"
@@ -4125,48 +4114,48 @@
msgstr "访问 '%s' 时超时。"
#. language code: tem
-#: zypp/LanguageCode.cc:1068
+#: zypp/LanguageCode.cc:1023
msgid "Timne"
msgstr "滕内语"
#. language code: tiv
-#: zypp/LanguageCode.cc:1088
+#: zypp/LanguageCode.cc:1043
msgid "Tiv"
msgstr "蒂夫语"
#. language code: tli
-#: zypp/LanguageCode.cc:1094
+#: zypp/LanguageCode.cc:1049
msgid "Tlingit"
msgstr "特林吉特语"
#. :ATF:260:
-#: zypp/CountryCode.cc:415
+#: zypp/CountryCode.cc:371
msgid "Togo"
msgstr "多哥"
#. language code: tpi
-#: zypp/LanguageCode.cc:1102
+#: zypp/LanguageCode.cc:1057
msgid "Tok Pisin"
msgstr "托克皮辛语"
#. :TJK:762:
#. language code: tkl
-#: zypp/CountryCode.cc:418 zypp/LanguageCode.cc:1090
+#: zypp/CountryCode.cc:374 zypp/LanguageCode.cc:1045
msgid "Tokelau"
msgstr "托克劳语"
#. :TUN:788:
-#: zypp/CountryCode.cc:421
+#: zypp/CountryCode.cc:377
msgid "Tonga"
msgstr "汤加"
#. language code: tog
-#: zypp/LanguageCode.cc:1098
+#: zypp/LanguageCode.cc:1053
msgid "Tonga (Nyasa)"
msgstr "汤加语 (尼亚萨)"
#. language code: ton to
-#: zypp/LanguageCode.cc:1100
+#: zypp/LanguageCode.cc:1055
msgid "Tonga (Tonga Islands)"
msgstr "汤加语 (汤加岛)"
@@ -4176,118 +4165,118 @@
msgstr "尝试导入尚不存在的密钥 %s 到密钥环 %s"
#. :TUR:792:
-#: zypp/CountryCode.cc:424
+#: zypp/CountryCode.cc:380
msgid "Trinidad and Tobago"
msgstr "特立尼达和多巴哥"
#. language code: tsi
-#: zypp/LanguageCode.cc:1104
+#: zypp/LanguageCode.cc:1059
msgid "Tsimshian"
msgstr "钦西安语"
#. language code: tso ts
-#: zypp/LanguageCode.cc:1108
+#: zypp/LanguageCode.cc:1063
msgid "Tsonga"
msgstr "聪加语"
#. language code: tsn tn
-#: zypp/LanguageCode.cc:1106
+#: zypp/LanguageCode.cc:1061
msgid "Tswana"
msgstr "茨瓦纳语"
#. language code: tum
-#: zypp/LanguageCode.cc:1112
+#: zypp/LanguageCode.cc:1067
msgid "Tumbuka"
msgstr "奇图姆布卡语"
#. :TKM:795:
-#: zypp/CountryCode.cc:420
+#: zypp/CountryCode.cc:376
msgid "Tunisia"
msgstr "突尼斯"
#. language code: tup
-#: zypp/LanguageCode.cc:1114
+#: zypp/LanguageCode.cc:1069
msgid "Tupi Languages"
msgstr "图皮诸语言"
#. :TLS:626:
-#: zypp/CountryCode.cc:423
+#: zypp/CountryCode.cc:379
msgid "Turkey"
msgstr "土耳其"
#. language code: tur tr
-#: zypp/LanguageCode.cc:1116
+#: zypp/LanguageCode.cc:1071
msgid "Turkish"
msgstr "土耳其语"
#. language code: ota
-#: zypp/LanguageCode.cc:886
+#: zypp/LanguageCode.cc:841
msgid "Turkish, Ottoman (1500-1928)"
msgstr "土耳其语,古奥斯曼 (1500-1928)"
#. language code: tuk tk
-#: zypp/LanguageCode.cc:1110
+#: zypp/LanguageCode.cc:1065
msgid "Turkmen"
msgstr "土库曼语"
#. :TKL:772:
-#: zypp/CountryCode.cc:419
+#: zypp/CountryCode.cc:375
msgid "Turkmenistan"
msgstr "土库曼斯坦"
#. :SWZ:748:
-#: zypp/CountryCode.cc:412
+#: zypp/CountryCode.cc:368
msgid "Turks and Caicos Islands"
msgstr "特克斯和凯科斯群岛"
#. :TTO:780:
#. language code: tvl
-#: zypp/CountryCode.cc:425 zypp/LanguageCode.cc:1120
+#: zypp/CountryCode.cc:381 zypp/LanguageCode.cc:1075
msgid "Tuvalu"
msgstr "图瓦卢语"
#. language code: tyv
-#: zypp/LanguageCode.cc:1124
+#: zypp/LanguageCode.cc:1079
msgid "Tuvinian"
msgstr "图瓦语"
#. language code: twi tw
-#: zypp/LanguageCode.cc:1122
+#: zypp/LanguageCode.cc:1077
msgid "Twi"
msgstr "契维语"
#. language code: udm
-#: zypp/LanguageCode.cc:1126
+#: zypp/LanguageCode.cc:1081
msgid "Udmurt"
msgstr "乌德穆尔特语"
#. :UKR:804:
-#: zypp/CountryCode.cc:429
+#: zypp/CountryCode.cc:385
msgid "Uganda"
msgstr "乌干达"
#. language code: uga
-#: zypp/LanguageCode.cc:1128
+#: zypp/LanguageCode.cc:1083
msgid "Ugaritic"
msgstr "乌加里特语"
#. language code: uig ug
-#: zypp/LanguageCode.cc:1130
+#: zypp/LanguageCode.cc:1085
msgid "Uighur"
msgstr "维吾尔语"
#. :TZA:834:
-#: zypp/CountryCode.cc:428
+#: zypp/CountryCode.cc:384
msgid "Ukraine"
msgstr "乌克兰"
#. language code: ukr uk
-#: zypp/LanguageCode.cc:1132
+#: zypp/LanguageCode.cc:1087
msgid "Ukrainian"
msgstr "乌克兰语"
#. language code: umb
-#: zypp/LanguageCode.cc:1134
+#: zypp/LanguageCode.cc:1089
msgid "Umbundu"
msgstr "翁本杜语"
@@ -4308,54 +4297,54 @@
msgstr "无法解析 URL 组件"
#. language code: und
-#: zypp/LanguageCode.cc:1136
+#: zypp/LanguageCode.cc:1091
msgid "Undetermined"
msgstr "未确定的语种"
-#: zypp/RepoManager.cc:1306
+#: zypp/RepoManager.cc:1307
msgid "Unhandled repository type"
msgstr "未处理的软件源类型"
#. :AND:020:
-#: zypp/CountryCode.cc:203
+#: zypp/CountryCode.cc:159
msgid "United Arab Emirates"
msgstr "阿拉伯联合酋长国"
#. :GAB:266:
-#: zypp/CountryCode.cc:277
+#: zypp/CountryCode.cc:233
msgid "United Kingdom"
msgstr "英国"
#. :UMI:581:
-#: zypp/CountryCode.cc:431
+#: zypp/CountryCode.cc:387
msgid "United States"
msgstr "美国"
#. :UGA:800:
-#: zypp/CountryCode.cc:430
+#: zypp/CountryCode.cc:386
msgid "United States Minor Outlying Islands"
msgstr "美国本土外小岛屿"
-#: zypp/CountryCode.cc:113
+#: zypp/CountryCode.cc:50
msgid "Unknown country: "
msgstr "未知国家或地区:"
#. TranslatorExplanation '%s' is an URL
-#: zypp/RepoManager.cc:1389 zypp/RepoManager.cc:2323
+#: zypp/RepoManager.cc:1397 zypp/RepoManager.cc:2410
#, c-format, boost-format
msgid "Unknown error reading from '%s'"
msgstr "读取 '%s' 遇到未知错误"
-#: zypp/LanguageCode.cc:113
+#: zypp/LanguageCode.cc:49
msgid "Unknown language: "
msgstr "未知语言:"
-#: zypp/base/StrMatcher.cc:151
+#: zypp/base/StrMatcher.cc:152
#, c-format, boost-format
msgid "Unknown match mode '%s'"
msgstr "未知匹配模式 '%s'"
-#: zypp/base/StrMatcher.cc:152
+#: zypp/base/StrMatcher.cc:153
#, c-format, boost-format
msgid "Unknown match mode '%s' for pattern '%s'"
msgstr "未知匹配模式 '%s' 于软件集 '%s'"
@@ -4363,7 +4352,7 @@
#. translators: Cleanup a repository previously owned by a meanwhile unknown (deleted) service.
#. %1% = service name
#. %2% = repository name
-#: zypp/RepoManager.cc:778
+#: zypp/RepoManager.cc:779
#, boost-format
msgid "Unknown service '%1%': Removing orphaned service repository '%2%'"
msgstr "未知服务 '%1%':正在移除孤立的服务软件源 '%2%'"
@@ -4373,7 +4362,7 @@
msgstr "未知支持选项。描述不可用"
#. translators: possible rpm package signature check result [brief]
-#: zypp/target/rpm/RpmDb.cc:2371
+#: zypp/target/rpm/RpmDb.cc:2368
msgid "Unknown type of signature"
msgstr "未知签名类型"
@@ -4388,12 +4377,12 @@
msgstr "不支持 '%s' 中的 URI 方案。"
#. language code: hsb
-#: zypp/LanguageCode.cc:580
+#: zypp/LanguageCode.cc:535
msgid "Upper Sorbian"
msgstr "高地索布语"
#. language code: urd ur
-#: zypp/LanguageCode.cc:1138
+#: zypp/LanguageCode.cc:1093
msgid "Urdu"
msgstr "乌尔都语"
@@ -4431,193 +4420,199 @@
msgstr "URL 方案要求有路径名"
#. :USA:840:
-#: zypp/CountryCode.cc:432
+#: zypp/CountryCode.cc:388
msgid "Uruguay"
msgstr "乌拉圭"
#. language code: uzb uz
-#: zypp/LanguageCode.cc:1140
+#: zypp/LanguageCode.cc:1095
msgid "Uzbek"
msgstr "乌兹别克斯坦语"
#. :URY:858:
-#: zypp/CountryCode.cc:433
+#: zypp/CountryCode.cc:389
msgid "Uzbekistan"
msgstr "乌兹别克斯坦"
#. language code: vai
-#: zypp/LanguageCode.cc:1142
+#: zypp/LanguageCode.cc:1097
msgid "Vai"
msgstr "瓦伊语"
+#. we will throw this later if no URL checks out fine
+#: zypp/RepoManager.cc:1012
+#, fuzzy
+#| msgid "Valid metadata not found at specified URL(s)"
+msgid "Valid metadata not found at specified URL"
+msgid_plural "Valid metadata not found at specified URLs"
+msgstr[0] "在指定 URL 未找到有效元数据"
+
#. :VNM:704:
-#: zypp/CountryCode.cc:440
+#: zypp/CountryCode.cc:396
msgid "Vanuatu"
msgstr "瓦努阿图"
#. language code: ven ve
-#: zypp/LanguageCode.cc:1144
+#: zypp/LanguageCode.cc:1099
msgid "Venda"
msgstr "文达语"
#. :VCT:670:
-#: zypp/CountryCode.cc:436
+#: zypp/CountryCode.cc:392
msgid "Venezuela"
msgstr "委内瑞拉"
#. :VIR:850:
-#: zypp/CountryCode.cc:439
+#: zypp/CountryCode.cc:395
msgid "Vietnam"
msgstr "越南"
#. language code: vie vi
-#: zypp/LanguageCode.cc:1146
+#: zypp/LanguageCode.cc:1101
msgid "Vietnamese"
msgstr "越南语"
#. :VGB:092:
-#: zypp/CountryCode.cc:438
+#: zypp/CountryCode.cc:394
msgid "Virgin Islands, U.S."
msgstr "美属维尔京群岛"
#: zypp/media/MediaCurl.cc:1006
-msgid ""
-"Visit the Novell Customer Center to check whether your registration is valid "
-"and has not expired."
+msgid "Visit the Novell Customer Center to check whether your registration is valid and has not expired."
msgstr "造访 Novell 客户中心检查您的注册是否有效并尚未过期。"
#. language code: vol vo
-#: zypp/LanguageCode.cc:1148
+#: zypp/LanguageCode.cc:1103
msgid "Volapuk"
msgstr "沃拉普克语"
#. language code: vot
-#: zypp/LanguageCode.cc:1150
+#: zypp/LanguageCode.cc:1105
msgid "Votic"
msgstr "沃提克语"
#. language code: wak
-#: zypp/LanguageCode.cc:1152
+#: zypp/LanguageCode.cc:1107
msgid "Wakashan Languages"
msgstr "瓦卡希语组"
#. language code: wal
-#: zypp/LanguageCode.cc:1154
+#: zypp/LanguageCode.cc:1109
msgid "Walamo"
msgstr "瓦拉莫语"
#. :VUT:548:
-#: zypp/CountryCode.cc:441
+#: zypp/CountryCode.cc:397
msgid "Wallis and Futuna"
msgstr "瓦利斯和富图纳"
#. language code: wln wa
-#: zypp/LanguageCode.cc:1166
+#: zypp/LanguageCode.cc:1121
msgid "Walloon"
msgstr "瓦龙语"
#. language code: war
-#: zypp/LanguageCode.cc:1156
+#: zypp/LanguageCode.cc:1111
msgid "Waray"
msgstr "瓦赖语"
#. language code: was
-#: zypp/LanguageCode.cc:1158
+#: zypp/LanguageCode.cc:1113
msgid "Washo"
msgstr "瓦肖语"
#. language code: wel cym cy
-#: zypp/LanguageCode.cc:1160 zypp/LanguageCode.cc:1162
+#: zypp/LanguageCode.cc:1115 zypp/LanguageCode.cc:1117
msgid "Welsh"
msgstr "威尔士语"
#. :EGY:818:
-#: zypp/CountryCode.cc:265
+#: zypp/CountryCode.cc:221
msgid "Western Sahara"
msgstr "西撒哈拉"
#. language code: wol wo
-#: zypp/LanguageCode.cc:1168
+#: zypp/LanguageCode.cc:1123
msgid "Wolof"
msgstr "沃洛夫语"
#. language code: xho xh
-#: zypp/LanguageCode.cc:1172
+#: zypp/LanguageCode.cc:1127
msgid "Xhosa"
msgstr "科萨语"
#. language code: sah
-#: zypp/LanguageCode.cc:954
+#: zypp/LanguageCode.cc:909
msgid "Yakut"
msgstr "雅库特语"
#. language code: yao
-#: zypp/LanguageCode.cc:1174
+#: zypp/LanguageCode.cc:1129
msgid "Yao"
msgstr "瑶语"
#. language code: yap
-#: zypp/LanguageCode.cc:1176
+#: zypp/LanguageCode.cc:1131
msgid "Yapese"
msgstr "雅浦语"
#. :WSM:882:
-#: zypp/CountryCode.cc:443
+#: zypp/CountryCode.cc:399
msgid "Yemen"
msgstr "也门"
#. language code: yid yi
-#: zypp/LanguageCode.cc:1178
+#: zypp/LanguageCode.cc:1133
msgid "Yiddish"
msgstr "依地语"
#. language code: yor yo
-#: zypp/LanguageCode.cc:1180
+#: zypp/LanguageCode.cc:1135
msgid "Yoruba"
msgstr "约鲁巴语"
#. language code: ypk
-#: zypp/LanguageCode.cc:1182
+#: zypp/LanguageCode.cc:1137
msgid "Yupik Languages"
msgstr "尤皮克诸语言"
#. :ZAF:710:
-#: zypp/CountryCode.cc:446
+#: zypp/CountryCode.cc:402
msgid "Zambia"
msgstr "赞比亚"
#. language code: znd
-#: zypp/LanguageCode.cc:1190
+#: zypp/LanguageCode.cc:1145
msgid "Zande"
msgstr "赞德语"
#. language code: zap
-#: zypp/LanguageCode.cc:1184
+#: zypp/LanguageCode.cc:1139
msgid "Zapotec"
msgstr "萨波特克语"
#. language code: zen
-#: zypp/LanguageCode.cc:1186
+#: zypp/LanguageCode.cc:1141
msgid "Zenaga"
msgstr "哲纳加语"
#. language code: zha za
-#: zypp/LanguageCode.cc:1188
+#: zypp/LanguageCode.cc:1143
msgid "Zhuang"
msgstr "壮语"
#. :ZMB:894:
-#: zypp/CountryCode.cc:447
+#: zypp/CountryCode.cc:403
msgid "Zimbabwe"
msgstr "津巴布韦"
#. language code: zul zu
-#: zypp/LanguageCode.cc:1192
+#: zypp/LanguageCode.cc:1147
msgid "Zulu"
msgstr "祖鲁语"
#. language code: zun
-#: zypp/LanguageCode.cc:1194
+#: zypp/LanguageCode.cc:1149
msgid "Zuni"
msgstr "祖尼语"
@@ -4629,7 +4624,7 @@
msgid "applydeltarpm failed."
msgstr "应用差异 RPM 失败。"
-#: zypp/solver/detail/SATResolver.cc:1402
+#: zypp/solver/detail/SATResolver.cc:1323
#, c-format, boost-format
msgid "architecture change of %s to %s"
msgstr "架构从 %s 变更到 %s"
@@ -4640,51 +4635,51 @@
msgid "break %s by ignoring some of its dependencies"
msgstr "通过忽略一些依赖关系来破坏 %s "
-#: zypp/solver/detail/SATResolver.cc:1096
+#: zypp/solver/detail/SATResolver.cc:1017
#, c-format, boost-format
msgid "cannot install both %s and %s"
msgstr "无法同时安装 %s 和 %s"
-#: zypp/solver/detail/SATResolver.cc:1065
+#: zypp/solver/detail/SATResolver.cc:986
msgid "conflicting requests"
msgstr "冲突的请求"
-#: zypp/target/rpm/RpmDb.cc:2348
+#: zypp/target/rpm/RpmDb.cc:2345
#, c-format, boost-format
msgid "created backup %s"
msgstr "已创建备份 %s"
-#: zypp/solver/detail/SATResolver.cc:1431
+#: zypp/solver/detail/SATResolver.cc:1352
#, c-format, boost-format
msgid "deinstallation of %s"
msgstr "卸载 %s"
-#: zypp/solver/detail/SATResolver.cc:1149
+#: zypp/solver/detail/SATResolver.cc:1070
msgid "deleted providers: "
msgstr "删除的提供者:"
-#: zypp/solver/detail/SATResolver.cc:1322
+#: zypp/solver/detail/SATResolver.cc:1243
#, c-format, boost-format
msgid "do not ask to delete all solvables providing %s"
msgstr "不询问就删除全部提供 %s 的解析项"
-#: zypp/solver/detail/SATResolver.cc:1300
+#: zypp/solver/detail/SATResolver.cc:1221
#, c-format, boost-format
msgid "do not ask to install a solvable providing %s"
msgstr "不询问就安装一个提供 %s 的解析项"
-#: zypp/solver/detail/SATResolver.cc:1223
-#: zypp/solver/detail/SATResolver.cc:1259
+#: zypp/solver/detail/SATResolver.cc:1144
+#: zypp/solver/detail/SATResolver.cc:1180
#, c-format, boost-format
msgid "do not install %s"
msgstr "不安装 %s"
-#: zypp/solver/detail/SATResolver.cc:1335
+#: zypp/solver/detail/SATResolver.cc:1256
#, c-format, boost-format
msgid "do not install most recent version of %s"
msgstr "不安装最新版本的 %s"
-#: zypp/solver/detail/SATResolver.cc:1395
+#: zypp/solver/detail/SATResolver.cc:1316
#, c-format, boost-format
msgid "downgrade of %s to %s"
msgstr "降级 %s 到 %s"
@@ -4693,12 +4688,12 @@
msgid "generally ignore of some dependencies"
msgstr "通常忽略一些依赖关系"
-#: zypp/solver/detail/SATResolver.cc:1295
-#: zypp/solver/detail/SATResolver.cc:1316
+#: zypp/solver/detail/SATResolver.cc:1216
+#: zypp/solver/detail/SATResolver.cc:1237
msgid "ignore the warning of a broken system"
msgstr "忽略损坏系统的警告"
-#: zypp/solver/detail/SATResolver.cc:1411
+#: zypp/solver/detail/SATResolver.cc:1332
#, c-format, boost-format
msgid ""
"install %s (with vendor change)\n"
@@ -4707,17 +4702,17 @@
"安装 %s (包括厂商变更)\n"
" %s --> %s"
-#: zypp/solver/detail/SATResolver.cc:1361
+#: zypp/solver/detail/SATResolver.cc:1282
#, c-format, boost-format
msgid "install %s despite the inferior architecture"
msgstr "尽管架构不对应仍安装 %s"
-#: zypp/solver/detail/SATResolver.cc:1375
+#: zypp/solver/detail/SATResolver.cc:1296
#, c-format, boost-format
msgid "install %s from excluded repository"
msgstr "从排除的软件源安装 %s"
-#: zypp/solver/detail/SATResolver.cc:1111
+#: zypp/solver/detail/SATResolver.cc:1032
#, c-format, boost-format
msgid "installed %s obsoletes %s provided by %s"
msgstr "已安装的 %s 淘汰了 %s,后者由 %s 提供"
@@ -4726,18 +4721,18 @@
msgid "invalid"
msgstr "无效"
-#: zypp/solver/detail/SATResolver.cc:1238
-#: zypp/solver/detail/SATResolver.cc:1280
+#: zypp/solver/detail/SATResolver.cc:1159
+#: zypp/solver/detail/SATResolver.cc:1201
#, c-format, boost-format
msgid "keep %s"
msgstr "保留 %s"
-#: zypp/solver/detail/SATResolver.cc:1356
+#: zypp/solver/detail/SATResolver.cc:1277
#, c-format, boost-format
msgid "keep %s despite the inferior architecture"
msgstr "保留 %s,即使架构不对应"
-#: zypp/solver/detail/SATResolver.cc:1370
+#: zypp/solver/detail/SATResolver.cc:1291
#, c-format, boost-format
msgid "keep obsolete %s"
msgstr "保留已淘汰的 %s"
@@ -4750,49 +4745,49 @@
msgid "libhal_set_dbus_connection: Can't set dbus connection"
msgstr "libhal_set_dbus_connection:无法设置 dbus 连接"
-#: zypp/solver/detail/SATResolver.cc:1091
+#: zypp/solver/detail/SATResolver.cc:1012
#, c-format, boost-format
msgid "nothing provides %s needed by %s"
msgstr "没有什么能提供 %s,而它为 %s 所需"
-#: zypp/solver/detail/SATResolver.cc:1071
+#: zypp/solver/detail/SATResolver.cc:992
#, c-format, boost-format
msgid "nothing provides requested %s"
msgstr "没有什么能提供所需的 %s"
-#: zypp/solver/detail/SATResolver.cc:1075
+#: zypp/solver/detail/SATResolver.cc:996
#, c-format, boost-format
msgid "package %s does not exist"
msgstr "软件包 %s 不存在"
-#: zypp/solver/detail/SATResolver.cc:1062
+#: zypp/solver/detail/SATResolver.cc:983
#, c-format, boost-format
msgid "problem with installed package %s"
msgstr "已安装的 %s 软件包有问题"
-#: zypp/solver/detail/SATResolver.cc:1243
+#: zypp/solver/detail/SATResolver.cc:1164
#, c-format, boost-format
msgid "remove lock to allow installation of %s"
msgstr "移除锁定以允许安装 %s"
-#: zypp/solver/detail/SATResolver.cc:1218
+#: zypp/solver/detail/SATResolver.cc:1139
#, c-format, boost-format
msgid "remove lock to allow removal of %s"
msgstr "移除锁定以允许移除 %s"
-#: zypp/solver/detail/SATResolver.cc:1420
+#: zypp/solver/detail/SATResolver.cc:1341
#, c-format, boost-format
msgid "replacement of %s with %s"
msgstr "将 %s 用 %s 取代"
#. %s = filenames
-#: zypp/target/rpm/RpmDb.cc:2031
+#: zypp/target/rpm/RpmDb.cc:2030
#, c-format, boost-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm 已将 %s 创建为 %s,但是无法确定两者的差异"
#. %s = filenames
-#: zypp/target/rpm/RpmDb.cc:2033
+#: zypp/target/rpm/RpmDb.cc:2032
#, c-format, boost-format
msgid ""
"rpm created %s as %s.\n"
@@ -4802,13 +4797,13 @@
"以下是前 25 行差异:\n"
#. %s = filenames
-#: zypp/target/rpm/RpmDb.cc:2026
+#: zypp/target/rpm/RpmDb.cc:2025
#, c-format, boost-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm 已将 %s 另存为 %s,但是无法确定两者的差异"
#. %s = filenames
-#: zypp/target/rpm/RpmDb.cc:2028
+#: zypp/target/rpm/RpmDb.cc:2027
#, c-format, boost-format
msgid ""
"rpm saved %s as %s.\n"
@@ -4817,16 +4812,16 @@
"rpm 已将 %s 另存为 %s。\n"
"以下是前 25 行差异:\n"
-#: zypp/solver/detail/SATResolver.cc:1115
+#: zypp/solver/detail/SATResolver.cc:1036
#, c-format, boost-format
msgid "solvable %s conflicts with %s provided by itself"
msgstr "可解析项 %s 与自身提供的 %s 冲突"
-#: zypp/solver/detail/SATResolver.cc:1068
+#: zypp/solver/detail/SATResolver.cc:989
msgid "some dependency problem"
msgstr "一些依赖性问题"
-#: zypp/solver/detail/SATResolver.cc:1161
+#: zypp/solver/detail/SATResolver.cc:1082
msgid "uninstallable providers: "
msgstr "不可安装的提供者:"
@@ -4838,7 +4833,7 @@
msgid "unsupported"
msgstr "不支持"
-#: zypp/solver/detail/SATResolver.cc:1079
+#: zypp/solver/detail/SATResolver.cc:1000
msgid "unsupported request"
msgstr "不支持的请求"
@@ -4866,12 +4861,8 @@
#~ msgid "Download interrupted by user"
#~ msgstr "下载被用户中断"
-#~ msgid ""
-#~ "Error occurred while setting download (metalink curl) options for '%s':"
+#~ msgid "Error occurred while setting download (metalink curl) options for '%s':"
#~ msgstr "为 '%s' 设置下载 (metalink curl) 选项时出错:"
#~ msgid "Failed to download %s from %s"
#~ msgstr "下载 %s 从 %s 时失败"
-
-#~ msgid "Valid metadata not found at specified URL(s)"
-#~ msgstr "在指定 URL 未找到有效元数据"