[opensuse-translation-commit] r91117 - trunk/lcn/zh_TW/po
Author: ramax Date: 2015-01-25 17:51:28 +0100 (Sun, 25 Jan 2015) New Revision: 91117 Modified: trunk/lcn/zh_TW/po/zypp.zh_TW.po Log: zypp zh_TW update Modified: trunk/lcn/zh_TW/po/zypp.zh_TW.po =================================================================== --- trunk/lcn/zh_TW/po/zypp.zh_TW.po 2015-01-25 12:41:13 UTC (rev 91116) +++ trunk/lcn/zh_TW/po/zypp.zh_TW.po 2015-01-25 16:51:28 UTC (rev 91117) @@ -22,7 +22,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Lokalize 1.4\n" -#: zypp/solver/detail/SATResolver.cc:1102 +#: zypp/solver/detail/SATResolver.cc:1145 msgid "" "\n" "uninstallable providers: " @@ -55,37 +55,37 @@ msgid "%s already executed as %s)" msgstr "%s 已被作為 %s 執行)" -#: zypp/solver/detail/SATResolver.cc:1086 +#: zypp/solver/detail/SATResolver.cc:1087 #, c-format msgid "%s conflicts with %s provided by %s" msgstr "%s 與 %s 衝突(由 %s 提供)" -#: zypp/solver/detail/SATResolver.cc:1039 +#: zypp/solver/detail/SATResolver.cc:1040 #, c-format msgid "%s does not belong to a distupgrade repository" msgstr "%s 不屬於一個版本升級套件庫" -#: zypp/solver/detail/SATResolver.cc:1043 +#: zypp/solver/detail/SATResolver.cc:1044 #, c-format msgid "%s has inferior architecture" msgstr "%s 有次要架構" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1072 #, c-format msgid "%s is not installable" msgstr "%s 無法安裝" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1068 #, c-format msgid "%s is provided by the system and cannot be erased" msgstr "%s 是由系統提供,且無法被清除。" -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1092 #, c-format msgid "%s obsoletes %s provided by %s" msgstr "%s 汰換 %s (由 %s 提供)" -#: zypp/solver/detail/SATResolver.cc:1132 +#: zypp/solver/detail/SATResolver.cc:1133 #, c-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "%s 需要 %s,但無法提供此需求" @@ -125,7 +125,7 @@ msgid "Adangme" msgstr "阿當梅語" -#: zypp/RepoManager.cc:1451 +#: zypp/RepoManager.cc:1501 #, c-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:1977 zypp/target/rpm/RpmDb.cc:2124 +#: zypp/target/rpm/RpmDb.cc:1978 zypp/target/rpm/RpmDb.cc:2125 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:1689 +#: zypp/media/MediaCIFS.cc:430 zypp/media/MediaCurl.cc:1678 #, c-format msgid "Authentication required for '%s'" msgstr "要求 '%s' 的驗證" @@ -618,7 +618,7 @@ msgid "Buginese" msgstr "布吉斯語" -#: zypp/RepoManager.cc:1152 +#: zypp/RepoManager.cc:1202 #, c-format msgid "Building repository '%s' cache" msgstr "正在建立套件庫 '%s' 的快取" @@ -676,56 +676,56 @@ msgid "Can't acquire the mutex lock" msgstr "無法取得 mutex 鎖定" -#: zypp/ExternalProgram.cc:344 +#: zypp/ExternalProgram.cc:361 #, c-format msgid "Can't chdir to '%s' (%s)." msgstr "無法切換目錄到 '%s' (%s)。" -#: zypp/ExternalProgram.cc:343 +#: zypp/ExternalProgram.cc:360 #, c-format msgid "Can't chdir to '%s' inside chroot '%s' (%s)." msgstr "無法切換目錄到 '%s',當處在 chroot '%s' (%s) 中。" -#: zypp/ExternalProgram.cc:333 +#: zypp/ExternalProgram.cc:350 #, c-format msgid "Can't chroot to '%s' (%s)." msgstr "無法 chroot 到 '%s' (%s)。" -#: zypp/RepoManager.cc:1009 zypp/RepoManager.cc:1116 zypp/RepoManager.cc:1166 +#: zypp/RepoManager.cc:1058 zypp/RepoManager.cc:1166 zypp/RepoManager.cc:1216 #, c-format msgid "Can't create %s" msgstr "無法建立 %s" -#: zypp/RepoManager.cc:1172 +#: zypp/RepoManager.cc:1222 #, c-format msgid "Can't create cache at %s - no writing permissions." msgstr "無法在 %s 建立快取 - 無寫入權限。" -#: zypp/RepoManager.cc:1017 +#: zypp/RepoManager.cc:1066 msgid "Can't create metadata cache directory." msgstr "無法建立中繼資料快取目錄。" #. TranslatorExplanation '%s' is a filename -#: zypp/RepoManager.cc:1628 zypp/RepoManager.cc:1817 +#: zypp/RepoManager.cc:1678 zypp/RepoManager.cc:1867 #, c-format msgid "Can't delete '%s'" msgstr "無法刪除 '%s'" #. don't want to get here -#: zypp/ExternalProgram.cc:356 +#: zypp/ExternalProgram.cc:373 #, c-format msgid "Can't exec '%s' (%s)." msgstr "無法執行 '%s' (%s)。" -#: zypp/RepoManager.cc:1616 zypp/RepoManager.cc:1692 +#: zypp/RepoManager.cc:1666 zypp/RepoManager.cc:1742 msgid "Can't figure out where the repo is stored." msgstr "無法找到套件庫儲存的位置。" -#: zypp/RepoManager.cc:1760 zypp/RepoManager.cc:2111 +#: zypp/RepoManager.cc:1855 zypp/RepoManager.cc:2223 msgid "Can't figure out where the service is stored." msgstr "無法找到服務儲存的位置。" -#: zypp/ExternalProgram.cc:371 +#: zypp/ExternalProgram.cc:381 #, c-format msgid "Can't fork (%s)." msgstr "無法 fork (%s)。" @@ -739,8 +739,8 @@ msgstr "無法啟始化遞迴 mutex" #. TranslatorExplanation '%s' is a filename -#: zypp/RepoManager.cc:575 zypp/RepoManager.cc:1445 zypp/RepoManager.cc:1527 -#: zypp/RepoManager.cc:1601 zypp/RepoManager.cc:1666 zypp/RepoManager.cc:1784 +#: zypp/RepoManager.cc:651 zypp/RepoManager.cc:1540 zypp/RepoManager.cc:1622 +#: zypp/RepoManager.cc:1696 zypp/RepoManager.cc:1761 zypp/RepoManager.cc:1879 #, c-format msgid "Can't open file '%s' for writing." msgstr "無法開啟檔案 '%s' 來寫入。" @@ -750,12 +750,12 @@ msgid "Can't open lock file: %s" msgstr "無法開啟鎖定檔案: %s" -#: zypp/ExternalProgram.cc:266 +#: zypp/ExternalProgram.cc:269 #, c-format msgid "Can't open pipe (%s)." msgstr "無法開啟管線 (%s)。" -#: zypp/ExternalProgram.cc:255 +#: zypp/ExternalProgram.cc:258 #, c-format msgid "Can't open pty (%s)." msgstr "無法開啟 pty (%s)。" @@ -792,11 +792,11 @@ msgid "Cannot find available loop device to mount the image file from '%s'" msgstr "無法找到可用的 loop 裝置來掛載從 '%s' 的影像檔" -#: zypp/RepoManager.cc:226 +#: zypp/RepoManager.cc:227 msgid "Cannot read repo directory '%1%': Permission denied" msgstr "無法讀取套件庫目錄 '%1%': 沒有權限" -#: zypp/RepoManager.cc:244 +#: zypp/RepoManager.cc:245 msgid "Cannot read repo file '%1%': Permission denied" msgstr "無法讀取套件庫檔案 '%1%': 沒有權限" @@ -967,16 +967,16 @@ msgid "Colombia" msgstr "哥倫比亞" -#: zypp/ExternalProgram.cc:497 +#: zypp/ExternalProgram.cc:507 #, c-format msgid "Command exited with status %d." msgstr "指令跳出,狀態 %d。" -#: zypp/ExternalProgram.cc:522 +#: zypp/ExternalProgram.cc:532 msgid "Command exited with unknown error." msgstr "因未知錯誤指令跳出。" -#: zypp/ExternalProgram.cc:517 +#: zypp/ExternalProgram.cc:527 #, c-format msgid "Command was killed by signal %d (%s)." msgstr "指令被信號 %d (%s) 中止。" @@ -1317,7 +1317,7 @@ #. on ftp file-not-found(bnc #335906). Instead we'll check another types #. before throwing. #. TranslatorExplanation '%s' is an URL -#: zypp/RepoManager.cc:1231 zypp/RepoManager.cc:2177 +#: zypp/RepoManager.cc:1326 zypp/RepoManager.cc:2289 #, c-format msgid "Error trying to read from '%s'" msgstr "嘗試自 '%s' 讀取時發生錯誤" @@ -1357,12 +1357,12 @@ msgid "Ewondo" msgstr "埃翁多語" -#: zypp/RepoManager.cc:1191 +#: zypp/RepoManager.cc:1286 #, c-format msgid "Failed to cache repo (%d)." msgstr "快取套件庫失敗 (%d)." -#: zypp/KeyRing.cc:555 +#: zypp/KeyRing.cc:571 msgid "Failed to delete key." msgstr "刪除金鑰失敗。" @@ -1377,13 +1377,13 @@ msgstr "載掛 %s 在 %s 失敗" #. TranslatorExplanation %s = name of the package being processed. -#: zypp/repo/PackageProvider.cc:255 +#: zypp/repo/PackageProvider.cc:286 #, c-format msgid "Failed to provide Package %s. Do you want to retry retrieval?" msgstr "無法提供套件 %s。您要嘗試重新取得嗎?" #. TranslatorExplanation '%s' is a pathname -#: zypp/RepoManager.cc:227 zypp/RepoManager.cc:620 zypp/RepoManager.cc:1318 +#: zypp/RepoManager.cc:235 zypp/RepoManager.cc:696 zypp/RepoManager.cc:1413 #: zypp/repo/PluginServices.cc:49 #, c-format msgid "Failed to read directory '%s'" @@ -1888,8 +1888,8 @@ msgid "Hausa" msgstr "豪薩語" -#: zypp/solver/detail/SATResolver.cc:1015 -#: zypp/solver/detail/SATResolver.cc:1019 +#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1062 msgid "Have you enabled all requested repositories?" msgstr "請問您已啟用所需的套件庫了嗎?" @@ -2092,7 +2092,7 @@ msgid "Invalid LDAP URL query string" msgstr "無效的 LDAP URL 查詢字串" -#: zypp/url/UrlBase.cc:826 +#: zypp/url/UrlBase.cc:830 #, c-format msgid "Invalid Url scheme '%s'" msgstr "無效的 Url 規劃「%s」" @@ -2101,7 +2101,7 @@ msgid "Invalid empty Url object reference" msgstr "無效的空白 Url 物件參照" -#: zypp/url/UrlBase.cc:1045 +#: zypp/url/UrlBase.cc:1049 #, c-format msgid "Invalid host component '%s'" msgstr "無效的主機元件「%s」" @@ -2118,7 +2118,7 @@ msgid "Invalid parameter map split separator character" msgstr "無效的參數映射分割分隔符號字元" -#: zypp/url/UrlBase.cc:1077 +#: zypp/url/UrlBase.cc:1081 #, c-format msgid "Invalid port component '%s'" msgstr "無效的連接埠 '%s'" @@ -2134,7 +2134,7 @@ msgstr "不正確的正規表示法 '%s': regcomp 回應 %d" #. TranslatorExplanation '%s' is an URL -#: zypp/RepoManager.cc:1513 +#: zypp/RepoManager.cc:1608 #, c-format msgid "Invalid repo file name at '%s'" msgstr "不適用的套件庫檔案名稱在 '%s'" @@ -3205,7 +3205,7 @@ msgstr "鄂圖曼語" #. TranslatorExplanation %s = package being checked for integrity -#: zypp/repo/PackageProvider.cc:149 +#: zypp/repo/PackageProvider.cc:151 #, c-format msgid "Package %s seems to be corrupted during transfer. Do you want to retry retrieval?" msgstr "套件 %s 似乎在傳輸過程中被打斷。 您要重新下載嗎?" @@ -3330,7 +3330,7 @@ msgid "Pitcairn" msgstr "皮特康" -#: zypp/misc/CheckAccessDeleted.cc:207 +#: zypp/misc/CheckAccessDeleted.cc:239 msgid "Please install package 'lsof' first." msgstr "請先安裝套件 'lsof'。" @@ -3409,14 +3409,14 @@ msgid "Quechua" msgstr "蓋楚瓦語" -#: zypp/url/UrlBase.cc:782 zypp/url/UrlBase.cc:1227 +#: zypp/url/UrlBase.cc:786 zypp/url/UrlBase.cc:1231 msgid "Query string parsing not supported for this URL" msgstr "此 URL 不支援查詢字串分析" #. TranslatorExplanation after semicolon is error message #. TranslatorExplanation the colon is followed by an error message -#: zypp/target/rpm/RpmDb.cc:846 zypp/target/rpm/RpmDb.cc:1963 -#: zypp/target/rpm/RpmDb.cc:2110 +#: zypp/target/rpm/RpmDb.cc:846 zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:2111 msgid "RPM failed: " msgstr "RPM 失敗: " @@ -3444,16 +3444,16 @@ msgid "Recommends" msgstr "建議" -#: zypp/url/UrlBase.cc:1115 zypp/url/UrlBase.cc:1129 +#: zypp/url/UrlBase.cc:1119 zypp/url/UrlBase.cc:1133 msgid "Relative path not allowed if authority exists" msgstr "如果授權存在,則不允許相對路徑" -#: zypp/RepoManager.cc:1552 +#: zypp/RepoManager.cc:1647 #, c-format msgid "Removing repository '%s'" msgstr "正在移除套件庫 '%s'" -#: zypp/RepoManager.cc:255 +#: zypp/RepoManager.cc:268 msgid "Repository alias cannot start with dot." msgstr "套件庫別名不能以 點 開始。" @@ -3644,7 +3644,7 @@ msgid "Serer" msgstr "塞雷爾語" -#: zypp/RepoManager.cc:266 +#: zypp/RepoManager.cc:279 msgid "Service alias cannot start with dot." msgstr "服務的別名不能以 點 開始。" @@ -3692,7 +3692,7 @@ msgid "Sign Languages" msgstr "符號語言" -#: zypp/KeyRing.cc:565 +#: zypp/KeyRing.cc:581 #, c-format msgid "Signature file %s not found" msgstr "找不到簽章檔 '%s'" @@ -4035,8 +4035,8 @@ msgid "This action is being run by another program already." msgstr "此行動已被其他程式執行。" -#: zypp/solver/detail/SATResolver.cc:1237 -#: zypp/solver/detail/SATResolver.cc:1258 +#: zypp/solver/detail/SATResolver.cc:1280 +#: zypp/solver/detail/SATResolver.cc:1301 msgid "This request will break your system!" msgstr "此要求將破壞您的系統!" @@ -4106,7 +4106,7 @@ msgid "Tonga (Tonga Islands)" msgstr "東加語 (東加群島)" -#: zypp/KeyRing.cc:512 +#: zypp/KeyRing.cc:528 #, c-format msgid "Tried to import not existent key %s into keyring %s" msgstr "嘗試匯入不存在的金鑰 %s 到鑰匙圈 %s" @@ -4248,7 +4248,7 @@ msgid "Undetermined" msgstr "未確定的" -#: zypp/RepoManager.cc:1201 +#: zypp/RepoManager.cc:1296 msgid "Unhandled repository type" msgstr "無法處理的套件庫類型" @@ -4277,7 +4277,7 @@ msgstr "未知國家:" #. TranslatorExplanation '%s' is an URL -#: zypp/RepoManager.cc:1284 zypp/RepoManager.cc:2185 +#: zypp/RepoManager.cc:1379 zypp/RepoManager.cc:2297 #, c-format msgid "Unknown error reading from '%s'" msgstr "由 '%s' 讀取時發生未知錯誤" @@ -4299,7 +4299,7 @@ #. translators: Cleanup a repository previously owned by a meanwhile unknown (deleted) service. #. %1% = service name #. %2% = repository name -#: zypp/RepoManager.cc:671 +#: zypp/RepoManager.cc:778 msgid "Unknown service '%1%': Removing orphaned service repository '%2%'" msgstr "未知的服務 '%1%':正在移除落單的服務儲存庫 '%2%'" @@ -4332,31 +4332,31 @@ msgid "Url scheme does not allow a %s" msgstr "Url 規劃不允許 %s" -#: zypp/url/UrlBase.cc:1018 +#: zypp/url/UrlBase.cc:1022 msgid "Url scheme does not allow a host component" msgstr "Url 規劃不允許主機元件" -#: zypp/url/UrlBase.cc:979 +#: zypp/url/UrlBase.cc:983 msgid "Url scheme does not allow a password" msgstr "Url 規劃不允許密碼" -#: zypp/url/UrlBase.cc:1066 +#: zypp/url/UrlBase.cc:1070 msgid "Url scheme does not allow a port" msgstr "Url 規劃不允許連接埠" -#: zypp/url/UrlBase.cc:945 +#: zypp/url/UrlBase.cc:949 msgid "Url scheme does not allow a username" msgstr "Url 規劃不允許使用者名稱" -#: zypp/url/UrlBase.cc:820 +#: zypp/url/UrlBase.cc:824 msgid "Url scheme is a required component" msgstr "Url 規劃為必要元件" -#: zypp/url/UrlBase.cc:1008 +#: zypp/url/UrlBase.cc:1012 msgid "Url scheme requires a host component" msgstr "Url 規劃中必須要有主機元件" -#: zypp/url/UrlBase.cc:1094 +#: zypp/url/UrlBase.cc:1098 msgid "Url scheme requires path name" msgstr "Url 規劃必須要有路徑名稱" @@ -4410,7 +4410,7 @@ msgid "Virgin Islands, U.S." msgstr "美屬維爾京群島" -#: zypp/media/MediaCurl.cc:1003 +#: zypp/media/MediaCurl.cc:992 msgid "Visit the Novell Customer Center to check whether your registration is valid and has not expired." msgstr "請造訪 Novell 客戶服務中心確認您的註冊有效及並未過期。" @@ -4549,15 +4549,15 @@ msgid "Zuni" msgstr "祖尼語" -#: zypp/repo/PackageProvider.cc:384 +#: zypp/repo/PackageProvider.cc:415 msgid "applydeltarpm check failed." msgstr "applydeltarpm 檢查失敗。" -#: zypp/repo/PackageProvider.cc:394 +#: zypp/repo/PackageProvider.cc:425 msgid "applydeltarpm failed." msgstr "applydeltarpm 失敗。" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1388 #, c-format msgid "architecture change of %s to %s" msgstr "架構由 %s 變更為 %s" @@ -4568,62 +4568,52 @@ msgid "break %s by ignoring some of its dependencies" msgstr "藉由忽略某些它的相依性以破壞 %s " -#: zypp/solver/detail/SATResolver.cc:1039 +#: zypp/solver/detail/SATResolver.cc:1082 #, c-format msgid "cannot install both %s and %s" msgstr "無法同時安裝 %s 和 %s" -#: zypp/solver/detail/SATResolver.cc:1008 +#: zypp/solver/detail/SATResolver.cc:1051 msgid "conflicting requests" msgstr "衝突的要求" -#: zypp/target/rpm/RpmDb.cc:2266 +#: zypp/target/rpm/RpmDb.cc:2267 #, c-format msgid "created backup %s" msgstr "已建立備份 %s" -#: zypp/solver/detail/SATResolver.cc:1374 +#: zypp/solver/detail/SATResolver.cc:1417 #, c-format msgid "deinstallation of %s" msgstr "反安裝 %s" -#: zypp/solver/detail/SATResolver.cc:1092 +#: zypp/solver/detail/SATResolver.cc:1135 msgid "deleted providers: " msgstr "刪除提供者: " -#: zypp/solver/detail/SATResolver.cc:1265 +#: zypp/solver/detail/SATResolver.cc:1308 #, c-format msgid "do not ask to delete all solvables providing %s" msgstr "請勿要求刪除所有提供 %s 的解決方案" -#: zypp/solver/detail/SATResolver.cc:1243 +#: zypp/solver/detail/SATResolver.cc:1286 #, c-format msgid "do not ask to install a solvable providing %s" msgstr "請勿要求安裝提供 %s 的解決方案" -#: zypp/solver/detail/SATResolver.cc:1186 +#: zypp/solver/detail/SATResolver.cc:1209 +#: zypp/solver/detail/SATResolver.cc:1245 #, c-format -msgid "do not forbid installation of %s" -msgstr "請勿禁止安裝 %s" - -#: zypp/solver/detail/SATResolver.cc:1166 -#: zypp/solver/detail/SATResolver.cc:1202 -#, c-format msgid "do not install %s" msgstr "請勿安裝 %s" -#: zypp/solver/detail/SATResolver.cc:1278 +#: zypp/solver/detail/SATResolver.cc:1321 #, c-format msgid "do not install most recent version of %s" msgstr "請勿安裝最新版本的 %s" -#: zypp/solver/detail/SATResolver.cc:1161 +#: zypp/solver/detail/SATResolver.cc:1381 #, c-format -msgid "do not keep %s installed" -msgstr "請勿保有 %s 被安裝" - -#: zypp/solver/detail/SATResolver.cc:1338 -#, c-format msgid "downgrade of %s to %s" msgstr "降級 %s 到 %s" @@ -4631,12 +4621,12 @@ msgid "generally ignore of some dependecies" msgstr "一般忽略某些相依性" -#: zypp/solver/detail/SATResolver.cc:1238 -#: zypp/solver/detail/SATResolver.cc:1259 +#: zypp/solver/detail/SATResolver.cc:1281 +#: zypp/solver/detail/SATResolver.cc:1302 msgid "ignore the warning of a broken system" msgstr "忽略破壞系統警告" -#: zypp/solver/detail/SATResolver.cc:1354 +#: zypp/solver/detail/SATResolver.cc:1397 #, c-format msgid "" "install %s (with vendor change)\n" @@ -4645,17 +4635,17 @@ "安裝 %s (並變更廠商)\n" " %s --> %s" -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1347 #, c-format msgid "install %s despite the inferior architecture" msgstr "安裝 %s,忽略次要架構" -#: zypp/solver/detail/SATResolver.cc:1318 +#: zypp/solver/detail/SATResolver.cc:1361 #, c-format msgid "install %s from excluded repository" msgstr "由排除的套件庫中安裝 %s" -#: zypp/solver/detail/SATResolver.cc:1054 +#: zypp/solver/detail/SATResolver.cc:1097 #, c-format msgid "installed %s obsoletes %s provided by %s" msgstr "安裝 %s 汰換 %s (由 %s 提供)" @@ -4664,18 +4654,18 @@ msgid "invalid" msgstr "不適用" -#: zypp/solver/detail/SATResolver.cc:1181 -#: zypp/solver/detail/SATResolver.cc:1223 +#: zypp/solver/detail/SATResolver.cc:1224 +#: zypp/solver/detail/SATResolver.cc:1266 #, c-format msgid "keep %s" msgstr "保留 %s" -#: zypp/solver/detail/SATResolver.cc:1299 +#: zypp/solver/detail/SATResolver.cc:1342 #, c-format msgid "keep %s despite the inferior architecture" msgstr "保存 %s 忽略次要架構" -#: zypp/solver/detail/SATResolver.cc:1313 +#: zypp/solver/detail/SATResolver.cc:1356 #, c-format msgid "keep obsolete %s" msgstr "保留過期的 %s" @@ -4688,39 +4678,49 @@ msgid "libhal_set_dbus_connection: Can't set dbus connection" msgstr "libhal_set_dbus_connection: 無法設定 dbus 連接" -#: zypp/solver/detail/SATResolver.cc:1034 +#: zypp/solver/detail/SATResolver.cc:1077 #, c-format msgid "nothing provides %s needed by %s" msgstr "無法提供 %s 這是被 %s 所需要的" -#: zypp/solver/detail/SATResolver.cc:1014 +#: zypp/solver/detail/SATResolver.cc:1057 #, c-format msgid "nothing provides requested %s" msgstr "無法提供所需的 %s" -#: zypp/solver/detail/SATResolver.cc:1018 +#: zypp/solver/detail/SATResolver.cc:1061 #, c-format msgid "package %s does not exist" msgstr "套件 %s 不存在" -#: zypp/solver/detail/SATResolver.cc:1005 +#: zypp/solver/detail/SATResolver.cc:1048 #, c-format msgid "problem with installed package %s" msgstr "已安裝的套件 %s 發生問題" -#: zypp/solver/detail/SATResolver.cc:1363 +#: zypp/solver/detail/SATResolver.cc:1229 #, c-format +msgid "remove lock to allow installation of %s" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1204 +#, c-format +msgid "remove lock to allow removal of %s" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1406 +#, c-format msgid "replacement of %s with %s" msgstr "取代 %s 以 %s" #. %s = filenames -#: zypp/target/rpm/RpmDb.cc:1949 +#: zypp/target/rpm/RpmDb.cc:1950 #, c-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:1951 +#: zypp/target/rpm/RpmDb.cc:1952 #, c-format msgid "" "rpm created %s as %s.\n" @@ -4730,13 +4730,13 @@ "這是前 25 行差異:\n" #. %s = filenames -#: zypp/target/rpm/RpmDb.cc:1944 +#: zypp/target/rpm/RpmDb.cc:1945 #, c-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:1946 +#: zypp/target/rpm/RpmDb.cc:1947 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -4745,16 +4745,16 @@ "rpm 已將 %s 儲存為 %s。\n" "這是前 25 行差異:\n" -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1101 #, c-format msgid "solvable %s conflicts with %s provided by itself" msgstr "解決方案 %s 與 %s 衝突(由自己提供)" -#: zypp/solver/detail/SATResolver.cc:1011 +#: zypp/solver/detail/SATResolver.cc:1054 msgid "some dependency problem" msgstr "有些相依性問題" -#: zypp/solver/detail/SATResolver.cc:1104 +#: zypp/solver/detail/SATResolver.cc:1147 msgid "uninstallable providers: " msgstr "無法安裝的提供者: " @@ -4766,7 +4766,7 @@ msgid "unsupported" msgstr "不支援" -#: zypp/solver/detail/SATResolver.cc:1022 +#: zypp/solver/detail/SATResolver.cc:1065 msgid "unsupported request" msgstr "不支援的需求" -- To unsubscribe, e-mail: opensuse-translation-commit+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-translation-commit+owner@opensuse.org
participants (1)
-
ramax@svn2.opensuse.org