* makefile fixes to make apt rosetta friendly

diff --git a/debian/changelog b/debian/changelog
index 85202936040083b6bc300a2bc99c3f1db2d83fcb..7cbcdc61e91cfbdd2bf5fa89946440503a889324 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ apt (0.6.40.1ubuntu8) breezy; urgency=low
 
   * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62:
     - fix for a bad memory/file leak in the mmap code (ubuntu #15603)
 
   * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62:
     - fix for a bad memory/file leak in the mmap code (ubuntu #15603)

-  * po/de.po: 
-    - updated the translation
+  * po/de.po, po/fr.po: 
+    - updated the translations
+  * po/makefile:
+    - create a single pot file in each domain dir to make rosetta happy

 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 28 Sep 2005 10:16:06 +0200
 
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 28 Sep 2005 10:16:06 +0200
 

diff --git a/debian/rules b/debian/rules
index 3bc9f53d98ab88746d4d58810d3014efee534e98..1e339aade9ffba19689e696119928798c611aa61 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -213,6 +213,11 @@ apt: build debian/shlibs.local
 
 #      head -n 500 ChangeLog > debian/ChangeLog
 
 
 #      head -n 500 ChangeLog > debian/ChangeLog
 

+       # make rosetta happy and remove pot files in po/ (but leave stuff
+       # in po/domains/* untouched) and cp *.po into each domain dir
+       rm -f build/po/*.pot
+       rm -f po/*.pot
+

        dh_installexamples -p$@ $(BLD)/docs/examples/*
        dh_installman -p$@ 
        dh_installcron -p$@
        dh_installexamples -p$@ $(BLD)/docs/examples/*
        dh_installman -p$@ 
        dh_installcron -p$@

diff --git a/po/apt-all.pot b/po/apt-all.pot
index 8bf2f9ccdbb5cd104c735f6f0836d99c9d62ede5..31b60eb46086d5af2754b9ad5c84f562e162d7e5 100644 (file)
--- 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"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2005-09-13 15:16+0200\n"
+"POT-Creation-Date: 2005-09-28 11:55+0200\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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/po/de.po b/po/de.po
index ed2aec09c4d69842c9905c2a6aac08f21a1e3ddd..ba68802b4a4b899587477ff91ee0cb98bfa65226 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -2786,7 +2786,7 @@ msgstr "Verbindung zu früh beendet"
 #~ msgid " to "
 #~ msgstr " nach "
 
 #~ msgid " to "
 #~ msgstr " nach "
 

-# \r#~ msgid "Extract "
+#~ msgid "Extract "

 #~ msgstr "Extrahiert "
 
 #~ msgid "Aborted, backing out"
 #~ msgstr "Extrahiert "
 
 #~ msgid "Aborted, backing out"

diff --git a/po/fr.po b/po/fr.po
index 96e8538fe8541683465ef9db40759da6d6d594f6..5060ae3149143c4824fab1a4ebdd508ed659a16d 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: apt 0.5.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-09-13 15:16+0200\n"
 "Project-Id-Version: apt 0.5.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-09-13 15:16+0200\n"

-"PO-Revision-Date: 2005-07-28 20:52+0200\n"
+"PO-Revision-Date: 2005-09-28 19:44+0200\n"

 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"


@@ -765,7 +765,7 @@ msgstr "ATTENTION : les paquets suivants n'ont pas 
 
 #: cmdline/apt-get.cc:691
 msgid "Authentication warning overridden.\n"
 
 #: cmdline/apt-get.cc:691
 msgid "Authentication warning overridden.\n"

-msgstr ""
+msgstr "Avertissement d'authentification forcé.\n"

 
 #: cmdline/apt-get.cc:698
 msgid "Install these packages without verification [y/N]? "
 
 #: cmdline/apt-get.cc:698
 msgid "Install these packages without verification [y/N]? "


@@ -781,7 +781,7 @@ msgstr "Il y a des probl
 
 #: cmdline/apt-get.cc:753
 msgid "Internal error, InstallPackages was called with broken packages!"
 
 #: cmdline/apt-get.cc:753
 msgid "Internal error, InstallPackages was called with broken packages!"

-msgstr ""
+msgstr "Erreur interne, InstallPackages a été appelé avec des paquets cassés !?"

 
 #: cmdline/apt-get.cc:762
 msgid "Packages need to be removed but remove is disabled."
 
 #: cmdline/apt-get.cc:762
 msgid "Packages need to be removed but remove is disabled."


@@ -789,9 +789,8 @@ msgstr ""
 "Les paquets doivent être enlevés mais la désinstallation est désactivée."
 
 #: cmdline/apt-get.cc:773
 "Les paquets doivent être enlevés mais la désinstallation est désactivée."
 
 #: cmdline/apt-get.cc:773

-#, fuzzy

 msgid "Internal error, Ordering didn't finish"
 msgid "Internal error, Ordering didn't finish"

-msgstr "Erreur interne en ajoutant une déviation"
+msgstr "Erreur interne, la mise en ordre ne s'est pas terminée"

 
 #: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
 msgid "Unable to lock the download directory"
 
 #: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
 msgid "Unable to lock the download directory"


@@ -804,7 +803,7 @@ msgstr "La liste des sources ne peut 
 
 #: cmdline/apt-get.cc:814
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 
 #: cmdline/apt-get.cc:814
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"

-msgstr ""
+msgstr "Comme c'est étrange... Les tailles ne correspondent pas, veuillez mailer apt@packages.debian.org"

 
 #: cmdline/apt-get.cc:819
 #, c-format
 
 #: cmdline/apt-get.cc:819
 #, c-format


@@ -828,9 +827,9 @@ msgid "After unpacking %sB disk space will be freed.\n"
 msgstr "Après dépaquetage, %so d'espace disque seront libérés.\n"
 
 #: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
 msgstr "Après dépaquetage, %so d'espace disque seront libérés.\n"
 
 #: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927

-#, fuzzy, c-format
+#, c-format

 msgid "Couldn't determine free space in %s"
 msgid "Couldn't determine free space in %s"

-msgstr "Pas assez d'espace disponible sur %s"
+msgstr "Impossible de déterminer l'espace disponible sur %s"

 
 #: cmdline/apt-get.cc:847
 #, c-format
 
 #: cmdline/apt-get.cc:847
 #, c-format


@@ -1074,9 +1073,8 @@ msgid "Done"
 msgstr "Fait"
 
 #: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
 msgstr "Fait"
 
 #: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756

-#, fuzzy

 msgid "Internal error, problem resolver broke stuff"
 msgid "Internal error, problem resolver broke stuff"

-msgstr "Erreur interne, AllUpgrade a cassé le boulot !"
+msgstr "Erreur interne, le solveur de problèmes a cassé des choses"

 
 #: cmdline/apt-get.cc:1856
 msgid "Must specify at least one package to fetch source for"
 
 #: cmdline/apt-get.cc:1856
 msgid "Must specify at least one package to fetch source for"


@@ -1670,9 +1668,8 @@ msgstr ""
 "d'utilisation."
 
 #: methods/cdrom.cc:169
 "d'utilisation."
 
 #: methods/cdrom.cc:169

-#, fuzzy

 msgid "Disk not found."
 msgid "Disk not found."

-msgstr "Fichier non trouvé"
+msgstr "Disque non trouvé."

 
 #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
 msgid "File not found"
 
 #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
 msgid "File not found"


@@ -1901,41 +1898,39 @@ msgstr "Impossible de se connecter 
 
 #: methods/gpgv.cc:92
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 
 #: methods/gpgv.cc:92
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."

-msgstr ""
+msgstr "E : Liste d'arguments de Acquire::gpgv::Options trop longues. Sortie."

 
 #: methods/gpgv.cc:191
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 
 #: methods/gpgv.cc:191
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"

-msgstr ""
+msgstr "Erreur interne : Signature correcte, mais impossible de déterminer l'empreinte de la clé !?"

 
 #: methods/gpgv.cc:196
 msgid "At least one invalid signature was encountered."
 
 #: methods/gpgv.cc:196
 msgid "At least one invalid signature was encountered."

-msgstr ""
+msgstr "Une signature invalide, au moins, a été rencontrée."

 
 #. FIXME String concatenation considered harmful.
 #: methods/gpgv.cc:201
 
 #. FIXME String concatenation considered harmful.
 #: methods/gpgv.cc:201

-#, fuzzy

 msgid "Could not execute "
 msgid "Could not execute "

-msgstr "Impossible de verrouiller %s"
+msgstr "Impossible de démarrer"

 
 #: methods/gpgv.cc:202
 msgid " to verify signature (is gnupg installed?)"
 
 #: methods/gpgv.cc:202
 msgid " to verify signature (is gnupg installed?)"

-msgstr ""
+msgstr " pour vérifer la signature (est-ce que gnupg est installé ?)"

 
 #: methods/gpgv.cc:206
 msgid "Unknown error executing gpgv"
 
 #: methods/gpgv.cc:206
 msgid "Unknown error executing gpgv"

-msgstr ""
+msgstr "Erreur inconnue lors du lancement de gpgv"

 
 #: methods/gpgv.cc:237
 
 #: methods/gpgv.cc:237

-#, fuzzy

 msgid "The following signatures were invalid:\n"
 msgid "The following signatures were invalid:\n"

-msgstr "Les paquets supplémentaires suivants seront installés : "
+msgstr "Les signatures suivantes étaient invalides :\n"

 
 #: methods/gpgv.cc:244
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 
 #: methods/gpgv.cc:244
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"

-msgstr ""
+msgstr "Les signatures suivantes n'ont pas pu être vérifiées parce que la clé publique n'est pas disponible :\n"

 
 #: methods/gzip.cc:57
 #, c-format
 
 #: methods/gzip.cc:57
 #, c-format


@@ -2425,7 +2420,7 @@ msgstr "Le r
 #: apt-pkg/acquire.cc:817
 #, c-format
 msgid "Downloading file %li of %li (%s remaining)"
 #: apt-pkg/acquire.cc:817
 #, c-format
 msgid "Downloading file %li of %li (%s remaining)"

-msgstr ""
+msgstr "Téléchargement du fichier %li sur %li (%s restants)"

 
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
 
 #: apt-pkg/acquire-worker.cc:113
 #, c-format


@@ -2438,12 +2433,9 @@ msgid "Method %s did not start correctly"
 msgstr "La méthode %s n'a pas démarré correctement"
 
 #: apt-pkg/acquire-worker.cc:377
 msgstr "La méthode %s n'a pas démarré correctement"
 
 #: apt-pkg/acquire-worker.cc:377

-#, fuzzy, c-format
+#, c-format

 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."

-msgstr ""
-"Changement de support : veuillez insérer le disque\n"
-"« %s »\n"
-"dans le lecteur « %s » et appuyez sur la touche Entrée\n"
+msgstr "Veuillez insérer le disque « %s » dans le lecteur « %s » et appuyez sur la touche Entrée."

 
 #: apt-pkg/init.cc:119
 #, c-format
 
 #: apt-pkg/init.cc:119
 #, c-format


@@ -2718,54 +2710,54 @@ msgstr ""
 "correspondent pas\n"
 
 #: apt-pkg/deb/dpkgpm.cc:358
 "correspondent pas\n"
 
 #: apt-pkg/deb/dpkgpm.cc:358

-#, fuzzy, c-format
+#, c-format

 msgid "Preparing %s"
 msgid "Preparing %s"

-msgstr "Ouverture de %s"
+msgstr "Préparation de %s"

 
 #: apt-pkg/deb/dpkgpm.cc:359
 
 #: apt-pkg/deb/dpkgpm.cc:359

-#, fuzzy, c-format
+#, c-format

 msgid "Unpacking %s"
 msgid "Unpacking %s"

-msgstr "Ouverture de %s"
+msgstr "Dépaquetage de %s"

 
 #: apt-pkg/deb/dpkgpm.cc:364
 
 #: apt-pkg/deb/dpkgpm.cc:364

-#, fuzzy, c-format
+#, c-format

 msgid "Preparing to configure %s"
 msgid "Preparing to configure %s"

-msgstr "Ouverture du fichier de configuration %s"
+msgstr "Préparation de la configuration de %s"

 
 #: apt-pkg/deb/dpkgpm.cc:365
 #, c-format
 msgid "Configuring %s"
 
 #: apt-pkg/deb/dpkgpm.cc:365
 #, c-format
 msgid "Configuring %s"

-msgstr ""
+msgstr "Configuration de %s"

 
 #: apt-pkg/deb/dpkgpm.cc:366
 
 #: apt-pkg/deb/dpkgpm.cc:366

-#, fuzzy, c-format
+#, c-format

 msgid "Installed %s"
 msgid "Installed %s"

-msgstr "  Installé : "
+msgstr "Installation de %s"

 
 #: apt-pkg/deb/dpkgpm.cc:371
 #, c-format
 msgid "Preparing for removal of %s"
 
 #: apt-pkg/deb/dpkgpm.cc:371
 #, c-format
 msgid "Preparing for removal of %s"

-msgstr ""
+msgstr "Preparation de la suppression de %s"

 
 #: apt-pkg/deb/dpkgpm.cc:372
 
 #: apt-pkg/deb/dpkgpm.cc:372

-#, fuzzy, c-format
+#, c-format

 msgid "Removing %s"
 msgid "Removing %s"

-msgstr "Ouverture de %s"
+msgstr "Suppression de %s"

 
 #: apt-pkg/deb/dpkgpm.cc:373
 #, c-format
 msgid "Removed %s"
 
 #: apt-pkg/deb/dpkgpm.cc:373
 #, c-format
 msgid "Removed %s"

-msgstr ""
+msgstr "Suppression de %s"

 
 #: apt-pkg/deb/dpkgpm.cc:378
 #, c-format
 msgid "Preparing for remove with config %s"
 
 #: apt-pkg/deb/dpkgpm.cc:378
 #, c-format
 msgid "Preparing for remove with config %s"

-msgstr ""
+msgstr "Préparation pour la suppression avec configuration %s"

 
 #: apt-pkg/deb/dpkgpm.cc:379
 #, c-format
 msgid "Removed with config %s"
 
 #: apt-pkg/deb/dpkgpm.cc:379
 #, c-format
 msgid "Removed with config %s"

-msgstr ""
+msgstr "Supprimé avec configuration %s"

 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"

diff --git a/po/makefile b/po/makefile
index bb8118c779aaf03ec51b474ed3c1a4b0140b2750..30af41a16cc39cd3a30418650316acb89b4f320e 100644 (file)
--- a/po/makefile
+++ b/po/makefile
@@ -40,6 +40,9 @@ $(POTFILES) : $(PO)/%.pot :
          --files-from=$(PO)/POTFILES_$*.in -o $(PO)/domains/$*/c.pot
        rm -f $(PO)/POTFILES_$*.in
        $(MSGCOMM) --more-than=0 $(PO)/domains/$*/c.pot $(PO)/domains/$*/sh.pot --output=$@
          --files-from=$(PO)/POTFILES_$*.in -o $(PO)/domains/$*/c.pot
        rm -f $(PO)/POTFILES_$*.in
        $(MSGCOMM) --more-than=0 $(PO)/domains/$*/c.pot $(PO)/domains/$*/sh.pot --output=$@

+       # copy into the domain dirs to make rosetta happy
+       rm -f $(PO)/domains/$*/*.pot
+       cp $@ $(PO)/domains/$*

 
 $(PACKAGE)-all.pot: $(POTFILES)
        $(MSGCOMM) --more-than=0 $(POTFILES) --output=$@
 
 $(PACKAGE)-all.pot: $(POTFILES)
        $(MSGCOMM) --more-than=0 $(POTFILES) --output=$@