sync with code

1 files changed, 108 insertions, 101 deletions

diff --git a/po/sc.po b/po/sc.po
index 3793ec2f..7c3b2bea 100644
--- a/po/sc.po
+++ b/po/sc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-sc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
 "PO-Revision-Date: 2005-09-07 15:57+0100\n"
 "Last-Translator: Antoni Pistis <antonio.pistis@virgilio.it>\n"
 "Language-Team: Sardu\n"
@@ -105,14 +105,7 @@ msgstr "A_nnudda"
 msgid "Choose location to save file"
 msgstr "Sçobera anca sarvai su file"
 
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr ""
-"\n"
-"sceras '%s' disconnotas\n"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
 #, fuzzy, c-format
 msgid "No packages specified"
 msgstr "nisçunu pakitu nominau %s"
@@ -226,12 +219,12 @@ msgstr "Apariçu..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Aposentu su pakitu `%s' (%s/%s)..."
 
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
 msgstr "Intra su mèdiu nominau \"%s\" in su trastu [%s]"
 
-#: ../gurpmi2:271
+#: ../gurpmi2:275
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Scarrigamentu de su pakitu `%s'..."
@@ -423,6 +416,16 @@ msgstr ""
 msgid "Copying failed"
 msgstr "Còpia faddia"
 
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "su mèdiu \"%s\" no d'as sçoberau"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "no potzu ligi su file rpm [%s] de su mèdiu \"%s\""
+
 #: ../urpm/cfg.pm:81
 #, fuzzy, c-format
 msgid "syntax error in config file at line %s"
@@ -731,7 +734,12 @@ msgstr "Provu a aposentai sentza de controllai is dependèntzias? (y/N) "
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Provu a aposentai de manera finas prus forti (--force)? (y/N) "
 
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -745,11 +753,6 @@ msgid_plural "%d installation transactions failed"
 msgstr[0] "%d transatzionis de aposentadura faddias"
 msgstr[1] "%d transatzionis de aposentadura faddias"
 
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Fait a aposentai"
-
 #: ../urpm/main_loop.pm:286
 #, c-format
 msgid "Packages are up to date"
@@ -775,6 +778,11 @@ msgstr "Pakitu(s) jai aposentau(s)"
 msgid "Packages %s can not be installed"
 msgstr "Pakitu(s) jai aposentau(s)"
 
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Fait a aposentai"
+
 #: ../urpm/md5sum.pm:20
 #, fuzzy, c-format
 msgid "examining %s file"
@@ -807,28 +815,8 @@ msgstr "provu a fai de mancu de su mèdiu \"%s\", du lassu"
 
 #: ../urpm/media.pm:409
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "tropu puntus de càrrigu po su mèdiui arremoviditzu \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "pigu su mèdiu arremoviditzu ke \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "Su mèdiu \"%s\" est una màgini ISO, d'apu a carrigai a sa bolada"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "impreu un'atru mèdiu arremividitzu [%s] po \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "no potzu agatai su pathname po su mèdiu arremoviditzu \"%s\""
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
 
 #: ../urpm/media.pm:452 ../urpm/media.pm:458
 #, c-format
@@ -889,12 +877,7 @@ msgstr "liju is header de su mèdiu \"%s\""
 msgid "adding medium \"%s\""
 msgstr "burru su mèdiu \"%s\""
 
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "no potzu lompi a su primu mèdiu de aposentadura"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
@@ -1009,17 +992,7 @@ msgstr "controllu su file hdlist [%s]"
 msgid "comparing %s and %s"
 msgstr "aposentu %s de %s"
 
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"no potzu lompi a su mèdiu \"%s\",\n"
-"podit essi ki apas carrigau a manu sa directory candu as creau su mèdiu."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "no apu agatau hdlist po su mèdiu \"%s\""
@@ -1186,36 +1159,21 @@ msgstr "apu agatau unu handler parallelu po is nuus: %s"
 msgid "unable to use parallel option \"%s\""
 msgstr "no potzu impreai sa scera parallela po \"%s\""
 
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "no potzu lompi a su mèdiu \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
 #, c-format
 msgid "mounting %s"
 msgstr "càrrigu %s"
 
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
 #, c-format
 msgid "unmounting %s"
 msgstr "scàrrigu %s"
 
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "su mèdiu \"%s\" no d'as sçoberau"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "no potzu ligi su file rpm [%s] de su mèdiu \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "mèdiu lòfiu \"%s\" marcau ke arremoviditzu ma no tali"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "no potzu lompi a su mèdiu \"%s\""
-
 #: ../urpm/search.pm:29 ../urpmf:29
 #, fuzzy, c-format
 msgid ""
@@ -2317,19 +2275,19 @@ msgstr ""
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
 #, fuzzy, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "No fait a aposentai is pakitus (%s)!"
 msgstr[1] "No fait a aposentai is pakitus (%s)!"
 
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Craca Enter candu ses prontu..."
-
-#: ../urpmi:626
+#: ../urpmi:627
 #, c-format
 msgid "Cancel"
 msgstr "Annudda"
@@ -2350,7 +2308,7 @@ msgid ""
 "       ftp://<login>:<password>@<host>/<path>\n"
 "       ftp://<host>/<path>\n"
 "       http://<host>/<path>\n"
-"       removable://<path>\n"
+"       cdrom://<path>\n"
 "\n"
 "usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
 "usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2470,12 +2428,7 @@ msgstr "  --nopubkey     - no importist pubkey de su mèdiu açuntu\n"
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - açungi su mèdiu in s'assètiu, ma no d'ajorronist.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - lìmpia sa directory cache de is headers.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - modalidadi citia.\n"
@@ -2901,20 +2854,30 @@ msgstr "  --changelog    - amosta s'arrelata de is mudas.\n"
 
 #: ../urpmq:81
 #, fuzzy, c-format
+msgid "  --conflicts    - print conflicts.\n"
+msgstr "  --conflicts    - amosta tag conflicts: totu su ki nci gherrat.\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
 msgid "  --provides     - print provides.\n"
 msgstr "  --provides     - amosta su tag provides: totu su ki donat.\n"
 
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid "  --requires     - print requires.\n"
+msgstr "  --requires     - amosta su tag requires: totu su ki bolit.\n"
+
+#: ../urpmq:84
 #, fuzzy, c-format
 msgid "  --sourcerpm    - print sourcerpm.\n"
 msgstr "  --sourcerpm    - amosta su tag sourcerpm: rpm mitza.\n"
 
-#: ../urpmq:83
+#: ../urpmq:85
 #, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - amosta s'arresùmini.\n"
 
-#: ../urpmq:85
+#: ../urpmq:87
 #, fuzzy, c-format
 msgid ""
 "  --requires-recursive, -d\n"
@@ -3010,7 +2973,12 @@ msgstr "  preguntu is nòminis o is file rpm scritus in arraya de cumandu.\n"
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes fait a d'impreai feti cun --parallel"
 
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "no potzu scriri sa list de \"%s\""
+
+#: ../urpmq:363
 #, fuzzy, c-format
 msgid "no xml info for medium \"%s\", only partial result for package %s"
 msgstr ""
@@ -3045,6 +3013,48 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "No apu agatau s'arrelata de is mudas\n"
 
+#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr ""
+#~ "\n"
+#~ "sceras '%s' disconnotas\n"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "tropu puntus de càrrigu po su mèdiui arremoviditzu \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "pigu su mèdiu arremoviditzu ke \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "Su mèdiu \"%s\" est una màgini ISO, d'apu a carrigai a sa bolada"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "impreu un'atru mèdiu arremividitzu [%s] po \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "no potzu agatai su pathname po su mèdiu arremoviditzu \"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "no potzu lompi a su primu mèdiu de aposentadura"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "no potzu lompi a su mèdiu \"%s\",\n"
+#~ "podit essi ki apas carrigau a manu sa directory candu as creau su mèdiu."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "mèdiu lòfiu \"%s\" marcau ke arremoviditzu ma no tali"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Craca Enter candu ses prontu..."
+
+#~ msgid "  -c             - clean headers cache directory.\n"
+#~ msgstr "  -c             - lìmpia sa directory cache de is headers.\n"
+
 #~ msgid "virtual medium needs to be local"
 #~ msgstr "su mèdiu virtuali bolit locali"
 
@@ -3322,9 +3332,6 @@ msgstr "No apu agatau s'arrelata de is mudas\n"
 #~ msgid "file [%s] already used in the same medium \"%s\""
 #~ msgstr "su file [%s] jai in impreu in su pròpiu mèdiu \"%s\""
 
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "no potzu scriri sa list de \"%s\""
-
 #~ msgid "nothing written in list file for \"%s\""
 #~ msgstr "no apu scritu nudda in sa list de \"%s\""