From 67f393ab12ca6c626a11847cf5bb78912f526dd5 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sat, 15 Dec 2007 18:24:34 +0530 Subject: Update PO files --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 671145fde..2d267a66b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ apt (0.7.10) UNRELEASED; urgency=low [ Program translations ] - Basque updated. Closes: #453088 + - Vietnamese updated. Closes: #453774 [ Michael Vogt ] * debian/rules -- cgit v1.2.3-70-g09d2 From 885d204bd354739187413005874797504f3b95f3 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sun, 16 Dec 2007 18:22:24 -0200 Subject: * Applied patch from Amos Waterland to allow apt to work properly in initramfs, closes: #448316. --- cmdline/apt-get.cc | 21 +++++++++++++++++---- debian/changelog | 4 +++- 2 files changed, 20 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index efb618cb0..3bcacb293 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -63,6 +64,8 @@ #include /*}}}*/ +#define RAMFS_MAGIC 0x858458f6 + using namespace std; ostream c0out(0); @@ -861,8 +864,13 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, return _error->Errno("statvfs",_("Couldn't determine free space in %s"), OutputDir.c_str()); if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize) - return _error->Error(_("You don't have enough free space in %s."), - OutputDir.c_str()); + { + struct statfs Stat; + if (statfs(OutputDir.c_str(),&Stat) != 0 || + unsigned(Stat.f_type) != RAMFS_MAGIC) + return _error->Error(_("You don't have enough free space in %s."), + OutputDir.c_str()); + } } // Fail safe check @@ -2188,8 +2196,13 @@ bool DoSource(CommandLine &CmdL) return _error->Errno("statvfs",_("Couldn't determine free space in %s"), OutputDir.c_str()); if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize) - return _error->Error(_("You don't have enough free space in %s"), - OutputDir.c_str()); + { + struct statfs Stat; + if (statfs(OutputDir.c_str(),&Stat) != 0 || + unsigned(Stat.f_type) != RAMFS_MAGIC) + return _error->Error(_("You don't have enough free space in %s"), + OutputDir.c_str()); + } // Number of bytes if (DebBytes != FetchBytes) diff --git a/debian/changelog b/debian/changelog index 2d267a66b..aa324144e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ apt (0.7.10) UNRELEASED; urgency=low closes: #452862. * Applied patch from Alexander Winston to use 'min' as symbol for minute, closes: #219034. + * Applied patch from Amos Waterland to allow apt to + work properly in initramfs, closes: #448316. [ Program translations ] - Basque updated. Closes: #453088 @@ -39,7 +41,7 @@ apt (0.7.10) UNRELEASED; urgency=low * ftparchive/multicompress.cc: - support lzma output - -- Otavio Salvador Sat, 08 Dec 2007 12:13:58 -0200 + -- Otavio Salvador Sun, 16 Dec 2007 18:21:14 -0200 apt (0.7.9) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 9129f2af997bf10530432c6d7cd9711cd3dbbba1 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sun, 16 Dec 2007 18:25:29 -0200 Subject: * Applied patch from Robert Millan to make apt-key and apt-get to ignore time conflicts, closes: #451328. --- cmdline/apt-key | 4 ++-- debian/changelog | 4 +++- methods/gpgv.cc | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/cmdline/apt-key b/cmdline/apt-key index 3bd1a92d9..c7db9a25a 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -5,7 +5,7 @@ set -e # We don't use a secret keyring, of course, but gpg panics and # implodes if there isn't one available -GPG_CMD="gpg --no-options --no-default-keyring --secret-keyring /etc/apt/secring.gpg --trustdb-name /etc/apt/trustdb.gpg" +GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring --secret-keyring /etc/apt/secring.gpg --trustdb-name /etc/apt/trustdb.gpg" GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg" @@ -21,7 +21,7 @@ update() { fi # add new keys - $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --ignore-time-conflict --import + $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --import # remove no-longer used keys keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys | grep ^pub | cut -d: -f5` diff --git a/debian/changelog b/debian/changelog index aa324144e..8e3f9ab38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ apt (0.7.10) UNRELEASED; urgency=low to use 'min' as symbol for minute, closes: #219034. * Applied patch from Amos Waterland to allow apt to work properly in initramfs, closes: #448316. + * Applied patch from Robert Millan to make apt-key and + apt-get to ignore time conflicts, closes: #451328. [ Program translations ] - Basque updated. Closes: #453088 @@ -41,7 +43,7 @@ apt (0.7.10) UNRELEASED; urgency=low * ftparchive/multicompress.cc: - support lzma output - -- Otavio Salvador Sun, 16 Dec 2007 18:21:14 -0200 + -- Otavio Salvador Sun, 16 Dec 2007 18:23:52 -0200 apt (0.7.9) unstable; urgency=low diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 01b240856..1ed26a30a 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -83,6 +83,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, Args[i++] = gpgvpath.c_str(); Args[i++] = "--status-fd"; Args[i++] = "3"; + Args[i++] = "--ignore-time-conflict"; Args[i++] = "--keyring"; Args[i++] = pubringpath.c_str(); -- cgit v1.2.3-70-g09d2 From da543ed87d3f8b8a0030a211452c9bddfc066f0b Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sun, 16 Dec 2007 18:35:58 -0200 Subject: * Applied patch from Peter Eisentraut to fix a grammatical error ("manual installed" -> "manually installed"), closes: #438136. * --- apt-pkg/algorithms.cc | 4 ++-- cmdline/apt-get.cc | 2 +- debian/changelog | 8 +++++++- 3 files changed, 10 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 62727a852..158f9c258 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1261,8 +1261,8 @@ void pkgProblemResolver::InstallProtect() Cache.MarkDelete(I); else { - // preserver the information if the package was auto - // or manual installed + // preserve the information whether the package was auto + // or manually installed bool autoInst = (Cache[I].Flags & pkgCache::Flag::Auto); Cache.MarkInstall(I, false, 0, !autoInst); } diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 3bcacb293..486e995cc 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1719,7 +1719,7 @@ bool DoInstall(CommandLine &CmdL) (Cache[Pkg].Flags & pkgCache::Flag::Auto) && _config->FindB("APT::Get::ReInstall",false) == false) { - ioprintf(c1out,_("%s set to manual installed.\n"), + ioprintf(c1out,_("%s set to manually installed.\n"), Pkg.Name()); Cache->MarkAuto(Pkg,false); AutoMarkChanged++; diff --git a/debian/changelog b/debian/changelog index 8e3f9ab38..4c56aa901 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,9 @@ apt (0.7.10) UNRELEASED; urgency=low work properly in initramfs, closes: #448316. * Applied patch from Robert Millan to make apt-key and apt-get to ignore time conflicts, closes: #451328. + * Applied patch from Peter Eisentraut to fix a + grammatical error ("manual installed" -> "manually installed"), + closes: #438136. [ Program translations ] - Basque updated. Closes: #453088 @@ -43,7 +46,10 @@ apt (0.7.10) UNRELEASED; urgency=low * ftparchive/multicompress.cc: - support lzma output - -- Otavio Salvador Sun, 16 Dec 2007 18:23:52 -0200 + [ Otavio Salvador ] + * + + -- Otavio Salvador Sun, 16 Dec 2007 18:34:40 -0200 apt (0.7.9) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 7806855fae29481c2f1a6af255e5b9add5c21a1a Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sun, 16 Dec 2007 18:37:12 -0200 Subject: remove wrong changelog entry --- debian/changelog | 3 --- 1 file changed, 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4c56aa901..99124b6fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -46,9 +46,6 @@ apt (0.7.10) UNRELEASED; urgency=low * ftparchive/multicompress.cc: - support lzma output - [ Otavio Salvador ] - * - -- Otavio Salvador Sun, 16 Dec 2007 18:34:40 -0200 apt (0.7.9) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 18d38975fb8ff17340ddf0457d74f02a596248fb Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sun, 16 Dec 2007 18:46:43 -0200 Subject: * Fix cron.daily job to not call fail if apt isn't installed, closes: #443286. --- debian/apt.cron.daily | 3 +++ debian/changelog | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 1d4df56b6..7af689e1f 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -147,6 +147,9 @@ check_size_constraints() fi } +if ! which apt-config >/dev/null; then + exit 0 +fi UpdateInterval=0 DownloadUpgradeableInterval=0 diff --git a/debian/changelog b/debian/changelog index 99124b6fd..9ae68c770 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ apt (0.7.10) UNRELEASED; urgency=low * Applied patch from Peter Eisentraut to fix a grammatical error ("manual installed" -> "manually installed"), closes: #438136. + * Fix cron.daily job to not call fail if apt isn't installed, closes: + #443286. [ Program translations ] - Basque updated. Closes: #453088 @@ -46,7 +48,7 @@ apt (0.7.10) UNRELEASED; urgency=low * ftparchive/multicompress.cc: - support lzma output - -- Otavio Salvador Sun, 16 Dec 2007 18:34:40 -0200 + -- Otavio Salvador Sun, 16 Dec 2007 18:46:29 -0200 apt (0.7.9) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From db2cca1129fa2d88eae80e1c4a17e263236a95a3 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sun, 16 Dec 2007 18:53:32 -0200 Subject: * apt-pkg/contrib/configuration.cc: - if RootDir is set, then FindFile and FindDir will return paths relative to the directory stored in RootDir, closes: #456457. --- apt-pkg/contrib/configuration.cc | 7 ++++++- debian/changelog | 5 +++++ doc/apt.conf.5.xml | 13 +++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 3109fd7a5..e8301d918 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -173,6 +173,11 @@ string Configuration::Find(const char *Name,const char *Default) const */ string Configuration::FindFile(const char *Name,const char *Default) const { + const Item *RootItem = Lookup("RootDir"); + std::string rootDir = (RootItem == 0) ? "" : RootItem->Value; + if(rootDir.size() > 0 && rootDir[rootDir.size() - 1] != '/') + rootDir.push_back('/'); + const Item *Itm = Lookup(Name); if (Itm == 0 || Itm->Value.empty() == true) { @@ -204,7 +209,7 @@ string Configuration::FindFile(const char *Name,const char *Default) const Itm = Itm->Parent; } - return val; + return rootDir + val; } /*}}}*/ // Configuration::FindDir - Find a directory name /*{{{*/ diff --git a/debian/changelog b/debian/changelog index 9ae68c770..d8ce744d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,11 @@ apt (0.7.10) UNRELEASED; urgency=low - support lzma data members * ftparchive/multicompress.cc: - support lzma output + + [ Daniel Burrows ] + * apt-pkg/contrib/configuration.cc: + - if RootDir is set, then FindFile and FindDir will return paths + relative to the directory stored in RootDir, closes: #456457. -- Otavio Salvador Sun, 16 Dec 2007 18:46:29 -0200 diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 43f33681f..5bc6c55db 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -295,6 +295,19 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; dpkg, apt-get dpkg-source dpkg-buildpackage and apt-cache specify the location of the respective programs. + + + The configuration item RootDir has a special + meaning. If set, all paths in Dir:: will be + relative to RootDir, even paths that + are specified absolutely. So, for instance, if + RootDir is set to + /tmp/staging and + Dir::State::status is set to + /var/lib/dpkg/status, then the status file + will be looked up in + /tmp/staging/var/lib/dpkg/status. + APT in DSelect -- cgit v1.2.3-70-g09d2 From 813603a05f071c07ca34921823b246e0aaaec650 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Mon, 17 Dec 2007 10:16:21 +0530 Subject: Fix wording of 'after unpacking' --- cmdline/apt-get.cc | 6 +++--- debian/changelog | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 486e995cc..53c657e8a 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -838,16 +838,16 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, if (DebBytes != FetchBytes) ioprintf(c1out,_("Need to get %sB/%sB of archives.\n"), SizeToStr(FetchBytes).c_str(),SizeToStr(DebBytes).c_str()); - else + else if (DebBytes != 0) ioprintf(c1out,_("Need to get %sB of archives.\n"), SizeToStr(DebBytes).c_str()); // Size delta if (Cache->UsrSize() >= 0) - ioprintf(c1out,_("After unpacking %sB of additional disk space will be used.\n"), + ioprintf(c1out,_("After this operation, %sB of additional disk space will be used.\n"), SizeToStr(Cache->UsrSize()).c_str()); else - ioprintf(c1out,_("After unpacking %sB disk space will be freed.\n"), + ioprintf(c1out,_("After this operation, %sB disk space will be freed.\n"), SizeToStr(-1*Cache->UsrSize()).c_str()); if (_error->PendingError() == true) diff --git a/debian/changelog b/debian/changelog index d8ce744d6..9e74d5a0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -53,7 +53,11 @@ apt (0.7.10) UNRELEASED; urgency=low - if RootDir is set, then FindFile and FindDir will return paths relative to the directory stored in RootDir, closes: #456457. - -- Otavio Salvador Sun, 16 Dec 2007 18:46:29 -0200 + [ Christian Perrier ] + * Fix wording for "After unpacking...". Thans to Michael Gilbert + for the patch. Closes: #260825 + + -- Christian Perrier Mon, 17 Dec 2007 10:10:17 +0530 apt (0.7.9) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 383594799377d5e628ee84557218f538d7b0bc0a Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Wed, 19 Dec 2007 00:16:08 +0530 Subject: Japanese translation updated --- debian/changelog | 2 + po/ChangeLog | 4 ++ po/ja.po | 146 +++++++++++++++++++------------------------------------ 3 files changed, 57 insertions(+), 95 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9e74d5a0a..ef9784178 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,8 @@ apt (0.7.10) UNRELEASED; urgency=low [ Program translations ] - Basque updated. Closes: #453088 - Vietnamese updated. Closes: #453774 + - Japanese updated. Closes: #456909 + - French updated. [ Michael Vogt ] * debian/rules diff --git a/po/ChangeLog b/po/ChangeLog index 940910b4f..317cf5304 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2007-12-18 Kenshi Muto + + * ja.po: Updated to 536t. Closes: #456909 + 2007-12-17 Christian Perrier * fr.po: completed to 536t. diff --git a/po/ja.po b/po/ja.po index 7861a208a..f82d4b9e3 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-12-17 05:49+0100\n" -"PO-Revision-Date: 2006-09-08 19:57+0900\n" +"PO-Revision-Date: 2007-12-18 21:13+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" "MIME-Version: 1.0\n" @@ -57,9 +57,8 @@ msgid "Total distinct versions: " msgstr "個別バージョン総数: " #: cmdline/apt-cache.cc:295 -#, fuzzy msgid "Total Distinct Descriptions: " -msgstr "個別バージョン総数: " +msgstr "個別説明総数: " #: cmdline/apt-cache.cc:297 msgid "Total dependencies: " @@ -70,9 +69,8 @@ msgid "Total ver/file relations: " msgstr "バージョン/ファイル関係総数: " #: cmdline/apt-cache.cc:302 -#, fuzzy msgid "Total Desc/File relations: " -msgstr "バージョン/ファイル関係総数: " +msgstr "説明/ファイル関係総数: " #: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " @@ -160,9 +158,9 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 #: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 -#, fuzzy, c-format +#, c-format msgid "%s %s for %s compiled on %s %s\n" -msgstr "%s %s for %s %s コンパイル日時: %s %s\n" +msgstr "%s %s for %s コンパイル日時: %s %s\n" #: cmdline/apt-cache.cc:1721 msgid "" @@ -845,14 +843,14 @@ msgid "Need to get %sB of archives.\n" msgstr "%sB のアーカイブを取得する必要があります。\n" #: cmdline/apt-get.cc:847 -#, fuzzy, c-format +#, c-format msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "展開後に追加で %sB のディスク容量が消費されます。\n" +msgstr "この操作後に追加で %sB のディスク容量が消費されます。\n" #: cmdline/apt-get.cc:850 -#, fuzzy, c-format +#, c-format msgid "After this operation, %sB disk space will be freed.\n" -msgstr "展開後に %sB のディスク容量が解放されます。\n" +msgstr "この操作後に %sB のディスク容量が解放されます。\n" #: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 #, c-format @@ -1018,41 +1016,43 @@ msgstr "" #: cmdline/apt-get.cc:1441 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" +"一連のものを削除するようになっていないので、AutoRemover を開始できません" #: cmdline/apt-get.cc:1473 -#, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" -msgstr "以下のパッケージが新たにインストールされます:" +msgstr "" +"以下のパッケージが自動でインストールされましたが、もう必要とされていません:" #: cmdline/apt-get.cc:1475 msgid "Use 'apt-get autoremove' to remove them." -msgstr "" +msgstr "これらを削除するには 'apt-get autoremove' を利用してください。" #: cmdline/apt-get.cc:1480 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" +"AutoRemover が、本来起きるべきでない何かを壊したようです。\n" +"apt にバグ報告を送ってください。" #: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 msgid "The following information may help to resolve the situation:" msgstr "以下の情報がこの問題を解決するために役立つかもしれません:" #: cmdline/apt-get.cc:1487 -#, fuzzy msgid "Internal Error, AutoRemover broke stuff" -msgstr "内部エラー、問題リゾルバが何かを破壊しました" +msgstr "内部エラー、AutoRemover が何かを破壊しました" #: cmdline/apt-get.cc:1506 msgid "Internal error, AllUpgrade broke stuff" msgstr "内部エラー、AllUpgrade が何かを破壊しました" #: cmdline/apt-get.cc:1553 -#, fuzzy, c-format +#, c-format msgid "Couldn't find task %s" -msgstr "パッケージ %s が見つかりません" +msgstr "タスク %s が見つかりません" #: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 #, c-format @@ -1065,9 +1065,9 @@ msgid "Note, selecting %s for regex '%s'\n" msgstr "注意: 正規表現 '%2$s' に対して %1$s を選択しました\n" #: cmdline/apt-get.cc:1722 -#, fuzzy, c-format +#, c-format msgid "%s set to manually installed.\n" -msgstr "しかし、%s はインストールされようとしています" +msgstr "%s は手動でインストールしたと設定されました。\n" #: cmdline/apt-get.cc:1735 msgid "You might want to run `apt-get -f install' to correct these:" @@ -1260,7 +1260,6 @@ msgid "Supported modules:" msgstr "サポートされているモジュール:" #: cmdline/apt-get.cc:2647 -#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1318,6 +1317,8 @@ msgstr "" " install - 新規パッケージをインストールします\n" " (pkg は libc6.deb ではなく libc6 のように指定します)\n" " remove - パッケージを削除します\n" +" autoremove - 自動インストールされ使われていないすべてのパッケージを削除し" +"ます\n" " source - ソースアーカイブをダウンロードします\n" " build-dep - ソースパッケージの構築依存関係を設定します\n" " dist-upgrade - ディストリビューションをアップグレードします\n" @@ -1686,11 +1687,11 @@ msgid "This is not a valid DEB archive, missing '%s' member" msgstr "'%s' メンバーがないため、正しい DEB アーカイブではありません" #: apt-inst/deb/debfile.cc:50 -#, fuzzy, c-format +#, c-format msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "" -"'%s' または '%s' メンバーがないため、これは正しい DEB アーカイブではありませ" -"ん" +"これは正しい DEB アーカイブではありません。'%s'、'%s'、'%s' のいずれのメン" +"バーもありません" #: apt-inst/deb/debfile.cc:110 #, c-format @@ -2103,9 +2104,9 @@ msgid "Opening configuration file %s" msgstr "設定ファイル %s をオープンできませんでした" #: apt-pkg/contrib/configuration.cc:515 -#, fuzzy, c-format +#, c-format msgid "Line %d too long (max %u)" -msgstr "%d 行目が長すぎます (最大 %d)" +msgstr "%d 行目が長すぎます (最大 %u)" #: apt-pkg/contrib/configuration.cc:611 #, c-format @@ -2335,7 +2336,7 @@ msgstr "廃止" #: apt-pkg/pkgcache.cc:226 msgid "Breaks" -msgstr "" +msgstr "破壊" #: apt-pkg/pkgcache.cc:237 msgid "important" @@ -2370,19 +2371,18 @@ msgid "Dependency generation" msgstr "依存関係の生成" #: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 -#, fuzzy msgid "Reading state information" -msgstr "入手可能情報をマージしています" +msgstr "状態情報を読み取っています" #: apt-pkg/depcache.cc:219 -#, fuzzy, c-format +#, c-format msgid "Failed to open StateFile %s" -msgstr "%s のオープンに失敗しました" +msgstr "状態ファイル %s のオープンに失敗しました" #: apt-pkg/depcache.cc:225 -#, fuzzy, c-format +#, c-format msgid "Failed to write temporary StateFile %s" -msgstr "ファイル %s の書き込みに失敗しました" +msgstr "一時状態ファイル %s の書き込みに失敗しました" #: apt-pkg/tagfile.cc:102 #, c-format @@ -2579,9 +2579,9 @@ msgid "Error occurred while processing %s (UsePackage1)" msgstr "%s を処理中にエラーが発生しました (UsePackage1)" #: apt-pkg/pkgcachegen.cc:153 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (NewFileDesc1)" -msgstr "%s を処理中にエラーが発生しました (NewFileVer1)" +msgstr "%s を処理中にエラーが発生しました (NewFileDesc1)" #: apt-pkg/pkgcachegen.cc:178 #, c-format @@ -2609,9 +2609,9 @@ msgid "Error occurred while processing %s (NewVersion2)" msgstr "%s を処理中にエラーが発生しました (NewVersion2)" #: apt-pkg/pkgcachegen.cc:245 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (NewFileDesc2)" -msgstr "%s を処理中にエラーが発生しました (NewFileVer1)" +msgstr "%s を処理中にエラーが発生しました (NewFileDesc2)" #: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." @@ -2622,9 +2622,8 @@ msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "この APT が対応している以上の数のバージョンが要求されました。" #: apt-pkg/pkgcachegen.cc:257 -#, fuzzy msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "この APT が対応している以上の数のバージョンが要求されました。" +msgstr "この APT が対応している以上の数の説明が要求されました。" #: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." @@ -2668,9 +2667,8 @@ msgid "MD5Sum mismatch" msgstr "MD5Sum が適合しません" #: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 -#, fuzzy msgid "Hash Sum mismatch" -msgstr "MD5Sum が適合しません" +msgstr "ハッシュサムが適合しません" #: apt-pkg/acquire-item.cc:1100 msgid "There is no public key available for the following key IDs:\n" @@ -2730,9 +2728,8 @@ msgid "Stored label: %s\n" msgstr "格納されたラベル: %s \n" #: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 -#, fuzzy msgid "Unmounting CD-ROM...\n" -msgstr "CD-ROM をアンマウントしています ..." +msgstr "CD-ROM をアンマウントしています ...\n" #: apt-pkg/cdrom.cc:590 #, c-format @@ -2757,18 +2754,18 @@ msgid "Scanning disc for index files..\n" msgstr "ディスクのインデックスファイルを走査しています ..\n" #: apt-pkg/cdrom.cc:678 -#, fuzzy, c-format +#, c-format msgid "" "Found %u package indexes, %u source indexes, %u translation indexes and %u " "signatures\n" msgstr "" -"%i のパッケージインデックス、%i のソースインデックス、%i の署名を見つけまし" -"た\n" +"%u のパッケージインデックス、%u のソースインデックス、%u の翻訳インデック" +"ス、%u の署名を見つけました\n" #: apt-pkg/cdrom.cc:715 -#, fuzzy, c-format +#, 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" @@ -2818,9 +2815,9 @@ msgstr "" "ファイルがあります。\n" #: apt-pkg/deb/dpkgpm.cc:513 -#, fuzzy, c-format +#, c-format msgid "Directory '%s' missing" -msgstr "リストディレクトリ %spartial が見つかりません。" +msgstr "ディレクトリ '%s' が見つかりません" #: apt-pkg/deb/dpkgpm.cc:596 #, c-format @@ -2843,9 +2840,9 @@ msgid "Configuring %s" msgstr "%s を設定しています" #: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 -#, fuzzy, c-format +#, c-format msgid "Processing triggers for %s" -msgstr "ディレクトリ %s の処理中にエラーが発生しました" +msgstr "%s のトリガーを処理しています" #: apt-pkg/deb/dpkgpm.cc:608 #, c-format @@ -2881,6 +2878,8 @@ msgstr "%s を完全に削除しました" #: apt-pkg/deb/dpkgpm.cc:775 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +"ログに書き込めません。openpty() に失敗しました (/dev/pts がマウントされていな" +"い?)\n" #: methods/rred.cc:219 msgid "Could not patch file" @@ -2889,46 +2888,3 @@ msgstr "ファイルにパッチできませんでした" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "途中で接続がクローズされました" - -#, fuzzy -#~ msgid "Line %d too long (max %d)" -#~ msgstr "%d 行目が長すぎます (最大 %d)" - -#, fuzzy -#~ msgid "Error occured while processing %s (NewFileDesc1)" -#~ msgstr "%s を処理中にエラーが発生しました (NewFileVer1)" - -#, fuzzy -#~ msgid "Error occured while processing %s (NewFileDesc2)" -#~ msgstr "%s を処理中にエラーが発生しました (NewFileVer1)" - -#, fuzzy -#~ msgid "Stored label: %s \n" -#~ msgstr "格納されたラベル: %s \n" - -#, fuzzy -#~ msgid "" -#~ "Found %i package indexes, %i source indexes, %i translation indexes and %" -#~ "i signatures\n" -#~ msgstr "" -#~ "%i のパッケージインデックス、%i のソースインデックス、%i の署名を見つけま" -#~ "した\n" - -#, fuzzy -#~ msgid "openpty failed\n" -#~ msgstr "select に失敗しました" - -#~ msgid "File date has changed %s" -#~ msgstr "ファイル %s の日付が変更されています" - -#~ msgid "Reading file list" -#~ msgstr "ファイルリストを読み込んでいます" - -#~ msgid "Could not execute " -#~ msgstr "実行できませんでした:" - -#~ msgid "Preparing for remove with config %s" -#~ msgstr "設定 %s の削除を準備しています" - -#~ msgid "Removed with config %s" -#~ msgstr "設定 %s を削除しました" -- cgit v1.2.3-70-g09d2