Author: ramax
Date: 2015-07-30 17:19:15 +0200 (Thu, 30 Jul 2015)
New Revision: 92194
Modified:
trunk/lcn/zh_TW/po/zypp.zh_TW.po
Log:
zypp zh_TW merged
Modified: trunk/lcn/zh_TW/po/zypp.zh_TW.po
===================================================================
--- trunk/lcn/zh_TW/po/zypp.zh_TW.po 2015-07-29 22:47:49 UTC (rev 92193)
+++ trunk/lcn/zh_TW/po/zypp.zh_TW.po 2015-07-30 15:19:15 UTC (rev 92194)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-21 01:13+0200\n"
+"POT-Creation-Date: 2015-07-23 01:13+0200\n"
"PO-Revision-Date: 2015-05-25 22:32+0800\n"
"Last-Translator: Ramax Lo \n"
"Language-Team: Chinese Traditional \n"
@@ -22,7 +22,7 @@
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Lokalize 1.4\n"
-#: zypp/solver/detail/SATResolver.cc:1145
+#: zypp/solver/detail/SATResolver.cc:1159
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:442
+#: zypp/target/TargetImpl.cc:439
msgid " executed"
msgstr "執行"
-#: zypp/target/TargetImpl.cc:464
+#: zypp/target/TargetImpl.cc:461
msgid " execution failed"
msgstr "執行失敗"
-#: zypp/target/TargetImpl.cc:591
+#: zypp/target/TargetImpl.cc:588
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:581
+#: zypp/target/TargetImpl.cc:578
#, c-format, boost-format
msgid "%s already executed as %s)"
msgstr "%s 已被作為 %s 執行)"
-#: zypp/solver/detail/SATResolver.cc:1087
+#: zypp/solver/detail/SATResolver.cc:1101
#, c-format, boost-format
msgid "%s conflicts with %s provided by %s"
msgstr "%s 與 %s 衝突(由 %s 提供)"
-#: zypp/solver/detail/SATResolver.cc:1040
+#: zypp/solver/detail/SATResolver.cc:1054
#, c-format, boost-format
msgid "%s does not belong to a distupgrade repository"
msgstr "%s 不屬於一個版本升級套件庫"
-#: zypp/solver/detail/SATResolver.cc:1044
+#: zypp/solver/detail/SATResolver.cc:1058
#, c-format, boost-format
msgid "%s has inferior architecture"
msgstr "%s 有次要架構"
-#: zypp/solver/detail/SATResolver.cc:1072
+#: zypp/solver/detail/SATResolver.cc:1086
#, c-format, boost-format
msgid "%s is not installable"
msgstr "%s 無法安裝"
-#: zypp/solver/detail/SATResolver.cc:1068
+#: zypp/solver/detail/SATResolver.cc:1082
#, c-format, boost-format
msgid "%s is provided by the system and cannot be erased"
msgstr "%s 是由系統提供,且無法被清除。"
-#: zypp/solver/detail/SATResolver.cc:1092
+#: zypp/solver/detail/SATResolver.cc:1106
#, c-format, boost-format
msgid "%s obsoletes %s provided by %s"
msgstr "%s 汰換 %s (由 %s 提供)"
-#: zypp/solver/detail/SATResolver.cc:1133
+#: zypp/solver/detail/SATResolver.cc:1147
#, c-format, boost-format
msgid "%s requires %s, but this requirement cannot be provided"
msgstr "%s 需要 %s,但無法提供此需求"
@@ -125,7 +125,7 @@
msgid "Adangme"
msgstr "阿當梅語"
-#: zypp/RepoManager.cc:1505
+#: zypp/RepoManager.cc:1511
#, c-format, boost-format
msgid "Adding repository '%s'"
msgstr "正在新增套件庫 '%s'"
@@ -136,7 +136,7 @@
#. report additional rpm output in finish
#. TranslatorExplanation Text is followed by a ':' and the actual output.
-#: zypp/target/rpm/RpmDb.cc:2058 zypp/target/rpm/RpmDb.cc:2205
+#: zypp/target/rpm/RpmDb.cc:2059 zypp/target/rpm/RpmDb.cc:2206
msgid "Additional rpm output"
msgstr "其他 rpm 輸出"
@@ -354,7 +354,7 @@
msgstr "南島語系 (其他)"
#. !\todo add comma to the message for the next release
-#: zypp/media/MediaCIFS.cc:430 zypp/media/MediaCurl.cc:1680
+#: zypp/media/MediaCIFS.cc:430 zypp/media/MediaCurl.cc:1692
#, c-format, boost-format
msgid "Authentication required for '%s'"
msgstr "要求 '%s' 的驗證"
@@ -618,7 +618,7 @@
msgid "Buginese"
msgstr "布吉斯語"
-#: zypp/RepoManager.cc:1205
+#: zypp/RepoManager.cc:1211
#, c-format, boost-format
msgid "Building repository '%s' cache"
msgstr "正在建立套件庫 '%s' 的快取"
@@ -691,12 +691,12 @@
msgid "Can't chroot to '%s' (%s)."
msgstr "無法 chroot 到 '%s' (%s)。"
-#: zypp/RepoManager.cc:1061 zypp/RepoManager.cc:1169 zypp/RepoManager.cc:1219
+#: zypp/RepoManager.cc:1061 zypp/RepoManager.cc:1169 zypp/RepoManager.cc:1225
#, c-format, boost-format
msgid "Can't create %s"
msgstr "無法建立 %s"
-#: zypp/RepoManager.cc:1225
+#: zypp/RepoManager.cc:1231
#, c-format, boost-format
msgid "Can't create cache at %s - no writing permissions."
msgstr "無法在 %s 建立快取 - 無寫入權限。"
@@ -706,7 +706,7 @@
msgstr "無法建立中繼資料快取目錄。"
#. TranslatorExplanation '%s' is a filename
-#: zypp/RepoManager.cc:1682 zypp/RepoManager.cc:1871
+#: zypp/RepoManager.cc:1688 zypp/RepoManager.cc:1885
#, c-format, boost-format
msgid "Can't delete '%s'"
msgstr "無法刪除 '%s'"
@@ -717,11 +717,11 @@
msgid "Can't exec '%s' (%s)."
msgstr "無法執行 '%s' (%s)。"
-#: zypp/RepoManager.cc:1670 zypp/RepoManager.cc:1746
+#: zypp/RepoManager.cc:1676 zypp/RepoManager.cc:1752
msgid "Can't figure out where the repo is stored."
msgstr "無法找到套件庫儲存的位置。"
-#: zypp/RepoManager.cc:1859 zypp/RepoManager.cc:2235
+#: zypp/RepoManager.cc:1873 zypp/RepoManager.cc:2249
msgid "Can't figure out where the service is stored."
msgstr "無法找到服務儲存的位置。"
@@ -739,8 +739,8 @@
msgstr "無法啟始化遞迴 mutex"
#. TranslatorExplanation '%s' is a filename
-#: zypp/RepoManager.cc:651 zypp/RepoManager.cc:1544 zypp/RepoManager.cc:1626
-#: zypp/RepoManager.cc:1700 zypp/RepoManager.cc:1765 zypp/RepoManager.cc:1883
+#: zypp/RepoManager.cc:651 zypp/RepoManager.cc:1550 zypp/RepoManager.cc:1632
+#: zypp/RepoManager.cc:1706 zypp/RepoManager.cc:1771 zypp/RepoManager.cc:1897
#, c-format, boost-format
msgid "Can't open file '%s' for writing."
msgstr "無法開啟檔案 '%s' 來寫入。"
@@ -874,7 +874,7 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: zypp/target/rpm/RpmDb.cc:1849
+#: zypp/target/rpm/RpmDb.cc:1850
#, c-format, boost-format
msgid "Changed configuration files for %s:"
msgstr "%s 的已變更組態檔:"
@@ -1307,9 +1307,9 @@
msgid "Error occurred while setting download (curl) options for '%s':"
msgstr "為 '%s' 設定下載(curl)參數時發生錯誤:"
-#: zypp/target/TargetImpl.cc:646 zypp/target/TargetImpl.cc:666
-#: zypp/target/TargetImpl.cc:694 zypp/target/TargetImpl.cc:731
-#: zypp/target/TargetImpl.cc:739
+#: 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
msgid "Error sending update message notification."
msgstr "發送更新訊息提醒失敗。"
@@ -1319,7 +1319,7 @@
#. on ftp file-not-found(bnc #335906). Instead we'll check another types
#. before throwing.
#. TranslatorExplanation '%s' is an URL
-#: zypp/RepoManager.cc:1330 zypp/RepoManager.cc:2301
+#: zypp/RepoManager.cc:1336 zypp/RepoManager.cc:2315
#, c-format, boost-format
msgid "Error trying to read from '%s'"
msgstr "嘗試自 '%s' 讀取時發生錯誤"
@@ -1359,7 +1359,7 @@
msgid "Ewondo"
msgstr "埃翁多語"
-#: zypp/RepoManager.cc:1289
+#: zypp/RepoManager.cc:1295
#, c-format, boost-format
msgid "Failed to cache repo (%d)."
msgstr "快取套件庫失敗 (%d)."
@@ -1368,7 +1368,7 @@
msgid "Failed to delete key."
msgstr "刪除金鑰失敗。"
-#: zypp/target/rpm/RpmDb.cc:1127
+#: zypp/target/rpm/RpmDb.cc:1128
#, c-format, boost-format
msgid "Failed to import public key from file %s: %s"
msgstr "從檔案 %s 匯入公開金鑰失敗: %s"
@@ -1379,19 +1379,19 @@
msgstr "載掛 %s 在 %s 失敗"
#. TranslatorExplanation %s = name of the package being processed.
-#: zypp/repo/PackageProvider.cc:385
+#: zypp/repo/PackageProvider.cc:386
#, c-format, boost-format
msgid "Failed to provide Package %s. Do you want to retry retrieval?"
msgstr "無法提供套件 %s。您要嘗試重新取得嗎?"
#. TranslatorExplanation '%s' is a pathname
-#: zypp/RepoManager.cc:235 zypp/RepoManager.cc:696 zypp/RepoManager.cc:1417
+#: zypp/RepoManager.cc:235 zypp/RepoManager.cc:696 zypp/RepoManager.cc:1423
#: zypp/repo/PluginServices.cc:49
#, c-format, boost-format
msgid "Failed to read directory '%s'"
msgstr "無法讀取目錄 '%s'"
-#: zypp/target/rpm/RpmDb.cc:1198
+#: zypp/target/rpm/RpmDb.cc:1199
#, c-format, boost-format
msgid "Failed to remove public key %s: %s"
msgstr "移除公開金鑰 %s 失敗: %s"
@@ -1593,7 +1593,7 @@
msgstr "檔案 '%s' 無法在媒體 '%s' 中找到"
#. translators: possible rpm package signature check result [brief]
-#: zypp/target/rpm/RpmDb.cc:2378
+#: zypp/target/rpm/RpmDb.cc:2379
msgid "File does not exist or signature can't be checked"
msgstr "檔案不存在或是簽章無法驗證"
@@ -1617,8 +1617,7 @@
msgid "Finno-Ugrian (Other)"
msgstr "芬匈語 (其他)"
-#: zypp/solver/detail/ProblemSolutionCombi.cc:85
-#: zypp/solver/detail/ProblemSolutionCombi.cc:104
+#: zypp/ProblemSolution.cc:114
msgid "Following actions will be done:"
msgstr "下列行動將被執行:"
@@ -1903,8 +1902,8 @@
msgid "Hausa"
msgstr "豪薩語"
-#: zypp/solver/detail/SATResolver.cc:1058
-#: zypp/solver/detail/SATResolver.cc:1062
+#: zypp/solver/detail/SATResolver.cc:1072
+#: zypp/solver/detail/SATResolver.cc:1076
msgid "Have you enabled all requested repositories?"
msgstr "請問您已啟用所需的套件庫了嗎?"
@@ -2062,8 +2061,8 @@
msgid "Ingush"
msgstr "印古什語"
-#: zypp/target/TargetImpl.cc:1362 zypp/target/TargetImpl.cc:1431
-#: zypp/target/TargetImpl.cc:1760
+#: zypp/target/TargetImpl.cc:1372 zypp/target/TargetImpl.cc:1441
+#: zypp/target/TargetImpl.cc:1770
#: zypp/target/TargetImpl.commitFindFileConflicts.cc:166
msgid "Installation has been aborted as directed."
msgstr "安裝已如指示中止。"
@@ -2149,7 +2148,7 @@
msgstr "不正確的正規表示法 '%s': regcomp 回應 %d"
#. TranslatorExplanation '%s' is an URL
-#: zypp/RepoManager.cc:1612
+#: zypp/RepoManager.cc:1618
#, c-format, boost-format
msgid "Invalid repo file name at '%s'"
msgstr "不適用的套件庫檔案名稱在 '%s'"
@@ -3023,7 +3022,7 @@
msgid "New Zealand"
msgstr "紐西蘭"
-#: zypp/target/TargetImpl.cc:790
+#: zypp/target/TargetImpl.cc:787
msgid "New update message"
msgstr "新的更新提醒"
@@ -3430,8 +3429,8 @@
#. 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:2044
-#: zypp/target/rpm/RpmDb.cc:2191
+#: zypp/target/rpm/RpmDb.cc:850 zypp/target/rpm/RpmDb.cc:2045
+#: zypp/target/rpm/RpmDb.cc:2192
msgid "RPM failed: "
msgstr "RPM 失敗: "
@@ -3463,7 +3462,7 @@
msgid "Relative path not allowed if authority exists"
msgstr "如果授權存在,則不允許相對路徑"
-#: zypp/RepoManager.cc:1651
+#: zypp/RepoManager.cc:1657
#, c-format, boost-format
msgid "Removing repository '%s'"
msgstr "正在移除套件庫 '%s'"
@@ -3708,7 +3707,7 @@
msgstr "符號語言"
#. translators: possible rpm package signature check result [brief]
-#: zypp/target/rpm/RpmDb.cc:2372
+#: zypp/target/rpm/RpmDb.cc:2373
msgid "Signature does not verify"
msgstr "簽章無法驗證"
@@ -3718,21 +3717,21 @@
msgstr "找不到簽章檔 '%s'"
#. translators: possible rpm package signature check result [brief]
-#: zypp/target/rpm/RpmDb.cc:2368
+#: zypp/target/rpm/RpmDb.cc:2369
msgid "Signature is OK"
msgstr "簽章驗證正確"
#. translators: possible rpm package signature check result [brief]
-#: zypp/target/rpm/RpmDb.cc:2374
+#: zypp/target/rpm/RpmDb.cc:2375
msgid "Signature is OK, but key is not trusted"
msgstr "簽章驗證正確,然而金鑰是不被信任的"
-#: zypp/repo/PackageProvider.cc:215
+#: zypp/repo/PackageProvider.cc:216
msgid "Signature verification failed"
msgstr "簽章驗證失敗"
#. translators: possible rpm package signature check result [brief]
-#: zypp/target/rpm/RpmDb.cc:2376
+#: zypp/target/rpm/RpmDb.cc:2377
msgid "Signatures public key is not available"
msgstr "簽章用的公開金鑰不存在"
@@ -4074,8 +4073,8 @@
msgid "This action is being run by another program already."
msgstr "此行動已被其他程式執行。"
-#: zypp/solver/detail/SATResolver.cc:1280
-#: zypp/solver/detail/SATResolver.cc:1301
+#: zypp/solver/detail/SATResolver.cc:1294
+#: zypp/solver/detail/SATResolver.cc:1315
msgid "This request will break your system!"
msgstr "此要求將破壞您的系統!"
@@ -4287,7 +4286,7 @@
msgid "Undetermined"
msgstr "未確定的"
-#: zypp/RepoManager.cc:1300
+#: zypp/RepoManager.cc:1306
msgid "Unhandled repository type"
msgstr "無法處理的套件庫類型"
@@ -4316,7 +4315,7 @@
msgstr "未知國家:"
#. TranslatorExplanation '%s' is an URL
-#: zypp/RepoManager.cc:1383 zypp/RepoManager.cc:2309
+#: zypp/RepoManager.cc:1389 zypp/RepoManager.cc:2323
#, c-format, boost-format
msgid "Unknown error reading from '%s'"
msgstr "由 '%s' 讀取時發生未知錯誤"
@@ -4348,7 +4347,7 @@
msgstr "未知的支援選項。 描述不適用"
#. translators: possible rpm package signature check result [brief]
-#: zypp/target/rpm/RpmDb.cc:2370
+#: zypp/target/rpm/RpmDb.cc:2371
msgid "Unknown type of signature"
msgstr "未知的簽章類型"
@@ -4455,7 +4454,7 @@
msgid "Virgin Islands, U.S."
msgstr "美屬維爾京群島"
-#: zypp/media/MediaCurl.cc:994
+#: zypp/media/MediaCurl.cc:1006
msgid "Visit the Novell Customer Center to check whether your registration is valid and has not expired."
msgstr "請造訪 Novell 客戶服務中心確認您的註冊有效及並未過期。"
@@ -4594,84 +4593,86 @@
msgid "Zuni"
msgstr "祖尼語"
-#: zypp/repo/PackageProvider.cc:514
+#: zypp/repo/PackageProvider.cc:515
msgid "applydeltarpm check failed."
msgstr "applydeltarpm 檢查失敗。"
-#: zypp/repo/PackageProvider.cc:524
+#: zypp/repo/PackageProvider.cc:525
msgid "applydeltarpm failed."
msgstr "applydeltarpm 失敗。"
-#: zypp/solver/detail/SATResolver.cc:1388
+#: zypp/solver/detail/SATResolver.cc:1402
#, c-format, boost-format
msgid "architecture change of %s to %s"
msgstr "架構由 %s 變更為 %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: zypp/solver/detail/ProblemSolutionIgnore.cc:52
+#: zypp/solver/detail/ProblemSolutionIgnore.cc:42
#, c-format, boost-format
msgid "break %s by ignoring some of its dependencies"
msgstr "藉由忽略某些它的相依性以破壞 %s "
-#: zypp/solver/detail/SATResolver.cc:1082
+#: zypp/solver/detail/SATResolver.cc:1096
#, c-format, boost-format
msgid "cannot install both %s and %s"
msgstr "無法同時安裝 %s 和 %s"
-#: zypp/solver/detail/SATResolver.cc:1051
+#: zypp/solver/detail/SATResolver.cc:1065
msgid "conflicting requests"
msgstr "衝突的要求"
-#: zypp/target/rpm/RpmDb.cc:2347
+#: zypp/target/rpm/RpmDb.cc:2348
#, c-format, boost-format
msgid "created backup %s"
msgstr "已建立備份 %s"
-#: zypp/solver/detail/SATResolver.cc:1417
+#: zypp/solver/detail/SATResolver.cc:1431
#, c-format, boost-format
msgid "deinstallation of %s"
msgstr "反安裝 %s"
-#: zypp/solver/detail/SATResolver.cc:1135
+#: zypp/solver/detail/SATResolver.cc:1149
msgid "deleted providers: "
msgstr "刪除提供者: "
-#: zypp/solver/detail/SATResolver.cc:1308
+#: zypp/solver/detail/SATResolver.cc:1322
#, c-format, boost-format
msgid "do not ask to delete all solvables providing %s"
msgstr "請勿要求刪除所有提供 %s 的解決方案"
-#: zypp/solver/detail/SATResolver.cc:1286
+#: zypp/solver/detail/SATResolver.cc:1300
#, c-format, boost-format
msgid "do not ask to install a solvable providing %s"
msgstr "請勿要求安裝提供 %s 的解決方案"
-#: zypp/solver/detail/SATResolver.cc:1209
-#: zypp/solver/detail/SATResolver.cc:1245
+#: zypp/solver/detail/SATResolver.cc:1223
+#: zypp/solver/detail/SATResolver.cc:1259
#, c-format, boost-format
msgid "do not install %s"
msgstr "請勿安裝 %s"
-#: zypp/solver/detail/SATResolver.cc:1321
+#: zypp/solver/detail/SATResolver.cc:1335
#, c-format, boost-format
msgid "do not install most recent version of %s"
msgstr "請勿安裝最新版本的 %s"
-#: zypp/solver/detail/SATResolver.cc:1381
+#: zypp/solver/detail/SATResolver.cc:1395
#, c-format, boost-format
msgid "downgrade of %s to %s"
msgstr "降級 %s 到 %s"
-#: zypp/solver/detail/ProblemSolutionIgnore.cc:61
-msgid "generally ignore of some dependecies"
+#: zypp/solver/detail/ProblemSolutionIgnore.cc:48
+#, fuzzy
+#| msgid "generally ignore of some dependecies"
+msgid "generally ignore of some dependencies"
msgstr "一般忽略某些相依性"
-#: zypp/solver/detail/SATResolver.cc:1281
-#: zypp/solver/detail/SATResolver.cc:1302
+#: zypp/solver/detail/SATResolver.cc:1295
+#: zypp/solver/detail/SATResolver.cc:1316
msgid "ignore the warning of a broken system"
msgstr "忽略破壞系統警告"
-#: zypp/solver/detail/SATResolver.cc:1397
+#: zypp/solver/detail/SATResolver.cc:1411
#, c-format, boost-format
msgid ""
"install %s (with vendor change)\n"
@@ -4680,17 +4681,17 @@
"安裝 %s (並變更廠商)\n"
" %s --> %s"
-#: zypp/solver/detail/SATResolver.cc:1347
+#: zypp/solver/detail/SATResolver.cc:1361
#, c-format, boost-format
msgid "install %s despite the inferior architecture"
msgstr "安裝 %s,忽略次要架構"
-#: zypp/solver/detail/SATResolver.cc:1361
+#: zypp/solver/detail/SATResolver.cc:1375
#, c-format, boost-format
msgid "install %s from excluded repository"
msgstr "由排除的套件庫中安裝 %s"
-#: zypp/solver/detail/SATResolver.cc:1097
+#: zypp/solver/detail/SATResolver.cc:1111
#, c-format, boost-format
msgid "installed %s obsoletes %s provided by %s"
msgstr "安裝 %s 汰換 %s (由 %s 提供)"
@@ -4699,18 +4700,18 @@
msgid "invalid"
msgstr "不適用"
-#: zypp/solver/detail/SATResolver.cc:1224
-#: zypp/solver/detail/SATResolver.cc:1266
+#: zypp/solver/detail/SATResolver.cc:1238
+#: zypp/solver/detail/SATResolver.cc:1280
#, c-format, boost-format
msgid "keep %s"
msgstr "保留 %s"
-#: zypp/solver/detail/SATResolver.cc:1342
+#: zypp/solver/detail/SATResolver.cc:1356
#, c-format, boost-format
msgid "keep %s despite the inferior architecture"
msgstr "保存 %s 忽略次要架構"
-#: zypp/solver/detail/SATResolver.cc:1356
+#: zypp/solver/detail/SATResolver.cc:1370
#, c-format, boost-format
msgid "keep obsolete %s"
msgstr "保留過期的 %s"
@@ -4723,49 +4724,49 @@
msgid "libhal_set_dbus_connection: Can't set dbus connection"
msgstr "libhal_set_dbus_connection: 無法設定 dbus 連接"
-#: zypp/solver/detail/SATResolver.cc:1077
+#: zypp/solver/detail/SATResolver.cc:1091
#, c-format, boost-format
msgid "nothing provides %s needed by %s"
msgstr "無法提供 %s 這是被 %s 所需要的"
-#: zypp/solver/detail/SATResolver.cc:1057
+#: zypp/solver/detail/SATResolver.cc:1071
#, c-format, boost-format
msgid "nothing provides requested %s"
msgstr "無法提供所需的 %s"
-#: zypp/solver/detail/SATResolver.cc:1061
+#: zypp/solver/detail/SATResolver.cc:1075
#, c-format, boost-format
msgid "package %s does not exist"
msgstr "套件 %s 不存在"
-#: zypp/solver/detail/SATResolver.cc:1048
+#: zypp/solver/detail/SATResolver.cc:1062
#, c-format, boost-format
msgid "problem with installed package %s"
msgstr "已安裝的套件 %s 發生問題"
-#: zypp/solver/detail/SATResolver.cc:1229
+#: zypp/solver/detail/SATResolver.cc:1243
#, c-format, boost-format
msgid "remove lock to allow installation of %s"
msgstr "解除鎖定以允許安裝 %s"
-#: zypp/solver/detail/SATResolver.cc:1204
+#: zypp/solver/detail/SATResolver.cc:1218
#, c-format, boost-format
msgid "remove lock to allow removal of %s"
msgstr "解除鎖定以允許移除 %s"
-#: zypp/solver/detail/SATResolver.cc:1406
+#: zypp/solver/detail/SATResolver.cc:1420
#, c-format, boost-format
msgid "replacement of %s with %s"
msgstr "取代 %s 以 %s"
#. %s = filenames
-#: zypp/target/rpm/RpmDb.cc:2030
+#: zypp/target/rpm/RpmDb.cc:2031
#, 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:2032
+#: zypp/target/rpm/RpmDb.cc:2033
#, c-format, boost-format
msgid ""
"rpm created %s as %s.\n"
@@ -4775,13 +4776,13 @@
"這是前 25 行差異:\n"
#. %s = filenames
-#: zypp/target/rpm/RpmDb.cc:2025
+#: zypp/target/rpm/RpmDb.cc:2026
#, 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:2027
+#: zypp/target/rpm/RpmDb.cc:2028
#, c-format, boost-format
msgid ""
"rpm saved %s as %s.\n"
@@ -4790,16 +4791,16 @@
"rpm 已將 %s 儲存為 %s。\n"
"這是前 25 行差異:\n"
-#: zypp/solver/detail/SATResolver.cc:1101
+#: zypp/solver/detail/SATResolver.cc:1115
#, c-format, boost-format
msgid "solvable %s conflicts with %s provided by itself"
msgstr "解決方案 %s 與 %s 衝突(由自己提供)"
-#: zypp/solver/detail/SATResolver.cc:1054
+#: zypp/solver/detail/SATResolver.cc:1068
msgid "some dependency problem"
msgstr "有些相依性問題"
-#: zypp/solver/detail/SATResolver.cc:1147
+#: zypp/solver/detail/SATResolver.cc:1161
msgid "uninstallable providers: "
msgstr "無法安裝的提供者: "
@@ -4811,7 +4812,7 @@
msgid "unsupported"
msgstr "不支援"
-#: zypp/solver/detail/SATResolver.cc:1065
+#: zypp/solver/detail/SATResolver.cc:1079
msgid "unsupported request"
msgstr "不支援的需求"