diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-03-06 17:53:30 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-03-06 17:53:30 +0100 |
| commit | 6b60ece0fe85ccd70ac6dcb63be7a9f9a4f55c7a (patch) | |
| tree | 4696bcdde0cd9e6ea7d6c2c390db635a0961b3ea /po | |
| parent | d426e829eba77281d59a0e6ddef287b96052d531 (diff) | |
| parent | b7a6594d1e5ed199a7a472b78b33e070375d6f92 (diff) | |
* merged from the debian-sid branch, most notably:
- Correct fi translation for hash sum mismatches (LP: #420403)
- remove 'old' InRelease file if we can't get a new one before
proceeding with Release.gpg to avoid the false impression of a still
trusted repository by a (still present) old InRelease file.
Thanks to Simon Ruderich for reporting this issue! (CVE-2012-0214)
* apt-pkg/acquire-item.cc:
- remove 'old' InRelease file if we can't get a new one before
proceeding with Release.gpg to avoid the false impression of a still
trusted repository by a (still present) old InRelease file.
Thanks to Simon Ruderich for reporting this issue! (CVE-2012-0214)
* French: replace "étiquetage" by "épinglage" for "pinning"
Diffstat (limited to 'po')
| -rw-r--r-- | po/fr.po | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -127,7 +127,7 @@ msgstr "Le cache est désynchronisé, impossible de référencer un fichier" #. Show any packages have explicit pins #: cmdline/apt-cache.cc:1499 msgid "Pinned packages:" -msgstr "Paquets étiquetés :" +msgstr "Paquets épinglés :" #: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556 msgid "(not found)" @@ -147,7 +147,7 @@ msgstr "(aucun)" #: cmdline/apt-cache.cc:1553 msgid " Package pin: " -msgstr " Étiquette de paquet : " +msgstr " Épinglage de paquet : " #. Show the priority tables #: cmdline/apt-cache.cc:1562 @@ -220,7 +220,7 @@ msgstr "" " pkgnames - Liste le nom de tous les paquets du système\n" " dotty - Génère un graphe des paquets pour GraphViz\n" " xvcg - Génère un graphe des paquets pour xvcg\n" -" policy - Affiche l'étiquetage (Pin) en vigueur\n" +" policy - Affiche l'épinglage (Pin) en vigueur\n" "\n" "Options :\n" " -h Ce texte d'aide\n" @@ -3020,11 +3020,11 @@ msgstr "" #: apt-pkg/policy.cc:411 #, c-format msgid "Did not understand pin type %s" -msgstr "Étiquette %s inconnue" +msgstr "Type d'épinglage %s inconnu" #: apt-pkg/policy.cc:419 msgid "No priority (or zero) specified for pin" -msgstr "Aucune priorité (ou zéro) n'a été spécifiée pour l'étiquette" +msgstr "Aucune priorité (ou zéro) n'a été spécifiée pour l'épinglage" #: apt-pkg/pkgcachegen.cc:80 msgid "Cache has an incompatible versioning system" |