sync with code

1 files changed, 109 insertions, 81 deletions

diff --git a/po/br.po b/po/br.po
index 5d433b19..37efc6f0 100644
--- a/po/br.po
+++ b/po/br.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+0100\n"
 "PO-Revision-Date: 2008-03-03 18:06+0100\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
 "Language-Team: Breton <LL@li.org>\n"
@@ -93,7 +93,85 @@ msgstr "_Nullañ"
 msgid "Choose location to save file"
 msgstr "Dibabit lec'hiadur da enrollañ ar restr"
 
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi stumm %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Ur meziant frank eo an hini-mañ ha moien zo da zal'ch anezhañ hervez GNU "
+"GPL.\n"
+"\n"
+"arveriadur :\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:45 ../urpmf:35 ../urpmi:74
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr ""
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+"  --auto         - non-interactive mode, assume default answers to "
+"questions.    --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr ""
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr ""
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+"  --test         - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+"  --searchmedia  - use only the given media to search requested packages.\n"
+msgstr ""
+
+#: ../gurpmi.pm:98
 #, c-format
 msgid "No packages specified"
 msgstr "N'eus pakad dibabet ebet"
@@ -249,6 +327,11 @@ msgstr "Echu eo ar staliadur"
 msgid "removing %s"
 msgstr "lemel %s"
 
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "oc'h adloc'hañ urpmi"
+
 #: ../rpm-find-leaves:14
 #, c-format
 msgid ""
@@ -397,7 +480,14 @@ msgstr ""
 msgid "Copying failed"
 msgstr "Fazi en ur eilañ"
 
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
 #, c-format
 msgid "medium \"%s\" is not available"
 msgstr "n'eo ket dibret ar medium « %s »"
@@ -856,6 +946,11 @@ msgid "adding medium \"%s\""
 msgstr "oc'h ouzhpennañ ar vedium « %s »"
 
 #: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "n'eo ket endeo renkell ar chroot"
+
+#: ../urpm/media.pm:767
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
@@ -910,7 +1005,12 @@ msgstr "... sac'het eo an adkefluniadur"
 msgid "reconfiguration done"
 msgstr "graet eo an adkefluniadur"
 
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr "Fazi en ur sevel anvioù restr : n'hell ket bet kavet an ezhomm %d"
+
+#: ../urpm/media.pm:1074
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "bremañ eo ar medium « %s » dija"
@@ -1169,13 +1269,6 @@ msgstr ""
 "\n"
 "arveriadur : urpmf [dibarzhoù] sil\n"
 
-#: ../urpm/search.pm:35 ../urpme:45 ../urpmf:35 ../urpmi:74
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
-#, c-format
-msgid "  --help         - print this help message.\n"
-msgstr ""
-
 #: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
@@ -1206,11 +1299,6 @@ msgstr ""
 "  --urpmi-root   - implij ur gwrizienn all evit stlennvon urpmi hag evit "
 "staliañ pakadoù.\n"
 
-#: ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
-#, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr ""
-
 #: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
 #, c-format
 msgid ""
@@ -1570,12 +1658,6 @@ msgstr ""
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-
 #: ../urpme:49 ../urpmi:109 ../urpmq:67
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
@@ -1667,29 +1749,6 @@ msgstr " (y/N)"
 msgid "Removal failed"
 msgstr "Fazi en ur lemel"
 
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi stumm %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Ur meziant frank eo an hini-mañ ha moien zo da zal'ch anezhañ hervez GNU "
-"GPL.\n"
-"\n"
-"arveriadur :\n"
-
-#: ../urpmi:78
-#, c-format
-msgid ""
-"  --searchmedia  - use only the given media to search requested packages.\n"
-msgstr ""
-
 #: ../urpmi:81
 #, c-format
 msgid ""
@@ -1697,12 +1756,6 @@ msgid ""
 "questions.\n"
 msgstr ""
 
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-
 #: ../urpmi:83
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1805,11 +1858,6 @@ msgid ""
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr ""
-
 #: ../urpmi:112
 #, c-format
 msgid ""
@@ -1882,20 +1930,6 @@ msgid ""
 "                   next arg.\n"
 msgstr ""
 
-#: ../urpmi:132
-#, c-format
-msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-"  --test         - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-
 #: ../urpmi:135
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
@@ -2194,12 +2228,12 @@ msgstr[0] "War-nes bezañ staliañ eo %d pakad. Mont war-raok ?"
 msgid "Cancel"
 msgstr "Nullañ"
 
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "oc'h adloc'hañ urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Gwaskit « Mont » pa oc'h prest ..."
 
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
 #. -PO: neither the ``with''.  Only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
 #, c-format
@@ -2883,12 +2917,6 @@ msgstr "Changelog kavet ebet\n"
 #~ msgid "unable to retrieve pathname for removable medium \"%s\""
 #~ msgstr "bez eus re poentoù marc'hañ evit ar medium lem/laka « %s »"
 
-#~ msgid "Press Enter when ready..."
-#~ msgstr "Gwaskit « Mont » pa oc'h prest ..."
-
-#~ msgid "Error generating names file: dependency %d not found"
-#~ msgstr "Fazi en ur sevel anvioù restr : n'hell ket bet kavet an ezhomm %d"
-
 #~ msgid "Error generating names file: Can't write to file (%s)"
 #~ msgstr ""
 #~ "Fazi en ur sevel anvioù restr : n'hell ket bet skrivet ar restr (%s)"