diff options
Diffstat (limited to 'po')
| -rw-r--r-- | po/apt-all.pot | 72 | ||||
| -rw-r--r-- | po/makefile | 6 |
2 files changed, 44 insertions, 34 deletions
diff --git a/po/apt-all.pot b/po/apt-all.pot index 8e4d9d62b..c655eb9a6 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-30 13:46-0500\n" +"POT-Creation-Date: 2011-11-10 16:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -154,7 +154,7 @@ msgstr "" #: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590 -#: cmdline/apt-get.cc:3244 cmdline/apt-internal-solver.cc:32 +#: cmdline/apt-get.cc:3247 cmdline/apt-internal-solver.cc:32 #: cmdline/apt-mark.cc:266 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1088,7 +1088,7 @@ msgstr "" #, c-format msgid "" "Please use:\n" -"bzr get %s\n" +"bzr branch %s\n" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" @@ -1222,11 +1222,11 @@ msgstr "" msgid "Changelog for %s (%s)" msgstr "" -#: cmdline/apt-get.cc:3249 +#: cmdline/apt-get.cc:3252 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:3290 +#: cmdline/apt-get.cc:3293 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1272,7 +1272,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:3455 +#: cmdline/apt-get.cc:3458 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -2578,19 +2578,19 @@ msgstr "" msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:770 +#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:432 apt-pkg/packagemanager.cc:462 +#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467 #, c-format msgid "Could not configure '%s'. " msgstr "" -#: apt-pkg/packagemanager.cc:502 +#: apt-pkg/packagemanager.cc:507 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -3073,115 +3073,115 @@ msgstr "" msgid "Execute external solver" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:71 +#: apt-pkg/deb/dpkgpm.cc:70 #, c-format msgid "Installing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:866 +#: apt-pkg/deb/dpkgpm.cc:71 apt-pkg/deb/dpkgpm.cc:865 #, c-format msgid "Configuring %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:873 +#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:872 #, c-format msgid "Removing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:74 +#: apt-pkg/deb/dpkgpm.cc:73 #, c-format msgid "Completely removing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:75 +#: apt-pkg/deb/dpkgpm.cc:74 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:76 +#: apt-pkg/deb/dpkgpm.cc:75 #, c-format msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:672 +#: apt-pkg/deb/dpkgpm.cc:671 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707 +#: apt-pkg/deb/dpkgpm.cc:686 apt-pkg/deb/dpkgpm.cc:706 #, c-format msgid "Could not open file '%s'" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:859 +#: apt-pkg/deb/dpkgpm.cc:858 #, c-format msgid "Preparing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:860 +#: apt-pkg/deb/dpkgpm.cc:859 #, c-format msgid "Unpacking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:865 +#: apt-pkg/deb/dpkgpm.cc:864 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:867 +#: apt-pkg/deb/dpkgpm.cc:866 #, c-format msgid "Installed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:872 +#: apt-pkg/deb/dpkgpm.cc:871 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:874 +#: apt-pkg/deb/dpkgpm.cc:873 #, c-format msgid "Removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:879 +#: apt-pkg/deb/dpkgpm.cc:878 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:880 +#: apt-pkg/deb/dpkgpm.cc:879 #, c-format msgid "Completely removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1111 +#: apt-pkg/deb/dpkgpm.cc:1110 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1141 +#: apt-pkg/deb/dpkgpm.cc:1140 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1320 +#: apt-pkg/deb/dpkgpm.cc:1319 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1377 +#: apt-pkg/deb/dpkgpm.cc:1376 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1382 +#: apt-pkg/deb/dpkgpm.cc:1381 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1384 +#: apt-pkg/deb/dpkgpm.cc:1383 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1390 +#: apt-pkg/deb/dpkgpm.cc:1389 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3193,7 +3193,13 @@ msgid "" "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1403 +#: apt-pkg/deb/dpkgpm.cc:1403 apt-pkg/deb/dpkgpm.cc:1409 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1430 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/makefile b/po/makefile index 9f8b7b22e..d2fb8d280 100644 --- a/po/makefile +++ b/po/makefile @@ -55,7 +55,11 @@ $(PACKAGE)-all.pot: $(POTFILES) $(LANG_POFILES) : $(PO_DOMAINS)/%.po : $(PACKAGE)-all.pot printf "%s " "Generating $@" echo $@ : $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot > $(PO)/$(call GETDOMAIN,$*)_$(notdir $@).d - $(MSGMERGE) $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot -o $@ + # thanks powerpc for segfaulting in msgmerge in the first run + # (but not the second) - the part "||.." should get removed + # once powerpc is a bit more stable + $(MSGMERGE) $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot -o $@ || \ + $(MSGMERGE) $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot -o $@ $(MOFILES) : $(PO_DOMAINS)/%.mo : $(PO_DOMAINS)/%.po printf "%s: " "Generating $(LOCALE)/$(notdir $*)/LC_MESSAGES/$(call GETDOMAIN,$*).mo" |