summaryrefslogtreecommitdiff
path: root/cmdline
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2005-03-14 11:28:59 +0000
committerMichael Vogt <michael.vogt@ubuntu.com>2005-03-14 11:28:59 +0000
commit7c63362cf14c6720e839a8c44217b455d3e93eea (patch)
treea6408a42deea22d9a98d3f88e309c1c990f6f155 /cmdline
parent872b3d3983839d2d9f14268c5adf976a72ecc5ad (diff)
parent48d8533a351e7ef46fe70f17bc3a308d7696a50d (diff)
* sync with matt again
Patches applied: * apt@packages.debian.org/apt--main--0--patch-62 Merge apt--mvo--0 * apt@packages.debian.org/apt--main--0--patch-63 Open 0.6.34 * apt@packages.debian.org/apt--main--0--patch-64 Add missing semicolon in configure-index (Debian #295773) * apt@packages.debian.org/apt--main--0--patch-65 Update build-depends on gettext to 0.12 * apt@packages.debian.org/apt--main--0--patch-66 Merge from bubulle@debian.org--2005/apt--main--0 (translations) * bubulle@debian.org--2005/apt--main--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-48 * bubulle@debian.org--2005/apt--main--0--patch-1 French translation update * bubulle@debian.org--2005/apt--main--0--patch-2 Remove useles tilde files * bubulle@debian.org--2005/apt--main--0--patch-3 Updated Finnish and Basque translations * bubulle@debian.org--2005/apt--main--0--patch-4 Update with files from apt-sarge. Complete French translation. * bubulle@debian.org--2005/apt--main--0--patch-5 Correct typo in Usage message : s/arbitary/arbitrary. Unfuzzy translations. Closes: #291172 * bubulle@debian.org--2005/apt--main--0--patch-6 Updated French manpage. Closes: #291020 * bubulle@debian.org--2005/apt--main--0--patch-7 Japanese documentation update. Closes: #265720 * bubulle@debian.org--2005/apt--main--0--patch-8 Updated Traditional Chines translation * bubulle@debian.org--2005/apt--main--0--patch-9 Updated Norwegian Bokmal translation from sarge branch * bubulle@debian.org--2005/apt--main--0--patch-10 Updated Slovenian translation * bubulle@debian.org--2005/apt--main--0--patch-11 Remove no_NO translation (not needed after sarge) * bubulle@debian.org--2005/apt--main--0--patch-12 Hungarian translation updated from the sarge branch. Closes: #292204 * bubulle@debian.org--2005/apt--main--0--patch-13 Hungarian translation completed. Closes: #292204 * bubulle@debian.org--2005/apt--main--0--patch-14 Polish translation updated from sarge * bubulle@debian.org--2005/apt--main--0--patch-15 Initiali Tagalog translation. Closes:#293132 * bubulle@debian.org--2005/apt--main--0--patch-16 Really add the Tagalog translation. Closes: #293132 * bubulle@debian.org--2005/apt--main--0--patch-17 Completed Tagalog translation. Closes: #293132 * bubulle@debian.org--2005/apt--main--0--patch-18 Merge with Matt and update French translation * bubulle@debian.org--2005/apt--main--0--patch-19 Remove no_NO from LINGUAS * bubulle@debian.org--2005/apt--main--0--patch-20 Rebuild the POT file * bubulle@debian.org--2005/apt--main--0--patch-21 Update all PO files from the new apt-all.pot file * bubulle@debian.org--2005/apt--main--0--patch-22 Complete French translation * bubulle@debian.org--2005/apt--main--0--patch-23 Updated Basque translation for main by Piarres Beobide Egana * bubulle@debian.org--2005/apt--main--0--patch-24 Updated Japanese and Norwegian Bokmal translations * bubulle@debian.org--2005/apt--main--0--patch-25 Tagalog translation update by Eric Pareja * bubulle@debian.org--2005/apt--main--0--patch-26 Updated Simplified Chinese translation by Kov Tchai * bubulle@debian.org--2005/apt--main--0--patch-27 Updated Slovak translation by Peter Mann * bubulle@debian.org--2005/apt--main--0--patch-28 Italian translation update * bubulle@debian.org--2005/apt--main--0--patch-29 Dutch translation update by Bart Cornelis * bubulle@debian.org--2005/apt--main--0--patch-30 Danish translation update by Claus Hindsgaul * bubulle@debian.org--2005/apt--main--0--patch-31 Correct LINGUAS to include ru and tl * bubulle@debian.org--2005/apt--main--0--patch-32 Polish translation update by Bartosz Fenski * bubulle@debian.org--2005/apt--main--0--patch-33 Czech translation update by Miroslav Kure * bubulle@debian.org--2005/apt--main--0--patch-34 Brazilian Portuguese translation update by Andre Luis Lopes * bubulle@debian.org--2005/apt--main--0--patch-35 Complete Norwegian Nynorsk translation by H��vard Korsvoll * bubulle@debian.org--2005/apt--main--0--patch-36 Updated Spanish translation by Ruben Porras * bubulle@debian.org--2005/apt--main--0--patch-37 Russian translation update by Yuri Kozlov * bubulle@debian.org--2005/apt--main--0--patch-38 German translation update by Michael Piefel * bubulle@debian.org--2005/apt--main--0--patch-39 Swedish translation update by Peter Karlsson * bubulle@debian.org--2005/apt--main--0--patch-40 Finnish translation update by Tapio Lehtonen * bubulle@debian.org--2005/apt--main--0--patch-41 Hungarian translation update by Kelemen G��bor * bubulle@debian.org--2005/apt--main--0--patch-42 Catalan translation update by Jordi Mallach * bubulle@debian.org--2005/apt--main--0--patch-43 Korean translation update by Changwoo Ryu * bubulle@debian.org--2005/apt--main--0--patch-44 Greek translation updated by George Papamichelakis * bubulle@debian.org--2005/apt--main--0--patch-45 Important corrections to French translation by Mohamed Adn��neTrojette * bubulle@debian.org--2005/apt--main--0--patch-46 Updated Slovenian translation by Jure Cuhalev * bubulle@debian.org--2005/apt--main--0--patch-47 French translation update after proofreading * bubulle@debian.org--2005/apt--main--0--patch-48 Updated Portuguese translation by Miguel Figuereido * bubulle@debian.org--2005/apt--main--0--patch-49 Traditional Chinese translation update by Asho Yeh * bubulle@debian.org--2005/apt--main--0--patch-50 Restored complete French translation * bubulle@debian.org--2005/apt--main--0--patch-51 Remove de.UTF-8 from LINGUAS * bubulle@debian.org--2005/apt--main--0--patch-52 Greek translation completed * bubulle@debian.org--2005/apt--main--0--patch-53 Traditional Chinese translation update * bubulle@debian.org--2005/apt--main--0--patch-54 Merge with matt * bubulle@debian.org--2005/apt--main--0--patch-55 Regenerate apt-all.pot from the sources after merging with Matt * bubulle@debian.org--2005/apt--main--0--patch-56 Re-sync PO files with the POT file * bubulle@debian.org--2005/apt--main--0--patch-57 Correct file permissions
Diffstat (limited to 'cmdline')
-rw-r--r--cmdline/apt-cache.cc2
-rw-r--r--cmdline/apt-cdrom.cc2
-rw-r--r--cmdline/apt-config.cc2
-rw-r--r--cmdline/apt-extracttemplates.cc2
-rw-r--r--cmdline/apt-get.cc2
-rw-r--r--cmdline/apt-sortpkgs.cc2
6 files changed, 6 insertions, 6 deletions
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 18680a5db..4e16b8c11 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1688,7 +1688,7 @@ bool ShowHelp(CommandLine &Cmd)
" -q Disable progress indicator.\n"
" -i Show only important deps for the unmet command.\n"
" -c=? Read this configuration file\n"
- " -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\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");
return true;
}
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 8010e7b53..2578f9c6b 100644
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -159,7 +159,7 @@ int ShowHelp()
" -f Fast mode, don't check package files\n"
" -a Thorough scan mode\n"
" -c=? Read this configuration file\n"
- " -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See fstab(5)\n";
return 0;
}
diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc
index 1c3de2bed..34365dc2e 100644
--- a/cmdline/apt-config.cc
+++ b/cmdline/apt-config.cc
@@ -84,7 +84,7 @@ int ShowHelp()
"Options:\n"
" -h This help text.\n"
" -c=? Read this configuration file\n"
- " -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n");
+ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n");
return 0;
}
/*}}}*/
diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index d6894a732..c87b436ba 100644
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -238,7 +238,7 @@ int ShowHelp(void)
" -h This help text\n"
" -t Set the temp dir\n"
" -c=? Read this configuration file\n"
- " -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n");
+ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n");
return 0;
}
/*}}}*/
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 6dbb8285f..cdefd0034 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2390,7 +2390,7 @@ bool ShowHelp(CommandLine &CmdL)
" -b Build the source package after fetching it\n"
" -V Show verbose version numbers\n"
" -c=? Read this configuration file\n"
- " -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
"pages for more information and options.\n"
" This APT has Super Cow Powers.\n");
diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc
index a0ec2263e..e6a6b9a56 100644
--- a/cmdline/apt-sortpkgs.cc
+++ b/cmdline/apt-sortpkgs.cc
@@ -156,7 +156,7 @@ int ShowHelp()
" -h This help text\n"
" -s Use source file sorting\n"
" -c=? Read this configuration file\n"
- " -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n");
+ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n");
return 0;
}