merge the latest debian-sid branch

5 files changed, 42 insertions, 71 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 9a5a0016b..591f10b0a 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,15 @@
+2009-02-01  Hans Fredrik Nordhaug  <hans@nordhaug.priv.no>
+
+	* nb.po: updated to 539t.
+
+2009-01-27  Damyan Ivanov  <dmn@debian.org>
+
+	* bg.po: updated to 539t.
+
+2008-12-11  Christian Perrier  <bubulle@debian.org>
+
+	* fr.po: fix spelling error to "défectueux"
+
 2009-01-04  Tetralet  <tetralet@gmail.com>
 
 	* zh_TW.po: Added as 538t1u.
diff --git a/po/bg.po b/po/bg.po
index d427249c0..60c988119 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,18 +1,16 @@
-# translation of apt_po_bg.po to Bulgarian
+# translation of apt-all.pot to Bulgarian
 # Bulgarian translation of apt.
 # Copyright (C) 2006, 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the apt package.
 #
 # Yavor Doganov <yavor@doganov.org>, 2006.
-# Damyan Ivanov <dmn@debian.org>, 2008.
-# Damyan Ivanov <dam@modsoftsys.com>, 2008.
-# Damyan Ivanov <dmn@debiian.org>, 2008.
+# Damyan Ivanov <dmn@debian.org>, 2008, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt_po_bg\n"
+"Project-Id-Version: apt 0.7.21\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-11-12 21:57+0200\n"
+"PO-Revision-Date: 2009-01-27 12:41+0200\n"
 "Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "MIME-Version: 1.0\n"
@@ -169,43 +167,6 @@ msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s за %s компилиран на %s %s\n"
 
 #: cmdline/apt-cache.cc:1721
-#, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| "       apt-cache [options] add file1 [file2 ...]\n"
-#| "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| "   add - Add a package file to the source cache\n"
-#| "   gencaches - Build both the package and source cache\n"
-#| "   showpkg - Show some general information for a single package\n"
-#| "   showsrc - Show source records\n"
-#| "   stats - Show some basic statistics\n"
-#| "   dump - Show the entire file in a terse form\n"
-#| "   dumpavail - Print an available file to stdout\n"
-#| "   unmet - Show unmet dependencies\n"
-#| "   search - Search the package list for a regex pattern\n"
-#| "   show - Show a readable record for the package\n"
-#| "   depends - Show raw dependency information for a package\n"
-#| "   rdepends - Show reverse dependency information for a package\n"
-#| "   pkgnames - List the names of all packages\n"
-#| "   dotty - Generate package graphs for GraphVis\n"
-#| "   xvcg - Generate package graphs for xvcg\n"
-#| "   policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| "  -h   This help text.\n"
-#| "  -p=? The package cache.\n"
-#| "  -s=? The source cache.\n"
-#| "  -q   Disable progress indicator.\n"
-#| "  -i   Show only important deps for the unmet command.\n"
-#| "  -c=? Read this configuration file\n"
-#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -264,7 +225,7 @@ msgstr ""
 "   show - Показва запис за пакета\n"
 "   depends - Показва необработена информация за зависимости на пакета\n"
 "   rdepends - Показва информация за обратните зависимости на пакета\n"
-"   pkgnames - Списък с имената на всички пакети\n"
+"   pkgnames - Списък с имената на всички пакети, за които има информация\n"
 "   dotty - Генериране на графики на пакети за GraphVis\n"
 "   xvcg - Генериране на графики на пакети за xvcg\n"
 "   policy - Показване на настройките на политиката\n"
@@ -2969,12 +2930,3 @@ msgstr "Неуспех при закърпване на файла"
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Връзката прекъсна преждевременно"
-
-#~ msgid ""
-#~ "Since you only requested a single operation it is extremely likely that\n"
-#~ "the package is simply not installable and a bug report against\n"
-#~ "that package should be filed."
-#~ msgstr ""
-#~ "Тъй като сте указали единична операция, твърде е възможно пакета просто\n"
-#~ "да не може да бъде инсталиран; в такъв случай би трябвало да се подаде\n"
-#~ "доклад за грешка за този пакет."
diff --git a/po/fr.po b/po/fr.po
index 91099636a..a6fe7640e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2541,7 +2541,7 @@ msgstr ""
 #: apt-pkg/algorithms.cc:1109
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
-"Impossible de corriger les problèmes, des paquets défecteux sont en mode "
+"Impossible de corriger les problèmes, des paquets défectueux sont en mode "
 "« garder en l'état »."
 
 #: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
diff --git a/po/nb.po b/po/nb.po
index 4f4d49995..1f218850f 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,14 +7,14 @@
 # Axel Bojer <axelb@skolelinux.no>, 2003-2004.
 # Klaus Ade Johnstad <klaus@skolelinux.no>, 2004.
 # Bjorn Steensrud <bjornst@powertech.no>, 2004.
-# Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2003, 2005-2008.
+# Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2003, 2005-2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-11-17 02:07+0100\n"
+"PO-Revision-Date: 2009-02-01 18:26+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.ui.no>\n"
 "MIME-Version: 1.0\n"
@@ -2896,6 +2896,13 @@ msgid "Connection closed prematurely"
 msgstr "Forbindelsen ble uventet stengt"
 
 #~ msgid ""
+#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
+#~ "Limit. Current value: %lu. (man 5 apt.conf)"
+#~ msgstr ""
+#~ "Dynamisk MMap gikk tom for minne. �k st�rrelsen p� APT::Cache-Limit. "
+#~ "N�v�rende verdi: %lu. (man 5 apt.conf)"
+
+#~ msgid ""
 #~ "Since you only requested a single operation it is extremely likely that\n"
 #~ "the package is simply not installable and a bug report against\n"
 #~ "that package should be filed."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 296e58a24..ce7ebc21d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: 0.5.4\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2009-01-04 12:41+0800\n"
+"PO-Revision-Date: 2009-01-28 10:41+0800\n"
 "Last-Translator: Tetralet <tetralet@gmail.com>\n"
 "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
 "debian.org>\n"
@@ -1458,7 +1458,7 @@ msgstr "找不到雜湊元件！"
 
 #: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
-msgstr "在配置轉移資訊時失敗"
+msgstr "在配置抽換資訊時失敗"
 
 #: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
@@ -1467,12 +1467,12 @@ msgstr "在 AddDiversion 發生了內部錯誤"
 #: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "試圖改寫轉移資訊，%s -> %s 和 %s/%s"
+msgstr "試圖改寫抽換資訊，%s -> %s 和 %s/%s"
 
 #: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
-msgstr "重複加入轉移資訊 %s -> %s"
+msgstr "重複加入抽換資訊 %s -> %s"
 
 #: apt-inst/filelist.cc:549
 #, c-format
@@ -1502,16 +1502,16 @@ msgstr "解開 %s 超過一次"
 #: apt-inst/extract.cc:134
 #, c-format
 msgid "The directory %s is diverted"
-msgstr "路徑 %s 已被轉移"
+msgstr "路徑 %s 已被抽換"
 
 #: apt-inst/extract.cc:144
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "此套件試圖寫至轉移後的目標 %s/%s"
+msgstr "此套件試圖寫至抽換後的目標 %s/%s"
 
 #: apt-inst/extract.cc:154 apt-inst/extract.cc:297
 msgid "The diversion path is too long"
-msgstr "要進行轉移的路徑過長"
+msgstr "要進行抽換的路徑過長"
 
 #: apt-inst/extract.cc:240
 #, c-format
@@ -1610,21 +1610,21 @@ msgstr "內部錯誤，無法取得節點"
 #: apt-inst/deb/dpkgdb.cc:305
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
-msgstr "讀取轉移檔 %sdiversions 失敗"
+msgstr "讀取抽換檔 %sdiversions 失敗"
 
 #: apt-inst/deb/dpkgdb.cc:320
 msgid "The diversion file is corrupted"
-msgstr "轉移檔已損壞"
+msgstr "抽換檔已損壞"
 
 #: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
 #: apt-inst/deb/dpkgdb.cc:337
 #, c-format
 msgid "Invalid line in the diversion file: %s"
-msgstr "在轉移檔中的這一行有誤：%s"
+msgstr "在抽換檔中的這一行有誤：%s"
 
 #: apt-inst/deb/dpkgdb.cc:358
 msgid "Internal error adding a diversion"
-msgstr "內部錯誤：在新增轉移資料時發生錯誤"
+msgstr "內部錯誤：在新增抽換資料時發生錯誤"
 
 #: apt-inst/deb/dpkgdb.cc:379
 msgid "The pkg cache must be initialized first"
@@ -2218,7 +2218,7 @@ msgstr "子程序 %s 傳回錯誤碼 (%u)"
 #: apt-pkg/contrib/fileutl.cc:459
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
-msgstr "子程序 %s 不預期的結束"
+msgstr "子程序 %s 不預期得結束"
 
 #: apt-pkg/contrib/fileutl.cc:503
 #, c-format
@@ -2443,7 +2443,7 @@ msgstr "無法修正問題，您保留 (hold) 了損毀的套件。"
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
-msgstr "有一些索引檔不能下載，它們可能被略過了，或是替而使用舊的索引檔。"
+msgstr "有一些索引檔不能下載，它們可能被略過了，或是替而使用原有的索引檔。"
 
 #: apt-pkg/acquire.cc:59
 #, c-format
@@ -2716,7 +2716,7 @@ msgstr "找到了 %zu 個套件索引，%zu 個原始碼索引，%zu 個翻譯�
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
-msgstr "發現標籤 '%s'\n"
+msgstr "找到標籤 '%s'\n"
 
 #: apt-pkg/cdrom.cc:744
 msgid "That is not a valid name, try again.\n"
@@ -2806,7 +2806,7 @@ msgstr "正在準備設定 %s"
 #: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
 #, c-format
 msgid "Processing triggers for %s"
-msgstr "正在後續設定 %s"
+msgstr "正在進行 %s 的觸發程式"
 
 #: apt-pkg/deb/dpkgpm.cc:617
 #, c-format