fixed various untranslatable command line options

30 files changed, 433 insertions, 471 deletions

diff --git a/po/af.po b/po/af.po
index b5bbdbff..3ef90606 100644
--- a/po/af.po
+++ b/po/af.po
@@ -1930,11 +1930,11 @@ msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -v             - woordryke modus.\n"
 
 #: ../urpmi.removemedia:54
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "unknown options '%s'\n"
-msgstr "%s: unrecognized option `--%s'\n"
+msgstr ""
 
 #: ../urpmi.removemedia:63
 #, fuzzy, c-format
diff --git a/po/az.po b/po/az.po
index 116707f6..1f4e413d 100644
--- a/po/az.po
+++ b/po/az.po
@@ -1490,7 +1490,7 @@ msgstr "  --fuzzy        - fuzzy axtarmanı qəbul et ( -y ilə eyni).\n"
 #: ../urpmi:97 ../urpmq:60
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  -src           - növbəti paket mənbə paketidir (--s ilə eyni).\n"
+msgstr "  --src          - növbəti paket mənbə paketidir (-s ilə eyni).\n"
 
 #: ../urpmi:98
 #, c-format
diff --git a/po/ca.po b/po/ca.po
index dcf6dfac..b22a6b5c 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1456,7 +1456,7 @@ msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
 msgstr ""
-"  --seachmedia        - utilitza només les fonts donades per cercar (o "
+"  --searchmedia        - utilitza només les fonts donades per cercar (o "
 "actualitzar) paquets.\n"
 
 #: ../urpmi:85
diff --git a/po/cs.po b/po/cs.po
index 1b0fac59..054a658f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -22,7 +22,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. This is a list of chars acceptable as a 'yes' answer to a Yes/No question;
 #. you can put here the letters for 'yes' for your language, so people
@@ -367,7 +368,8 @@ msgstr "nelze zpracovat protokol: %s"
 #: ../urpm.pm:210
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr "zdroj \"%s\" bude ignorován, pokouší se použít již použitý soubor hdlist"
+msgstr ""
+"zdroj \"%s\" bude ignorován, pokouší se použít již použitý soubor hdlist"
 
 #: ../urpm.pm:211
 #, c-format
@@ -377,7 +379,8 @@ msgstr "zdroj \"%s\" bude ignorován, pokouší se použít již použitý sezna
 #: ../urpm.pm:224 ../urpm.pm:1293 ../urpm.pm:1303
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "zdroj \"%s\" bude ignorován, protože nelze načíst soubor hdlist pro zdroj"
+msgstr ""
+"zdroj \"%s\" bude ignorován, protože nelze načíst soubor hdlist pro zdroj"
 
 #: ../urpm.pm:227 ../urpm.pm:2483
 #, c-format
@@ -957,7 +960,8 @@ msgstr "pro spuštění transakce se použije proces %d"
 
 #: ../urpm.pm:2946
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "vytvořena transakce pro instalaci na %s (odstranění=%d, instalace=%d, "
 "aktualizace=%d)"
@@ -1055,7 +1059,8 @@ msgstr "testuji MD5SUM soubor"
 #: ../urpm.pm:3353
 #, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
-msgstr "varování: kontrolní součet md5sum pro %s není k dispozici v souboru MD5SUM"
+msgstr ""
+"varování: kontrolní součet md5sum pro %s není k dispozici v souboru MD5SUM"
 
 #: ../urpm.pm:3375
 #, c-format
@@ -1108,22 +1113,27 @@ msgstr "  --auto       - automaticky vybere balíček z výběru.\n"
 #: ../urpme:45
 #, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - zkontrolovat, zda lze dokončit odstranění správně.\n"
+msgstr ""
+"  --test         - zkontrolovat, zda lze dokončit odstranění správně.\n"
 
 #: ../urpme:46 ../urpmi:101 ../urpmq:64
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force       - spustí program i v případě, že některé balíčky chybí.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force       - spustí program i v případě, že některé balíčky chybí.\n"
 
 #: ../urpme:47 ../urpmi:106 ../urpmq:65
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - distribuovaný program urpmi na počítačích s přezdívkou.\n"
+msgstr ""
+"  --parallel     - distribuovaný program urpmi na počítačích s přezdívkou.\n"
 
 #: ../urpme:48
 #, c-format
 msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - použít pro odebrání balíčků jiný kořenový adresář.\n"
+msgstr ""
+"  --root         - použít pro odebrání balíčků jiný kořenový adresář.\n"
 
 #: ../urpme:49
 #, c-format
@@ -1177,7 +1187,8 @@ msgstr "Kontrola odebrání následujících balíčků"
 
 #: ../urpme:113
 #, c-format
-msgid "To satisfy dependencies, the following %d packages will be removed (%d MB)"
+msgid ""
+"To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr ""
 "Aby byly splněny závislosti, budou odebrány následující balíčky (celkem %d, %"
 "d MB)"
@@ -1226,13 +1237,16 @@ msgstr "  --excludemedia - nepoužít zadané zdroje, oddělené čárkami.\n"
 
 #: ../urpmf:36 ../urpmi:84 ../urpmq:48
 #, c-format
-msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --sortmedia    - třídit zdroje podle podřetězců oddělených čárkami.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - třídit zdroje podle podřetězců oddělených čárkami.\n"
 
 #: ../urpmf:37 ../urpmq:49
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - použít daný soubor se syntézou místo databáze urpmi.\n"
+msgstr ""
+"  --synthesis    - použít daný soubor se syntézou místo databáze urpmi.\n"
 
 #: ../urpmf:38
 #, c-format
@@ -1352,7 +1366,8 @@ msgstr "  -i         - ignorují se velká a malá písmena ve všech vzorech.\n
 #: ../urpmf:61 ../urpmq:81
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f        - společně se jménem vypíše verzi, vydání a architekturu.\n"
+msgstr ""
+"  -f        - společně se jménem vypíše verzi, vydání a architekturu.\n"
 
 #: ../urpmf:62
 #, c-format
@@ -1361,13 +1376,17 @@ msgstr "  -e           - vloží kód Perl přímo jako perl -e.\n"
 
 #: ../urpmf:63
 #, c-format
-msgid "  -a             - binary AND operator, true if both expression are true.\n"
-msgstr "  -a             - binární operátor AND, true pokud oba výrazy platí.\n"
+msgid ""
+"  -a             - binary AND operator, true if both expression are true.\n"
+msgstr ""
+"  -a             - binární operátor AND, true pokud oba výrazy platí.\n"
 
 #: ../urpmf:64
 #, c-format
-msgid "  -o             - binary OR operator, true if one expression is true.\n"
-msgstr "  -o             - binární operátor OR, true pokud jeden z výrazů platí.\n"
+msgid ""
+"  -o             - binary OR operator, true if one expression is true.\n"
+msgstr ""
+"  -o             - binární operátor OR, true pokud jeden z výrazů platí.\n"
 
 #: ../urpmf:65
 #, c-format
@@ -1441,12 +1460,15 @@ msgstr ""
 #: ../urpmi:85
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - použít daný soubor se syntézou místo databáze urpmi.\n"
+msgstr ""
+"  --synthesis    - použít daný soubor se syntézou místo databáze urpmi.\n"
 
 #: ../urpmi:87 ../urpmq:50
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - automaticky vybere balíčky pro aktualizaci systému.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - automaticky vybere balíčky pro aktualizaci systému.\n"
 
 #: ../urpmi:88
 #, c-format
@@ -1509,7 +1531,8 @@ msgstr ""
 #: ../urpmi:99
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - nejprve odstraní balíčky RPM z vyrovnávací paměti.\n"
+msgstr ""
+"  --clean        - nejprve odstraní balíčky RPM z vyrovnávací paměti.\n"
 
 #: ../urpmi:100
 #, c-format
@@ -1537,7 +1560,8 @@ msgstr ""
 #: ../urpmi:107
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - použít pro instalaci balíčků jiný kořenový adresář.\n"
+msgstr ""
+"  --root         - použít pro instalaci balíčků jiný kořenový adresář.\n"
 
 #: ../urpmi:108
 #, c-format
@@ -1610,7 +1634,8 @@ msgstr ""
 
 #: ../urpmi:125
 #, c-format
-msgid "  --test         - verify if the installation can be achieved correctly.\n"
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - zkontrolovat, zda lze dokončit instalaci správně.\n"
 
 #: ../urpmi:126
@@ -1648,7 +1673,8 @@ msgstr ""
 #: ../urpmi:132
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
-msgstr "  --strict-arch  - aktualizovat pouze balíčky se shodnou architekturou.\n"
+msgstr ""
+"  --strict-arch  - aktualizovat pouze balíčky se shodnou architekturou.\n"
 
 #: ../urpmi:133 ../urpmq:78
 #, c-format
@@ -1684,7 +1710,8 @@ msgstr "  -q           - režim bez výpisů.\n"
 #: ../urpmi:140
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  názvy nebo soubory RPM zadané na příkazové řádce budou instalovány.\n"
+msgstr ""
+"  názvy nebo soubory RPM zadané na příkazové řádce budou instalovány.\n"
 
 #: ../urpmi:183
 #, c-format
@@ -1787,7 +1814,8 @@ msgstr ""
 msgid ""
 "To satisfy dependencies, the following package is going to be installed (%d "
 "MB)"
-msgstr "Aby byly splněny závislosti, bude nainstalován následující balíček (%d MB)"
+msgstr ""
+"Aby byly splněny závislosti, bude nainstalován následující balíček (%d MB)"
 
 #: ../urpmi:488
 #, c-format
@@ -2175,8 +2203,10 @@ msgstr "  --list-aliases - seznam dostupných paralelních přezdívek.\n"
 
 #: ../urpmq:59
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr "  --dump-config  - vypíše nastavení ve formě parametru pro urpmi.addmedia.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - vypíše nastavení ve formě parametru pro urpmi.addmedia.\n"
 
 #: ../urpmq:61
 #, c-format
@@ -2189,9 +2219,10 @@ msgstr ""
 
 #: ../urpmq:63
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --source     - všechny zdrojové balíčky před stažením (pouze uživatel "
+"  --sources     - všechny zdrojové balíčky před stažením (pouze uživatel "
 "root).\n"
 
 #: ../urpmq:66
@@ -2231,7 +2262,8 @@ msgstr "  -g         - vypíše tag skupin společně se jménem.\n"
 #: ../urpmq:83
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - tisk užitečných informací v člověkem čitelné podobě.\n"
+msgstr ""
+"  -i             - tisk užitečných informací v člověkem čitelné podobě.\n"
 
 #: ../urpmq:84
 #, c-format
@@ -2240,7 +2272,8 @@ msgstr "  -l             - vypíše soubory v balíčku.\n"
 
 #: ../urpmq:85
 #, c-format
-msgid "  -P             - do not search in provides to find package (default).\n"
+msgid ""
+"  -P             - do not search in provides to find package (default).\n"
 msgstr "  -P             - nehledá balíček v položkách provides (výchozí).\n"
 
 #: ../urpmq:86
@@ -2260,15 +2293,19 @@ msgstr "  -R             - reverzní vyhledávání požadavků balíčku.\n"
 
 #: ../urpmq:89
 #, c-format
-msgid "  -RR            - extended reverse search (includes virtual packages).\n"
-msgstr "  -RR            - rozšířené reverzní vyhledávání balíčků (včetně virtuálních balíčků).\n"
+msgid ""
+"  -RR            - extended reverse search (includes virtual packages).\n"
+msgstr ""
+"  -RR            - rozšířené reverzní vyhledávání balíčků (včetně "
+"virtuálních balíčků).\n"
 
 #: ../urpmq:91
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
-msgstr "  -u          - odebere balíček pokud je již instalována novější verze.\n"
+msgstr ""
+"  -u          - odebere balíček pokud je již instalována novější verze.\n"
 
 #: ../urpmq:94
 #, c-format
@@ -2278,7 +2315,8 @@ msgstr "  -Y             - jako -y, ale ignoruje velká a malá písmena.\n"
 #: ../urpmq:95
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  jméno nebo rpm soubory zadané na příkazové řádce, které jsou dotazovány.\n"
+msgstr ""
+"  jméno nebo rpm soubory zadané na příkazové řádce, které jsou dotazovány.\n"
 
 #: ../urpmq:157
 #, c-format
@@ -2299,4 +2337,3 @@ msgstr "Nebyl nalezen seznam souborů\n"
 #, c-format
 msgid "No changelog found\n"
 msgstr "Nebyl nalezen záznam změn\n"
-
diff --git a/po/cy.po b/po/cy.po
index e6aef0bf..5e999bf6 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -500,7 +500,7 @@ msgid ""
 "update or --parallel"
 msgstr ""
 "-nid oes modd defnyddio synthesis gyda --media, --excludemedia, --sortmedia, "
-"--update neu --paralel"
+"--update neu --parallel"
 
 #: ../urpm.pm:539 ../urpm.pm:565 ../urpm.pm:1047 ../urpm.pm:1058
 #: ../urpm.pm:1130 ../urpm.pm:1147 ../urpm.pm:1217 ../urpm.pm:1276
@@ -1116,7 +1116,7 @@ msgstr ""
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
-"  --paralel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
+"  --parallel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
 
 #: ../urpme:48
 #, c-format
@@ -1467,7 +1467,7 @@ msgid ""
 msgstr "  --no-uninstall - peidio gofyn i ddadosod pecyn, atal gosod.\n"
 
 #: ../urpmi:89
-#, c-format
+#, fuzzy, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --install-src  - peidio gosod pecynnau (llawyth i lawr yn unig).\n"
 
@@ -1684,7 +1684,7 @@ msgstr "  -y             - gosod chwilio fuzzy (fel --fuzzy).\n"
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
-"  --s          - pecyn nesaf yn becyn ffynhonnell (yr un peth â -src).\n"
+"  --s          - pecyn nesaf yn becyn ffynhonnell (yr un peth â --src).\n"
 
 #: ../urpmi:138 ../urpmi.addmedia:73 ../urpmi.removemedia:52
 #: ../urpmi.update:47
@@ -1731,7 +1731,7 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 "Gwall: %s i weld wedi ei osod fel darllen yn unig.\n"
-"Defnydd --caniatáu gorfodaeth i orfodi gweithred."
+"Defnydd --allow-force gorfodaeth i orfodi gweithred."
 
 #: ../urpmi:362
 #, c-format
diff --git a/po/da.po b/po/da.po
index 195b7373..ed010511 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1902,7 +1902,7 @@ msgstr ""
 #: ../urpmi.addmedia:53
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlists - forsøg at finde og bruge hdlist-fil.\n"
+msgstr "  --probe-hdlist - forsøg at finde og bruge hdlist-fil.\n"
 
 #: ../urpmi.addmedia:54
 #, c-format
diff --git a/po/fi.po b/po/fi.po
index 4bc3d8c6..b2002542 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -327,7 +327,7 @@ msgstr "  --root <polku>   - käytä annettua polku / sijasta\n"
 #: ../rpm-find-leaves:18
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "  --[group]        - rajoita tulokset annettuun ryhmään\n"
+msgstr "  -g [group]       - rajoita tulokset annettuun ryhmään\n"
 
 #: ../rpm-find-leaves:19
 #, c-format
diff --git a/po/fur.po b/po/fur.po
index 3490ee7a..99eb2d4f 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -1564,7 +1564,7 @@ msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
-"  --use distrib  - configure urpmi dal lamp di un arbul distribuît, zovevul\n"
+"  --use-distrib  - configure urpmi dal lamp di un arbul distribuît, zovevul\n"
 "                   par instalâ un pachet chroot cun opzion --root.\n"
 
 #: ../urpmi:110 ../urpmi.addmedia:44 ../urpmi.update:31 ../urpmq:68
@@ -1625,7 +1625,7 @@ msgid ""
 "                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 "  --verify-rpm   - verifiche le firme RPM prin de instalazion\n"
-"                   (--no-verify le disabilite, predefinide abilitade).\n"
+"                   (--no-verify-rpm le disabilite, predefinide abilitade).\n"
 
 #: ../urpmi:125
 #, c-format
diff --git a/po/ga.po b/po/ga.po
index 9046187c..a05231dc 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -1877,7 +1877,7 @@ msgstr ""
 msgid ""
 "\n"
 "unknown options '%s'\n"
-msgstr "%s: rogha gan aithne `--%s'\n"
+msgstr "%s: rogha gan aithne `%s'\n"
 
 #: ../urpmi.removemedia:63
 #, c-format
diff --git a/po/he.po b/po/he.po
index 124706fc..7a87ea3a 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1124,7 +1124,7 @@ msgid ""
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 "  --use-distrib  - הגדרת urpmi בזמן ריצה לפי עץ ההפצה, שימושי\n"
-"                  להוסיף/להסיר מערכת chroot עם האופציה --ption.\n"
+"                  להוסיף/להסיר מערכת chroot עם האופציה --root.\n"
 
 #: ../urpme:51 ../urpmi:139 ../urpmi.addmedia:74 ../urpmi.removemedia:53
 #: ../urpmi.update:48 ../urpmq:92
diff --git a/po/hi.po b/po/hi.po
index cb1b54e6..8745ff93 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -491,7 +491,7 @@ msgstr ""
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
-msgstr "--कृत्रिमता का उपयोग --माध्यम, --अपडेट या --समान्तर के साथ नहीं हो सकता है"
+msgstr ""
 
 #: ../urpm.pm:539 ../urpm.pm:565 ../urpm.pm:1047 ../urpm.pm:1058
 #: ../urpm.pm:1130 ../urpm.pm:1147 ../urpm.pm:1217 ../urpm.pm:1276
@@ -2260,7 +2260,7 @@ msgstr "  -i             - उपयोगी सूचनाओं का प�
 #: ../urpmq:84
 #, c-format
 msgid "  -l             - list files in package.\n"
-msgstr "  --l         - पैकेज में स्थित संचिकाओं की सूची।\n"
+msgstr "  -l             - पैकेज में स्थित संचिकाओं की सूची।\n"
 
 #: ../urpmq:85
 #, c-format
diff --git a/po/hr.po b/po/hr.po
index 4a9cb2c4..3d5adf36 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -457,11 +457,11 @@ msgid "there doesn't seem to be devices in the chroot in \"%s\""
 msgstr ""
 
 #: ../urpm.pm:478
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
-msgstr "  --all           - ispiši sve oznake."
+msgstr ""
 
 #: ../urpm.pm:539 ../urpm.pm:565 ../urpm.pm:1047 ../urpm.pm:1058
 #: ../urpm.pm:1130 ../urpm.pm:1147 ../urpm.pm:1217 ../urpm.pm:1276
diff --git a/po/id.po b/po/id.po
index 33ee309a..bce9bfd7 100644
--- a/po/id.po
+++ b/po/id.po
@@ -492,7 +492,7 @@ msgid ""
 "update or --parallel"
 msgstr ""
 "--synthesis tak dapat dipakai dengan --media, --excludemedia, --sortmedia, --"
-"update atau --paralel"
+"update atau --parallel"
 
 #: ../urpm.pm:539 ../urpm.pm:565 ../urpm.pm:1047 ../urpm.pm:1058
 #: ../urpm.pm:1130 ../urpm.pm:1147 ../urpm.pm:1217 ../urpm.pm:1276
@@ -1107,7 +1107,7 @@ msgstr "  --force        - paksa instal meski beberapa paket tidak ada.\n"
 #: ../urpme:47 ../urpmi:106 ../urpmq:65
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --paralel     - urpmi tersebar di antara mesin-mesin alias.\n"
+msgstr "  --parallel     - urpmi tersebar di antara mesin-mesin alias.\n"
 
 #: ../urpme:48
 #, c-format
@@ -1636,7 +1636,7 @@ msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
 msgstr ""
-"  --more-choises - ketika beberapa paket ditemukan, tampilkan pilihan lain\n"
+"  --more-choices - ketika beberapa paket ditemukan, tampilkan pilihan lain\n"
 "                   dari nilai default.\n"
 
 #: ../urpmi:131 ../urpmi.addmedia:68 ../urpmi.update:41
diff --git a/po/is.po b/po/is.po
index 9598040e..265511a3 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1293,7 +1293,7 @@ msgstr "  --sourcerpm    - prenta tag frumrpm: frumrpm.\n"
 #: ../urpmf:50
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
-msgstr "--packager      - prenta tag pakkara: Pakkað af\n"
+msgstr "  --packager     - prenta tag pakkara: Pakkað af\n"
 
 #: ../urpmf:51
 #, c-format
@@ -1303,7 +1303,7 @@ msgstr "  --buildhost    - prenta \"buildhost\" tag: build host.\n"
 #: ../urpmf:52
 #, c-format
 msgid "  --url          - print tag url: url.\n"
-msgstr "  --serial        - prenta tag url: url.\n"
+msgstr "  --url          - prenta tag url: url.\n"
 
 #: ../urpmf:53
 #, c-format
diff --git a/po/it.po b/po/it.po
index 81c46aa1..92103e25 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1661,7 +1661,8 @@ msgid ""
 "                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 "  --verify-rpm   - verifica la firma RPM prima dell'installazione\n"
-"                   (--no-verify la disabilita, solitamente è abilitata).\n"
+"                   (--no-verify-rpm la disabilita, solitamente è "
+"abilitata).\n"
 
 #: ../urpmi:125
 #, c-format
diff --git a/po/ka.po b/po/ka.po
index bd5c45bb..96cd50fb 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -1920,7 +1920,7 @@ msgstr ""
 msgid ""
 "\n"
 "unknown options '%s'\n"
-msgstr "%s: უცნობი პარამეტრი `--%s'\n"
+msgstr "%s: უცნობი პარამეტრი `%s'\n"
 
 #: ../urpmi.removemedia:63
 #, fuzzy, c-format
diff --git a/po/ko.po b/po/ko.po
index 5aba0c11..ee7e8e2e 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1923,7 +1923,7 @@ msgstr "  -v             - 상세 정보 모드.\n"
 msgid ""
 "\n"
 "unknown options '%s'\n"
-msgstr "%s: 알 수 없는 옵션 `--%s'\n"
+msgstr "%s: 알 수 없는 옵션 `%s'\n"
 
 #: ../urpmi.removemedia:63
 #, fuzzy, c-format
diff --git a/po/lt.po b/po/lt.po
index 251ae074..91ff9a0f 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -1906,7 +1906,7 @@ msgstr "  -v             - verbose mode.\n"
 msgid ""
 "\n"
 "unknown options '%s'\n"
-msgstr "%s: neatpažinta parinktis „--%s“\n"
+msgstr "%s: neatpažinta parinktis „%s“\n"
 
 #: ../urpmi.removemedia:63
 #, fuzzy, c-format
diff --git a/po/lv.po b/po/lv.po
index 11dae482..8f259dda 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -2155,7 +2155,7 @@ msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
 #: ../urpmq:86
 #, fuzzy, c-format
 msgid "  -p             - search in provides to find package.\n"
-msgstr "  --X            - lietot X saskarni.\n"
+msgstr "  -f             - forsēt hdlist failu ģenerēšanu.\n"
 
 #: ../urpmq:87
 #, fuzzy, c-format
@@ -2165,13 +2165,13 @@ msgstr "  -v             - runīgais režīms.\n"
 #: ../urpmq:88
 #, fuzzy, c-format
 msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  --X            - lietot X saskarni.\n"
+msgstr "  -f             - forsēt hdlist failu ģenerēšanu.\n"
 
 #: ../urpmq:89
 #, fuzzy, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
-msgstr "  --X            - lietot X saskarni.\n"
+msgstr "  -f             - forsēt hdlist failu ģenerēšanu.\n"
 
 #: ../urpmq:91
 #, c-format
diff --git a/po/ms.po b/po/ms.po
index a82ad85e..8b2cc91d 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -50,29 +50,22 @@ msgstr ""
 "Pemasangan pakej automatik...\n"
 "Anda telah meminta pemasangan pakej %s\n"
 
-#: ../_irpm:33
-#: ../urpme:31
-#: ../urpmi:494
+#: ../_irpm:33 ../urpme:31 ../urpmi:494
 #, c-format
 msgid "Is this OK?"
 msgstr "Semua OK?"
 
-#: ../_irpm:35
-#: ../urpmi:525
+#: ../_irpm:35 ../urpmi:525
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../_irpm:36
-#: ../urpmi:525
+#: ../_irpm:36 ../urpmi:525
 #, c-format
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../_irpm:44
-#: ../urpmi:400
-#: ../urpmi:418
-#: ../urpmi:498
+#: ../_irpm:44 ../urpmi:400 ../urpmi:418 ../urpmi:498
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/t) "
@@ -82,8 +75,7 @@ msgstr " (Y/t) "
 msgid "%s: command not found\n"
 msgstr "%s: arahan tidak dijumpai\n"
 
-#: ../gurpmi:31
-#: ../gurpmi2:55
+#: ../gurpmi:31 ../gurpmi2:55
 #, c-format
 msgid "RPM installation"
 msgstr "Pemasangan RPM"
@@ -95,7 +87,8 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-"You probably didn't want to install it on your computer (installing it would allow you to make modifications to its sourcecode then compile it).\n"
+"You probably didn't want to install it on your computer (installing it would "
+"allow you to make modifications to its sourcecode then compile it).\n"
 "\n"
 "What would you like to do?"
 msgstr ""
@@ -135,8 +128,7 @@ msgstr "_Pasang"
 msgid "_Save"
 msgstr "_Simpan"
 
-#: ../gurpmi:73
-#: ../gurpmi2:119
+#: ../gurpmi:73 ../gurpmi2:119
 #, c-format
 msgid "_Cancel"
 msgstr "_Batal"
@@ -179,14 +171,12 @@ msgstr " (untuk memasang)"
 msgid "Package choice"
 msgstr "Pilihan pakej"
 
-#: ../gurpmi2:119
-#: ../gurpmi2:142
+#: ../gurpmi2:119 ../gurpmi2:142
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
-#: ../gurpmi2:120
-#: ../urpmi:360
+#: ../gurpmi2:120 ../urpmi:360
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Salah satu pakej berikut diperlukan:"
@@ -210,7 +200,8 @@ msgstr ""
 #: ../gurpmi2:177
 #, c-format
 msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed:\n"
+"To satisfy dependencies, the following %d packages are going to be "
+"installed:\n"
 "%s\n"
 msgstr ""
 "Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
@@ -221,15 +212,12 @@ msgstr ""
 msgid "Package installation..."
 msgstr "Pemasangan pakej..."
 
-#: ../gurpmi2:186
-#: ../urpmi:507
-#: ../urpmq:308
+#: ../gurpmi2:186 ../urpmi:507 ../urpmq:308
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "tidak dapat mengambil pakej asal, batal"
 
-#: ../gurpmi2:200
-#: ../urpmi:518
+#: ../gurpmi2:200 ../urpmi:518
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Masukkan media \"%s\" ke peranti [%s]"
@@ -252,10 +240,7 @@ msgstr ""
 "\n"
 "Adakah anda hendak meneruskan pemasangan ?"
 
-#: ../gurpmi2:250
-#: ../gurpmi2:299
-#: ../urpmi:588
-#: ../urpmi:704
+#: ../gurpmi2:250 ../gurpmi2:299 ../urpmi:588 ../urpmi:704
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -263,15 +248,12 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../gurpmi2:257
-#: ../urpme:118
-#: ../urpmi:631
+#: ../gurpmi2:257 ../urpme:118 ../urpmi:631
 #, c-format
 msgid "removing %s"
 msgstr "membuang %s"
 
-#: ../gurpmi2:265
-#: ../urpm.pm:2877
+#: ../gurpmi2:265 ../urpm.pm:2877
 #, c-format
 msgid "Preparing..."
 msgstr "Menyediakan..."
@@ -281,11 +263,7 @@ msgstr "Menyediakan..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Install pakej `%s' (%s/%s)..."
 
-#: ../gurpmi2:285
-#: ../urpmi:598
-#: ../urpmi:649
-#: ../urpmi:667
-#: ../urpmi:683
+#: ../gurpmi2:285 ../urpmi:598 ../urpmi:649 ../urpmi:667 ../urpmi:683
 #, c-format
 msgid "Installation failed"
 msgstr "Instalasi gagal"
@@ -295,8 +273,7 @@ msgstr "Instalasi gagal"
 msgid "_Done"
 msgstr "_Selesai"
 
-#: ../gurpmi2:302
-#: ../urpmi:720
+#: ../gurpmi2:302 ../urpmi:720
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "semua telah diinstal"
@@ -326,15 +303,15 @@ msgstr "   --root <path>  - guna root yang diberi selain dari /\n"
 #: ../rpm-find-leaves:18
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "   -g [kumpulan]   - hadkan keputusan kepada kumpulan yang diberikan.\n"
+msgstr ""
+"   -g [kumpulan]   - hadkan keputusan kepada kumpulan yang diberikan.\n"
 
 #: ../rpm-find-leaves:19
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                    default adalah %s.\n"
 
-#: ../rurpmi:8
-#: ../urpmi:223
+#: ../rurpmi:8 ../urpmi:223
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Hanya superuser yang boleh menginstal pakej"
@@ -362,22 +339,21 @@ msgstr "tidak dapat mengawal protokol: %s"
 #: ../urpm.pm:210
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr "medium \"%s\" cuba menggunakan hdlist yang telah digunakan, medium diabaikan"
+msgstr ""
+"medium \"%s\" cuba menggunakan hdlist yang telah digunakan, medium diabaikan"
 
 #: ../urpm.pm:211
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "medium \"%s\" cuba menggunakan senarai yang telah digunakan, medium diabaikan"
+msgstr ""
+"medium \"%s\" cuba menggunakan senarai yang telah digunakan, medium diabaikan"
 
-#: ../urpm.pm:224
-#: ../urpm.pm:1293
-#: ../urpm.pm:1303
+#: ../urpm.pm:224 ../urpm.pm:1293 ../urpm.pm:1303
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "gagal mengakses fail hdlist \"%s\", media diabaikan"
 
-#: ../urpm.pm:227
-#: ../urpm.pm:2483
+#: ../urpm.pm:227 ../urpm.pm:2483
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "gagal mengakses fail list \"%s\", media diabaikan"
@@ -389,8 +365,12 @@ msgstr "cuba lepaslalu media sedia ada\"%s\", abaikan"
 
 #: ../urpm.pm:265
 #, c-format
-msgid "virtual medium \"%s\" should not have defined hdlist or list file, medium ignored"
-msgstr "medium virtual \"%s\" tidak sepatutnya mentakrifkan hdlist atau fail senarai, media diabaikan"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"medium virtual \"%s\" tidak sepatutnya mentakrifkan hdlist atau fail "
+"senarai, media diabaikan"
 
 #: ../urpm.pm:270
 #, c-format
@@ -437,8 +417,7 @@ msgstr ""
 msgid "using different removable device [%s] for \"%s\""
 msgstr "pakai removable peranti lain [%s] untuk \"%s\""
 
-#: ../urpm.pm:372
-#: ../urpm.pm:375
+#: ../urpm.pm:372 ../urpm.pm:375
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "tidak dapat mengambil nama path utk media removable \"%s\""
@@ -490,48 +469,28 @@ msgstr ""
 
 #: ../urpm.pm:478
 #, c-format
-msgid "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --update or --parallel"
-msgstr ""
-
-#: ../urpm.pm:539
-#: ../urpm.pm:565
-#: ../urpm.pm:1047
-#: ../urpm.pm:1058
-#: ../urpm.pm:1130
-#: ../urpm.pm:1147
-#: ../urpm.pm:1217
-#: ../urpm.pm:1276
-#: ../urpm.pm:1491
-#: ../urpm.pm:1614
-#: ../urpm.pm:1731
-#: ../urpm.pm:1737
-#: ../urpm.pm:1840
-#: ../urpm.pm:1925
-#: ../urpm.pm:1929
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
+msgstr ""
+
+#: ../urpm.pm:539 ../urpm.pm:565 ../urpm.pm:1047 ../urpm.pm:1058
+#: ../urpm.pm:1130 ../urpm.pm:1147 ../urpm.pm:1217 ../urpm.pm:1276
+#: ../urpm.pm:1491 ../urpm.pm:1614 ../urpm.pm:1731 ../urpm.pm:1737
+#: ../urpm.pm:1840 ../urpm.pm:1925 ../urpm.pm:1929
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "periksa file sintesis [%s]"
 
-#: ../urpm.pm:543
-#: ../urpm.pm:558
-#: ../urpm.pm:571
-#: ../urpm.pm:1050
-#: ../urpm.pm:1061
-#: ../urpm.pm:1136
-#: ../urpm.pm:1142
-#: ../urpm.pm:1222
-#: ../urpm.pm:1280
-#: ../urpm.pm:1495
-#: ../urpm.pm:1618
-#: ../urpm.pm:1725
-#: ../urpm.pm:1743
-#: ../urpm.pm:1935
+#: ../urpm.pm:543 ../urpm.pm:558 ../urpm.pm:571 ../urpm.pm:1050
+#: ../urpm.pm:1061 ../urpm.pm:1136 ../urpm.pm:1142 ../urpm.pm:1222
+#: ../urpm.pm:1280 ../urpm.pm:1495 ../urpm.pm:1618 ../urpm.pm:1725
+#: ../urpm.pm:1743 ../urpm.pm:1935
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "periksa baca fail hdlist [%s]"
 
-#: ../urpm.pm:553
-#: ../urpm.pm:1054
+#: ../urpm.pm:553 ../urpm.pm:1054
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "media virtual \"%s\" bukan tempatan, media diabaikan"
@@ -541,17 +500,13 @@ msgstr "media virtual \"%s\" bukan tempatan, media diabaikan"
 msgid "Search start: %s end: %s"
 msgstr "Carian mula: %s tamat: %s"
 
-#: ../urpm.pm:588
-#: ../urpm.pm:1068
-#: ../urpm.pm:1155
-#: ../urpm.pm:1226
+#: ../urpm.pm:588 ../urpm.pm:1068 ../urpm.pm:1155 ../urpm.pm:1226
 #: ../urpm.pm:1622
 #, fuzzy, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "bangunkan fail sintesis hdlist utk media \"%s\""
 
-#: ../urpm.pm:595
-#: ../urpm.pm:1878
+#: ../urpm.pm:595 ../urpm.pm:1878
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr ""
@@ -566,12 +521,8 @@ msgstr "melangkau pakej %s"
 msgid "would install instead of upgrade package %s"
 msgstr ""
 
-#: ../urpm.pm:635
-#: ../urpm.pm:2290
-#: ../urpm.pm:2351
-#: ../urpm.pm:2540
-#: ../urpm.pm:2942
-#: ../urpm.pm:3065
+#: ../urpm.pm:635 ../urpm.pm:2290 ../urpm.pm:2351 ../urpm.pm:2540
+#: ../urpm.pm:2942 ../urpm.pm:3065
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "tidak dapat membuka rpmdb"
@@ -601,26 +552,18 @@ msgstr "gagal mengakses media instalasi pertama"
 msgid "copying hdlists file..."
 msgstr "sedang menyalin fail hdlist..."
 
-#: ../urpm.pm:757
-#: ../urpm.pm:1171
-#: ../urpm.pm:1246
+#: ../urpm.pm:757 ../urpm.pm:1171 ../urpm.pm:1246
 #, c-format
 msgid "...copying done"
 msgstr "...salin selesai"
 
-#: ../urpm.pm:758
-#: ../urpm.pm:1172
-#: ../urpm.pm:1321
-#: ../urpm.pm:1380
-#: ../urpm.pm:1560
-#: ../urpm.pm:1567
+#: ../urpm.pm:758 ../urpm.pm:1172 ../urpm.pm:1321 ../urpm.pm:1380
+#: ../urpm.pm:1560 ../urpm.pm:1567
 #, c-format
 msgid "...copying failed"
 msgstr "...gagal menyalin"
 
-#: ../urpm.pm:761
-#: ../urpm.pm:786
-#: ../urpm.pm:825
+#: ../urpm.pm:761 ../urpm.pm:786 ../urpm.pm:825
 #, c-format
 msgid "unable to access first installation medium (no hdlists file found)"
 msgstr "gagal mengakses media instalasi pertama (fail hdlists tidak dijumpai)"
@@ -630,18 +573,12 @@ msgstr "gagal mengakses media instalasi pertama (fail hdlists tidak dijumpai)"
 msgid "retrieving hdlists file..."
 msgstr "ambil fail hdlist..."
 
-#: ../urpm.pm:780
-#: ../urpm.pm:1604
-#: ../urpm.pm:2094
-#: ../urpm.pm:2810
+#: ../urpm.pm:780 ../urpm.pm:1604 ../urpm.pm:2094 ../urpm.pm:2810
 #, c-format
 msgid "...retrieving done"
 msgstr "...capaian selesai"
 
-#: ../urpm.pm:782
-#: ../urpm.pm:1588
-#: ../urpm.pm:1597
-#: ../urpm.pm:2097
+#: ../urpm.pm:782 ../urpm.pm:1588 ../urpm.pm:1597 ../urpm.pm:2097
 #: ../urpm.pm:2812
 #, c-format
 msgid "...retrieving failed: %s"
@@ -662,8 +599,7 @@ msgstr "cubaan untuk memilih media tidak wujud \"%s\""
 msgid "selecting multiple media: %s"
 msgstr "memilih pelbagai media: %s"
 
-#: ../urpm.pm:864
-#: ../urpmi.update:97
+#: ../urpm.pm:864 ../urpmi.update:97
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
@@ -692,12 +628,15 @@ msgstr "selesai ulangtetap"
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the medium."
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
 
 #: ../urpm.pm:1159
 #, c-format
-msgid "virtual medium \"%s\" should have valid source hdlist or synthesis, medium ignored"
+msgid ""
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
 
 #: ../urpm.pm:1169
@@ -705,8 +644,7 @@ msgstr ""
 msgid "copying description file of \"%s\"..."
 msgstr "fail deskripsi \"%s\" sedang disalin"
 
-#: ../urpm.pm:1193
-#: ../urpm.pm:1467
+#: ../urpm.pm:1193 ../urpm.pm:1467
 #, fuzzy, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "sedang menyalin sumber/sintesis hdlist \"%s\"..."
@@ -731,9 +669,7 @@ msgstr "mengira md5sum salinan sumber hdlist (atau sintesis)"
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr ""
 
-#: ../urpm.pm:1284
-#: ../urpm.pm:1499
-#: ../urpm.pm:1843
+#: ../urpm.pm:1284 ../urpm.pm:1499 ../urpm.pm:1843
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "masalah membaca fail sintesis untuk media \"%s\""
@@ -788,8 +724,7 @@ msgstr "gagal mengambil hdlist (atau sintesis) source"
 msgid "no hdlist file found for medium \"%s\""
 msgstr "fail hdlist utk media \"%s\" tak dijumpai"
 
-#: ../urpm.pm:1713
-#: ../urpm.pm:1767
+#: ../urpm.pm:1713 ../urpm.pm:1767
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
@@ -839,15 +774,14 @@ msgstr "ralat membaca daripada direktori %s: %s\n"
 msgid "building hdlist [%s]"
 msgstr "bangun hdlist [%s]"
 
-#: ../urpm.pm:1912
-#: ../urpm.pm:1947
+#: ../urpm.pm:1912 ../urpm.pm:1947
 #, c-format
-msgid "Unable to build synthesis file for medium \"%s\". Your hdlist file may be corrupted."
+msgid ""
+"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
+"corrupted."
 msgstr ""
 
-#: ../urpm.pm:1915
-#: ../urpm.pm:1950
-#: ../urpmi:317
+#: ../urpm.pm:1915 ../urpm.pm:1950 ../urpmi:317
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "bangunkan fail sintesis hdlist utk media \"%s\""
@@ -907,15 +841,12 @@ msgstr "Cari"
 msgid "no package named %s"
 msgstr "tiada pakej bernama %s"
 
-#: ../urpm.pm:2220
-#: ../urpme:94
+#: ../urpm.pm:2220 ../urpme:94
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Pakej berikut mengandungi %s: %s"
 
-#: ../urpm.pm:2414
-#: ../urpm.pm:2460
-#: ../urpm.pm:2491
+#: ../urpm.pm:2414 ../urpm.pm:2460 ../urpm.pm:2491
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "banyak pakej dgn nama fail rpm sama \"%s\""
@@ -942,17 +873,12 @@ msgstr ""
 msgid "package %s is not found."
 msgstr "pakej %s tidak dijumpai."
 
-#: ../urpm.pm:2581
-#: ../urpm.pm:2595
-#: ../urpm.pm:2615
-#: ../urpm.pm:2629
+#: ../urpm.pm:2581 ../urpm.pm:2595 ../urpm.pm:2615 ../urpm.pm:2629
 #, c-format
 msgid "urpmi database locked"
 msgstr "database urpmi terkunci"
 
-#: ../urpm.pm:2681
-#: ../urpm.pm:2686
-#: ../urpm.pm:2712
+#: ../urpm.pm:2681 ../urpm.pm:2686 ../urpm.pm:2712
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "media \"%s\" tidak dipilih"
@@ -989,7 +915,8 @@ msgstr ""
 
 #: ../urpm.pm:2946
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
 #: ../urpm.pm:2949
@@ -1027,14 +954,12 @@ msgstr "Tidak dapat menjumpai imej pemasangan %s"
 msgid "More information on package %s"
 msgstr "ralat membaca meklumat pada khidmat %s: %s\n"
 
-#: ../urpm.pm:3205
-#: ../urpm.pm:3238
+#: ../urpm.pm:3205 ../urpm.pm:3238
 #, fuzzy, c-format
 msgid "due to missing %s"
 msgstr "kehilangan hujah kepada `%s'"
 
-#: ../urpm.pm:3206
-#: ../urpm.pm:3236
+#: ../urpm.pm:3206 ../urpm.pm:3236
 #, fuzzy, c-format
 msgid "due to unsatisfied %s"
 msgstr "Pergi Ke Direktori"
@@ -1094,8 +1019,7 @@ msgstr ""
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
 
-#: ../urpm/args.pm:93
-#: ../urpm/args.pm:102
+#: ../urpm/args.pm:93 ../urpm/args.pm:102
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr ""
@@ -1115,7 +1039,8 @@ msgstr "Salah pilih, cuba lagi\n"
 msgid ""
 "urpme version %s\n"
 "Copyright (C) 1999-2005 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -1125,19 +1050,13 @@ msgstr ""
 "\n"
 "penggunaan:\n"
 
-#: ../urpme:43
-#: ../urpmf:32
-#: ../urpmi:79
-#: ../urpmi.addmedia:43
-#: ../urpmi.removemedia:48
-#: ../urpmi.update:30
-#: ../urpmq:43
+#: ../urpme:43 ../urpmf:32 ../urpmi:79 ../urpmi.addmedia:43
+#: ../urpmi.removemedia:48 ../urpmi.update:30 ../urpmq:43
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - cetak mesej bantuan ini.\n"
 
-#: ../urpme:44
-#: ../urpmi:86
+#: ../urpme:44 ../urpmi:86
 #, fuzzy, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  -a             - pilih semua yg sama dgn baris perintah.\n"
@@ -1147,16 +1066,13 @@ msgstr "  -a             - pilih semua yg sama dgn baris perintah.\n"
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpme:46
-#: ../urpmi:101
-#: ../urpmq:64
+#: ../urpme:46 ../urpmi:101 ../urpmq:64
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - paksa instal meskipun beberapa pakej tiada.\n"
 
-#: ../urpme:47
-#: ../urpmi:106
-#: ../urpmq:65
+#: ../urpme:47 ../urpmi:106 ../urpmq:65
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
@@ -1173,12 +1089,8 @@ msgid ""
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:51
-#: ../urpmi:139
-#: ../urpmi.addmedia:74
-#: ../urpmi.removemedia:53
-#: ../urpmi.update:48
-#: ../urpmq:92
+#: ../urpme:51 ../urpmi:139 ../urpmi.addmedia:74 ../urpmi.removemedia:53
+#: ../urpmi.update:48 ../urpmq:92
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - mod verbos.\n"
@@ -1205,8 +1117,7 @@ msgstr ""
 msgid "unknown package"
 msgstr "Pakej Hilang"
 
-#: ../urpme:99
-#: ../urpmi:433
+#: ../urpme:99 ../urpmi:433
 #, c-format
 msgid "removing package %s will break your system"
 msgstr ""
@@ -1223,14 +1134,13 @@ msgstr "_Buang pakej yang kini tersenarai untuk dipasang"
 
 #: ../urpme:113
 #, fuzzy, c-format
-msgid "To satisfy dependencies, the following %d packages will be removed (%d MB)"
+msgid ""
+"To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr ""
 "Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
 "%s\n"
 
-#: ../urpme:115
-#: ../urpmi:452
-#: ../urpmi:581
+#: ../urpme:115 ../urpmi:452 ../urpmi:581
 #, c-format
 msgid " (y/N) "
 msgstr " (y/T) "
@@ -1245,7 +1155,8 @@ msgstr "[%s (%s): gagal.  Diabaikan]\n"
 msgid ""
 "urpmf version %s\n"
 "Copyright (C) 2002-2004 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -1255,36 +1166,28 @@ msgstr ""
 "\n"
 "penggunaan:\n"
 
-#: ../urpmf:33
-#: ../urpmi:80
-#: ../urpmq:44
+#: ../urpmf:33 ../urpmi:80 ../urpmq:44
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - guna hanya kemaskini media.\n"
 
-#: ../urpmf:34
-#: ../urpmi:81
-#: ../urpmq:45
+#: ../urpmf:34 ../urpmi:81 ../urpmq:45
 #, fuzzy, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --update       - guna hanya kemaskini media.\n"
 
-#: ../urpmf:35
-#: ../urpmi:83
-#: ../urpmq:47
+#: ../urpmf:35 ../urpmi:83 ../urpmq:47
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:36
-#: ../urpmi:84
-#: ../urpmq:48
+#: ../urpmf:36 ../urpmi:84 ../urpmq:48
 #, c-format
-msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:37
-#: ../urpmq:49
+#: ../urpmf:37 ../urpmq:49
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
@@ -1297,7 +1200,8 @@ msgstr "  -v             - mod verbos.\n"
 #: ../urpmf:39
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on command\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
 "                   line, incompatible with interactive mode).\n"
 msgstr ""
 
@@ -1319,27 +1223,27 @@ msgstr "  --help         - cetak mesej bantuan ini.\n"
 #: ../urpmf:44
 #, fuzzy, c-format
 msgid "  --group        - print tag group: group.\n"
-msgstr "-b  --print-bytes  Cetak byte berbeza."
+msgstr "  --help         - cetak mesej bantuan ini.\n"
 
 #: ../urpmf:45
 #, fuzzy, c-format
 msgid "  --size         - print tag size: size.\n"
-msgstr "-b  --print-bytes  Cetak byte berbeza."
+msgstr "  --help         - cetak mesej bantuan ini.\n"
 
 #: ../urpmf:46
 #, fuzzy, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "-b  --print-bytes  Cetak byte berbeza."
+msgstr "  --help         - cetak mesej bantuan ini.\n"
 
 #: ../urpmf:47
 #, fuzzy, c-format
 msgid "  --summary      - print tag summary: summary.\n"
-msgstr "-b  --print-bytes  Cetak byte berbeza."
+msgstr "Pengurus Pencetak"
 
 #: ../urpmf:48
-#, fuzzy, c-format
+#, c-format
 msgid "  --description  - print tag description: description.\n"
-msgstr "-b  --print-bytes  Cetak byte berbeza."
+msgstr ""
 
 #: ../urpmf:49
 #, c-format
@@ -1349,7 +1253,7 @@ msgstr ""
 #: ../urpmf:50
 #, fuzzy, c-format
 msgid "  --packager     - print tag packager: packager.\n"
-msgstr "-b  --print-bytes  Cetak byte berbeza."
+msgstr "  --help         - cetak mesej bantuan ini.\n"
 
 #: ../urpmf:51
 #, c-format
@@ -1359,7 +1263,7 @@ msgstr ""
 #: ../urpmf:52
 #, fuzzy, c-format
 msgid "  --url          - print tag url: url.\n"
-msgstr "-b  --print-bytes  Cetak byte berbeza."
+msgstr "Lumpuhkan tag ID3V2"
 
 #: ../urpmf:53
 #, c-format
@@ -1374,21 +1278,19 @@ msgstr ""
 #: ../urpmf:55
 #, fuzzy, c-format
 msgid "  --files        - print tag files: all files.\n"
-msgstr "-a  --text  Layan semua fail sebagai teks."
+msgstr "Lumpuhkan tag ID3V2"
 
 #: ../urpmf:56
 #, fuzzy, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "-A  --show-all  Keluarkan semua perubahan, kurungkan konflik."
+msgstr "  --help         - cetak mesej bantuan ini.\n"
 
 #: ../urpmf:57
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 
-#: ../urpmf:58
-#: ../urpmi:121
-#: ../urpmq:74
+#: ../urpmf:58 ../urpmi:121 ../urpmq:74
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1400,8 +1302,7 @@ msgstr ""
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -c             - bersihkan direktori kache header.\n"
 
-#: ../urpmf:61
-#: ../urpmq:81
+#: ../urpmf:61 ../urpmq:81
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - cetak versi, keluaran dan arch dgn nama.\n"
@@ -1413,12 +1314,14 @@ msgstr "  -c             - bersihkan direktori kache header.\n"
 
 #: ../urpmf:63
 #, c-format
-msgid "  -a             - binary AND operator, true if both expression are true.\n"
+msgid ""
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
 #: ../urpmf:64
 #, c-format
-msgid "  -o             - binary OR operator, true if one expression is true.\n"
+msgid ""
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
 #: ../urpmf:65
@@ -1443,16 +1346,16 @@ msgid ""
 "%s\n"
 msgstr "\"%s\" adalah sebuah direktori"
 
-#: ../urpmf:124
-#: ../urpmi:212
-#: ../urpmq:116
+#: ../urpmf:124 ../urpmi:212 ../urpmq:116
 #, fuzzy, c-format
 msgid "using specific environment on %s\n"
 msgstr "Buat partisyen pada pemacu spesifik (ondisk)"
 
 #: ../urpmf:156
 #, c-format
-msgid "Note: since no media searched uses hdlists, urpmf was unable to return any result\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
 
 #: ../urpmf:157
@@ -1465,7 +1368,8 @@ msgstr ""
 msgid ""
 "urpmi version %s\n"
 "Copyright (C) 1999-2005 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -1475,10 +1379,11 @@ msgstr ""
 "\n"
 "penggunaan:\n"
 
-#: ../urpmi:82
-#: ../urpmq:46
+#: ../urpmi:82 ../urpmq:46
 #, fuzzy, c-format
-msgid "  --searchmedia  - use only the given media to search requested (or updated) packages.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested (or updated) "
+"packages.\n"
 msgstr "  --update       - guna hanya kemaskini media.\n"
 
 #: ../urpmi:85
@@ -1486,15 +1391,17 @@ msgstr "  --update       - guna hanya kemaskini media.\n"
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi:87
-#: ../urpmq:50
+#: ../urpmi:87 ../urpmq:50
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
 #: ../urpmi:88
 #, c-format
-msgid "  --no-uninstall - never ask to uninstall a package, abort the installation.\n"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
 msgstr ""
 
 #: ../urpmi:89
@@ -1502,8 +1409,7 @@ msgstr ""
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr ""
 
-#: ../urpmi:90
-#: ../urpmq:52
+#: ../urpmi:90 ../urpmq:52
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1523,14 +1429,12 @@ msgstr ""
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:96
-#: ../urpmq:51
+#: ../urpmi:96 ../urpmq:51
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - lakukan pencarian fuzzy (sama dengan -y).\n"
 
-#: ../urpmi:97
-#: ../urpmq:60
+#: ../urpmi:97 ../urpmq:60
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - pakej berikut adalah pakej sumber (sama dgn -s).\n"
@@ -1576,25 +1480,17 @@ msgid ""
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:110
-#: ../urpmi.addmedia:44
-#: ../urpmi.update:31
-#: ../urpmq:68
+#: ../urpmi:110 ../urpmi.addmedia:44 ../urpmi.update:31 ../urpmq:68
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - guna wget utk mengambil fail jauh.\n"
 
-#: ../urpmi:111
-#: ../urpmi.addmedia:45
-#: ../urpmi.update:32
-#: ../urpmq:69
+#: ../urpmi:111 ../urpmi.addmedia:45 ../urpmi.update:32 ../urpmq:69
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - guna curl utk mengambil fail jauh.\n"
 
-#: ../urpmi:112
-#: ../urpmi.addmedia:46
-#: ../urpmi.update:33
+#: ../urpmi:112 ../urpmi.addmedia:46 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
@@ -1606,20 +1502,14 @@ msgid ""
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:115
-#: ../urpmi.addmedia:47
-#: ../urpmi.update:34
-#: ../urpmq:70
+#: ../urpmi:115 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:70
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi:117
-#: ../urpmi.addmedia:49
-#: ../urpmi.update:36
-#: ../urpmq:72
+#: ../urpmi:117 ../urpmi.addmedia:49 ../urpmi.update:36 ../urpmq:72
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1642,7 +1532,8 @@ msgstr ""
 
 #: ../urpmi:125
 #, c-format
-msgid "  --test         - verify if the installation can be achieved correctly.\n"
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
 #: ../urpmi:126
@@ -1651,9 +1542,9 @@ msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
 #: ../urpmi:127
-#, fuzzy, c-format
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
-msgstr "-x PAT  --exclude=PAT  Asing fail yang sepadan PAT."
+msgstr ""
 
 #: ../urpmi:128
 #, c-format
@@ -1667,9 +1558,7 @@ msgid ""
 "                   than the default.\n"
 msgstr ""
 
-#: ../urpmi:131
-#: ../urpmi.addmedia:68
-#: ../urpmi.update:41
+#: ../urpmi:131 ../urpmi.addmedia:68 ../urpmi.update:41
 #, c-format
 msgid "  --norebuild    - don't try to rebuild hdlist if not readable.\n"
 msgstr ""
@@ -1679,8 +1568,7 @@ msgstr ""
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 
-#: ../urpmi:133
-#: ../urpmq:78
+#: ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - pilih semua yg sama dgn baris perintah.\n"
@@ -1695,21 +1583,18 @@ msgstr "  -p             - izinkan carian dlm sediaada utk mencari pakej.\n"
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - jangan cari dalam tersedia utk mencari pakej.\n"
 
-#: ../urpmi:136
-#: ../urpmq:93
+#: ../urpmi:136 ../urpmq:93
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - lakukan pencarian fuzzy (sama dengan --fuzzy).\n"
 
-#: ../urpmi:137
-#: ../urpmq:90
+#: ../urpmi:137 ../urpmq:90
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - pakej berikut adalah pakej sumber (sama dgn --src).\n"
+msgstr ""
+"  -s             - pakej berikut adalah pakej sumber (sama dgn --src).\n"
 
-#: ../urpmi:138
-#: ../urpmi.addmedia:73
-#: ../urpmi.removemedia:52
+#: ../urpmi:138 ../urpmi.addmedia:73 ../urpmi.removemedia:52
 #: ../urpmi.update:47
 #, c-format
 msgid "  -q             - quiet mode.\n"
@@ -1727,7 +1612,9 @@ msgstr ""
 
 #: ../urpmi:202
 #, c-format
-msgid "Directory [%s] already exists, please use another directory for bug report or delete it"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
 msgstr ""
 
 #: ../urpmi:203
@@ -1735,8 +1622,7 @@ msgstr ""
 msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi:206
-#: ../urpmi:327
+#: ../urpmi:206 ../urpmi:327
 #, fuzzy, c-format
 msgid "Copying failed"
 msgstr "...gagal menyalin"
@@ -1761,8 +1647,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:400
-#: ../urpmi:418
+#: ../urpmi:400 ../urpmi:418
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1794,16 +1679,18 @@ msgstr ""
 "%s\n"
 "Teruskan?"
 
-#: ../urpmi:481
-#: ../urpmi:492
+#: ../urpmi:481 ../urpmi:492
 #, fuzzy, c-format
-msgid "To satisfy dependencies, the following %d packages are going to be installed (%d MB)"
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr "Pakej berikut akan dihapus agar syarat kebergantungan dipenuhi (%d MB)"
 
-#: ../urpmi:482
-#: ../urpmi:493
+#: ../urpmi:482 ../urpmi:493
 #, fuzzy, c-format
-msgid "To satisfy dependencies, the following package is going to be installed (%d MB)"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed (%d "
+"MB)"
 msgstr "Pakej berikut akan dihapus agar syarat kebergantungan dipenuhi (%d MB)"
 
 #: ../urpmi:488
@@ -1883,7 +1770,8 @@ msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
 "where <url> is one of\n"
 "       [file:/]/<path> with <relative filename of hdlist>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
 "       ftp://<host>/<path> with <relative filename of hdlist>\n"
 "       http://<host>/<path> with <relative filename of hdlist>\n"
 "       removable://<path>\n"
@@ -1958,8 +1846,7 @@ msgid ""
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:67
-#: ../urpmi.update:39
+#: ../urpmi.addmedia:67 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
@@ -1974,15 +1861,12 @@ msgstr ""
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:71
-#: ../urpmi.removemedia:50
-#: ../urpmi.update:45
+#: ../urpmi.addmedia:71 ../urpmi.removemedia:50 ../urpmi.update:45
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - bersihkan direktori kache header.\n"
 
-#: ../urpmi.addmedia:72
-#: ../urpmi.update:46
+#: ../urpmi.addmedia:72 ../urpmi.update:46
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - paksa buat fail hdlist.\n"
@@ -2116,7 +2000,8 @@ msgstr "Hanya superuser yang boleh menginstal pakej"
 #: ../urpmi.update:75
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "tiada apa-apa yang perlu dikemaskini (guna urpmi.addmedia utk tambah media)\n"
+msgstr ""
+"tiada apa-apa yang perlu dikemaskini (guna urpmi.addmedia utk tambah media)\n"
 
 #: ../urpmi.update:93
 #, c-format
@@ -2142,7 +2027,8 @@ msgstr "Media Diketahui"
 msgid ""
 "urpmq version %s\n"
 "Copyright (C) 2000-2005 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -2179,7 +2065,8 @@ msgstr ""
 
 #: ../urpmq:59
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
 #: ../urpmq:61
@@ -2193,8 +2080,10 @@ msgstr ""
 
 #: ../urpmq:63
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
-msgstr "  --sources      - beri semua pakej sumber sebelum muatturun (hanya root).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - beri semua pakej sumber sebelum muatturun (hanya root).\n"
 
 #: ../urpmq:66
 #, c-format
@@ -2240,7 +2129,8 @@ msgstr "Up2date - Senarai Pakej (pendaftaran)"
 
 #: ../urpmq:85
 #, fuzzy, c-format
-msgid "  -P             - do not search in provides to find package (default).\n"
+msgid ""
+"  -P             - do not search in provides to find package (default).\n"
 msgstr "  -P             - jangan cari dalam tersedia utk mencari pakej.\n"
 
 #: ../urpmq:86
@@ -2260,13 +2150,17 @@ msgstr "  -p             - izinkan carian dlm sediaada utk mencari pakej.\n"
 
 #: ../urpmq:89
 #, fuzzy, c-format
-msgid "  -RR            - extended reverse search (includes virtual packages).\n"
+msgid ""
+"  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr "  -p             - izinkan carian dlm sediaada utk mencari pakej.\n"
 
 #: ../urpmq:91
 #, fuzzy, c-format
-msgid "  -u             - remove package if a more recent version is already installed.\n"
-msgstr "  -s             - pakej berikut adalah pakej sumber (sama dgn --src).\n"
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+"  -s             - pakej berikut adalah pakej sumber (sama dgn --src).\n"
 
 #: ../urpmq:94
 #, fuzzy, c-format
@@ -2297,4 +2191,3 @@ msgstr "Tiada Pemacu Dijumpai"
 #, fuzzy, c-format
 msgid "No changelog found\n"
 msgstr "Tiada Pemacu Dijumpai"
-
diff --git a/po/pl.po b/po/pl.po
index 9fdd96f2..83543e15 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1721,7 +1721,7 @@ msgstr ""
 #: ../urpmi:183
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
-msgstr "Co można zrobić z binarnymi plikami rpm przy użyciu --instal-src"
+msgstr "Co można zrobić z binarnymi plikami rpm przy użyciu --install-src"
 
 #: ../urpmi:202
 #, c-format
diff --git a/po/pt.po b/po/pt.po
index 6a883d58..9ff98e52 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-pt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-06 11:20+0200\n"
+"POT-Creation-Date: 2005-07-28 12:54+0200\n"
 "PO-Revision-Date: 2005-07-23 04:29+0100\n"
 "Last-Translator: José Melo <mmodem00@gmail.com>\n"
 "Language-Team: Português <pt@li.org>\n"
@@ -418,12 +418,14 @@ msgstr "a média virtual \"%s\" deve ter um url esclarecedor, média ignorada"
 #: ../urpm.pm:279
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "não foi possível encontrar o ficheiro hdlist para \"%s\", média ignorada"
+msgstr ""
+"não foi possível encontrar o ficheiro hdlist para \"%s\", média ignorada"
 
 #: ../urpm.pm:286
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "não foi possível encontrar o ficheiro lista para \"%s\", média ignorada"
+msgstr ""
+"não foi possível encontrar o ficheiro lista para \"%s\", média ignorada"
 
 #: ../urpm.pm:310
 #, c-format
@@ -433,7 +435,8 @@ msgstr "ficheiro lista inconsistente para \"%s\", média ignorada"
 #: ../urpm.pm:320
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "não foi possível inspeccionar o ficheiro lista para \"%s\", média ignorada"
+msgstr ""
+"não foi possível inspeccionar o ficheiro lista para \"%s\", média ignorada"
 
 #: ../urpm.pm:360
 #, c-format
@@ -965,8 +968,10 @@ msgstr "a usar o processo %d para executar a transacção"
 
 #: ../urpm.pm:2946
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "transacção criada para instalar em %s (remove=%d, instala=%d, actualiza=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"transacção criada para instalar em %s (remove=%d, instala=%d, actualiza=%d)"
 
 #: ../urpm.pm:2949
 #, c-format
@@ -1108,17 +1113,21 @@ msgstr "  --help         - mostra esta mensagem de ajuda.\n"
 #: ../urpme:44 ../urpmi:86
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - selecciona automaticamente um pacote nas escolhas.\n"
+msgstr ""
+"  --auto         - selecciona automaticamente um pacote nas escolhas.\n"
 
 #: ../urpme:45
 #, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - verifica se a remoção pode ser conseguida correctamente.\n"
+msgstr ""
+"  --test         - verifica se a remoção pode ser conseguida correctamente.\n"
 
 #: ../urpme:46 ../urpmi:101 ../urpmq:64
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - força a execução mesmo se alguns pacotes não existirem.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - força a execução mesmo se alguns pacotes não existirem.\n"
 
 #: ../urpme:47 ../urpmi:106 ../urpmq:65
 #, c-format
@@ -1148,7 +1157,8 @@ msgstr "  -v             - modo detalhado.\n"
 #: ../urpme:52
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - selecciona todos os pacotes correspondentes à expressão.\n"
+msgstr ""
+"  -a             - selecciona todos os pacotes correspondentes à expressão.\n"
 
 #: ../urpme:68
 #, c-format
@@ -1182,7 +1192,8 @@ msgstr "A verificar para remover os seguintes pacotes"
 
 #: ../urpme:113
 #, c-format
-msgid "To satisfy dependencies, the following %d packages will be removed (%d MB)"
+msgid ""
+"To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr ""
 "Para satisfazer as dependências, os seguintes %d pacotes serão removidos (%d "
 "MB)"
@@ -1221,7 +1232,8 @@ msgstr "  --update       - usa apenas a média de actualização.\n"
 #: ../urpmf:34 ../urpmi:81 ../urpmq:45
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - usa apenas a média indicada, separada por vírgula.\n"
+msgstr ""
+"  --media        - usa apenas a média indicada, separada por vírgula.\n"
 
 #: ../urpmf:35 ../urpmi:83 ../urpmq:47
 #, c-format
@@ -1230,7 +1242,8 @@ msgstr "  --excludemedia - não usa a média indicada, separada por vírgula.\n"
 
 #: ../urpmf:36 ../urpmi:84 ../urpmq:48
 #, c-format
-msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - organiza as médias de acordo com as substrings separadas "
 "por vírgula.\n"
@@ -1327,7 +1340,8 @@ msgstr "  --provides     - mostra o que a marca fornece: tudo fornecido.\n"
 #: ../urpmf:54
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires     - mostra os requesitos da marca: todos os requesitos.\n"
+msgstr ""
+"  --requires     - mostra os requesitos da marca: todos os requesitos.\n"
 
 #: ../urpmf:55
 #, c-format
@@ -1342,7 +1356,8 @@ msgstr "  --conflicts    - mostra os conflitos da marca: todos os conflitos.\n"
 #: ../urpmf:57
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes     - mostra os obsoletos da marca: todos os obsoletos.\n"
+msgstr ""
+"  --obsoletes     - mostra os obsoletos da marca: todos os obsoletos.\n"
 
 #: ../urpmf:58 ../urpmi:121 ../urpmq:74
 #, c-format
@@ -1356,12 +1371,14 @@ msgstr ""
 #: ../urpmf:60
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i            - ignora a diferenças de capitalização em todos os padrões.\n"
+msgstr ""
+"  -i            - ignora a diferenças de capitalização em todos os padrões.\n"
 
 #: ../urpmf:61 ../urpmq:81
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - mostra a versão, a saída e a arquitectura com o nome.\n"
+msgstr ""
+"  -f             - mostra a versão, a saída e a arquitectura com o nome.\n"
 
 #: ../urpmf:62
 #, c-format
@@ -1370,14 +1387,16 @@ msgstr "  -e            - inclui o código perl directamente como perl -e.\n"
 
 #: ../urpmf:63
 #, c-format
-msgid "  -a             - binary AND operator, true if both expression are true.\n"
+msgid ""
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 "  -a             - operador binário AND, verdadeiro se as duas expressões "
 "são verdadeiras.\n"
 
 #: ../urpmf:64
 #, c-format
-msgid "  -o             - binary OR operator, true if one expression is true.\n"
+msgid ""
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 "  -o             - operador binário OR, verdadeiro se uma expressão é "
 "verdadeira.\n"
@@ -1385,17 +1404,20 @@ msgstr ""
 #: ../urpmf:65
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  !              - operador unário NOT, verdadeiro se a expressão é falsa.\n"
+msgstr ""
+"  !              - operador unário NOT, verdadeiro se a expressão é falsa.\n"
 
 #: ../urpmf:66
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - parêntesis esquerdo para abrir um grupo de expressões.\n"
+msgstr ""
+"  (              - parêntesis esquerdo para abrir um grupo de expressões.\n"
 
 #: ../urpmf:67
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - parêntesis direito para fechar um grupo de expressões.\n"
+msgstr ""
+"  )              - parêntesis direito para fechar um grupo de expressões.\n"
 
 #: ../urpmf:119
 #, c-format
@@ -1457,7 +1479,8 @@ msgstr "  --synthesis    - usa a síntese dada em vez da base de dados urpmi.\n"
 
 #: ../urpmi:87 ../urpmq:50
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - selecciona automaticamente os pacotes para actualizar o "
 "sistema.\n"
@@ -1499,7 +1522,8 @@ msgstr ""
 #: ../urpmi:95
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - pequeno comprimento de transacção, por defeito é %d.\n"
+msgstr ""
+"  --split-length - pequeno comprimento de transacção, por defeito é %d.\n"
 
 #: ../urpmi:96 ../urpmq:51
 #, c-format
@@ -1509,7 +1533,8 @@ msgstr "  --fuzzy        - impõe uma procura aproximada (o mesmo que -y).\n"
 #: ../urpmi:97 ../urpmq:60
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - o próximo pacote é um pacote fonte (o mesmo que -s).\n"
+msgstr ""
+"  --src          - o próximo pacote é um pacote fonte (o mesmo que -s).\n"
 
 #: ../urpmi:98
 #, c-format
@@ -1623,7 +1648,8 @@ msgstr ""
 
 #: ../urpmi:125
 #, c-format
-msgid "  --test         - verify if the installation can be achieved correctly.\n"
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 "  --test         - verifica se a instalação pode ser conseguida "
 "correctamente.\n"
@@ -1665,7 +1691,8 @@ msgstr "  --strict-arch  - só actualiza os pacotes com a mesma arquitectura.\n"
 #: ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - escolhe todas as correspondências na linha de comando.\n"
+msgstr ""
+"  -a             - escolhe todas as correspondências na linha de comando.\n"
 
 #: ../urpmi:134
 #, c-format
@@ -1677,17 +1704,20 @@ msgstr ""
 #: ../urpmi:135
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - não procura nos fornecidospara encontrar o pacote.\n"
+msgstr ""
+"  -P             - não procura nos fornecidospara encontrar o pacote.\n"
 
 #: ../urpmi:136 ../urpmq:93
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - impõe uma procura aproximada (o mesmo que --fuzzy).\n"
+msgstr ""
+"  -y             - impõe uma procura aproximada (o mesmo que --fuzzy).\n"
 
 #: ../urpmi:137 ../urpmq:90
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - o próximo pacote é um pacote fonte (o mesmo que --src).\n"
+msgstr ""
+"  -s             - o próximo pacote é um pacote fonte (o mesmo que --src).\n"
 
 #: ../urpmi:138 ../urpmi.addmedia:73 ../urpmi.removemedia:52
 #: ../urpmi.update:47
@@ -1705,7 +1735,8 @@ msgstr ""
 #: ../urpmi:183
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
-msgstr "O que pode ser feito com pacotes rpm binários quando se usa --install-src"
+msgstr ""
+"O que pode ser feito com pacotes rpm binários quando se usa --install-src"
 
 #: ../urpmi:202
 #, c-format
@@ -1986,7 +2017,8 @@ msgstr "  --nopubkey     - não importar chave pub da média adicionada\n"
 #: ../urpmi.addmedia:70
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
-msgstr "  --raw          - adiciona a média na configuração, mas não a actualiza.\n"
+msgstr ""
+"  --raw          - adiciona a média na configuração, mas não a actualiza.\n"
 
 #: ../urpmi.addmedia:71 ../urpmi.removemedia:50 ../urpmi.update:45
 #, c-format
@@ -2182,7 +2214,8 @@ msgstr "  --list-url     - lista as médias disponíveis e as suas url.\n"
 #: ../urpmq:57
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - lista os nós disponíveis quando a usar --parallel.\n"
+msgstr ""
+"  --list-nodes   - lista os nós disponíveis quando a usar --parallel.\n"
 
 #: ../urpmq:58
 #, c-format
@@ -2191,7 +2224,8 @@ msgstr "  --list-aliases   - lista as aliases paralelas disponíveis.\n"
 
 #: ../urpmq:59
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - deixa a configuração na forma de argumento urpmi."
 "addmedia.\n"
@@ -2207,7 +2241,8 @@ msgstr ""
 
 #: ../urpmq:63
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - indica todos os pacotes fonte a instalar antes de os "
 "transferir (apenas root).\n"
@@ -2240,7 +2275,8 @@ msgstr "  -c             - listagem completa com os pacotes a ser removidos.\n"
 #: ../urpmq:80
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - questionário estendido para as dependências dos pacotes.\n"
+msgstr ""
+"  -d             - questionário estendido para as dependências dos pacotes.\n"
 
 #: ../urpmq:82
 #, c-format
@@ -2259,7 +2295,8 @@ msgstr "  -l             - lista os ficheiros no pacote.\n"
 
 #: ../urpmq:85
 #, c-format
-msgid "  -P             - do not search in provides to find package (default).\n"
+msgid ""
+"  -P             - do not search in provides to find package (default).\n"
 msgstr ""
 "  -P             - não procura em provides para encontrar o pacote "
 "(padrão).\n"
@@ -2281,8 +2318,10 @@ msgstr "  -R             - reverte a procura para o que o pacote requer.\n"
 
 #: ../urpmq:89
 #, c-format
-msgid "  -RR            - extended reverse search (includes virtual packages).\n"
-msgstr "  -R             - procura revertida entendida (inclui pacotes virtuais).\n"
+msgid ""
+"  -RR            - extended reverse search (includes virtual packages).\n"
+msgstr ""
+"  -R             - procura revertida entendida (inclui pacotes virtuais).\n"
 
 #: ../urpmq:91
 #, c-format
@@ -2303,7 +2342,8 @@ msgstr ""
 #: ../urpmq:95
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  os nomes ou os ficheiros rpm dados na linha de comando são questionados.\n"
+msgstr ""
+"  os nomes ou os ficheiros rpm dados na linha de comando são questionados.\n"
 
 #: ../urpmq:157
 #, c-format
@@ -2324,4 +2364,3 @@ msgstr "Nenhuma lista de ficheiros encontrada\n"
 #, c-format
 msgid "No changelog found\n"
 msgstr "Nenhum registo (changelog) encontrado\n"
-
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4df27fe3..036d8873 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1272,7 +1272,7 @@ msgstr "  --all          - imprime todas as tags\n"
 #: ../urpmf:43
 #, c-format
 msgid "  --name         - print only package names.\n"
-msgstr "  --nome          - imprime somente o nome dos pacotes\n"
+msgstr "  --name         - imprime somente o nome dos pacotes\n"
 
 #: ../urpmf:44
 #, c-format
@@ -1437,7 +1437,7 @@ msgstr ""
 #: ../urpmf:157
 #, c-format
 msgid "You may want to use --name to search for package names.\n"
-msgstr "Você poderá usar -- nome para procurar pelo nome pacote.\n"
+msgstr "Você poderá usar --name para procurar pelo nome pacote.\n"
 
 #: ../urpmi:74
 #, c-format
@@ -1668,7 +1668,7 @@ msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
 msgstr ""
-"  --mais-escolhas - uando diversos pacotes forem encontrados,proponha mais "
+"  --more-choices - uando diversos pacotes forem encontrados,proponha mais "
 "escolhas\n"
 "                   por padrão.\n"
 
diff --git a/po/ru.po b/po/ru.po
index 428e8b65..8362d46e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1942,7 +1942,7 @@ msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
-"  --disrtib      - автоматическое создание всех источников из установочного\n"
+"  --distrib      - автоматическое создание всех источников из установочного\n"
 "                   источника.\n"
 
 #: ../urpmi.addmedia:58
diff --git a/po/sk.po b/po/sk.po
index afaa3f90..c817961f 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1270,7 +1270,7 @@ msgstr "  --all          - zobraziť všetky značky.\n"
 #: ../urpmf:43
 #, c-format
 msgid "  --name         - print only package names.\n"
-msgstr "  --meno         - zobraziť iba názvy balíkov.\n"
+msgstr "  --name         - zobraziť iba názvy balíkov.\n"
 
 #: ../urpmf:44
 #, c-format
diff --git a/po/sq.po b/po/sq.po
index 7324e34f..48645dc4 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -474,7 +474,7 @@ msgid ""
 "update or --parallel"
 msgstr ""
 "--synthesis nuk mund të përdoret me --media, --excludemedia, --sortmedia, --"
-"update or --paralle"
+"update or --parallel"
 
 #: ../urpm.pm:539 ../urpm.pm:565 ../urpm.pm:1047 ../urpm.pm:1058
 #: ../urpm.pm:1130 ../urpm.pm:1147 ../urpm.pm:1217 ../urpm.pm:1276
diff --git a/po/sr.po b/po/sr.po
index cd9a7dcf..a59980d9 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1907,7 +1907,7 @@ msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
-"  --form         - користи дату url адресу за лист мирора, подразумевано је\n"
+"  --from         - користи дату url адресу за лист мирора, подразумевано је\n"
 "                   %s\n"
 
 #: ../urpmi.addmedia:60
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 1081ed1d..03d8c5ba 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -1909,7 +1909,7 @@ msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
-"  --form         - koristi datu url adresu za list mirora, podrazumevano je\n"
+"  --from         - koristi datu url adresu za list mirora, podrazumevano je\n"
 "                   %s\n"
 
 #: ../urpmi.addmedia:60
diff --git a/po/tg.po b/po/tg.po
index ea5a5afd..0d82f4df 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -504,7 +504,9 @@ msgstr ""
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
-msgstr "--synthesis бо --media, --update ё --parallel истифода бурда намешавад"
+msgstr ""
+"--synthesis бо --media, --excludemedia, --sortmedia, --update ё --parallel "
+"истифода бурда намешавад"
 
 #: ../urpm.pm:539 ../urpm.pm:565 ../urpm.pm:1047 ../urpm.pm:1058
 #: ../urpm.pm:1130 ../urpm.pm:1147 ../urpm.pm:1217 ../urpm.pm:1276
@@ -1278,7 +1280,7 @@ msgstr "  --all          - чопи ҳама тэгҳо.\n"
 #: ../urpmf:43
 #, c-format
 msgid "  --name         - print only package names.\n"
-msgstr "  --ном         - танҳо номҳои бастаҳоро чоп кунед.\n"
+msgstr "  --name         - танҳо номҳои бастаҳоро чоп кунед.\n"
 
 #: ../urpmf:44
 #, c-format
@@ -1288,7 +1290,7 @@ msgstr "  --group        - чопи гурӯҳи тэг: гурӯҳ.\n"
 #: ../urpmf:45
 #, c-format
 msgid "  --size         - print tag size: size.\n"
-msgstr "  --ҳаҷм          - чопи ҳаҷми тэг: ҳаҷм.\n"
+msgstr "  --size         - чопи ҳаҷми тэг: ҳаҷм.\n"
 
 #: ../urpmf:46
 #, c-format
@@ -1335,7 +1337,7 @@ msgstr ""
 #: ../urpmf:54
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
-msgstr " --requires     -  тэг requires-ро чоп намоед: ҳамаи вобастагиҳоро.\n"
+msgstr "  --requires     -  тэг requires-ро чоп намоед: ҳамаи вобастагиҳоро.\n"
 
 #: ../urpmf:55
 #, c-format
@@ -1345,7 +1347,7 @@ msgstr "  --files        - чопи tag files: ҳамаи файлҳо.\n"
 #: ../urpmf:56
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr " --conflicts    - тэг conflicts-ро чоп намоед: ҳамаи мухолифатро.\n"
+msgstr "  --conflicts    - тэг conflicts-ро чоп намоед: ҳамаи мухолифатро.\n"
 
 #: ../urpmf:57
 #, c-format
@@ -1435,8 +1437,7 @@ msgstr ""
 #: ../urpmf:157
 #, c-format
 msgid "You may want to use --name to search for package names.\n"
-msgstr ""
-"Шумо метавонед --номро барои ҷустуҷӯ барои бастаи номҳо, хоҳед бинед.\n"
+msgstr "Шумо метавонед --name барои ҷустуҷӯ барои бастаи номҳо, хоҳед бинед.\n"
 
 #: ../urpmi:74
 #, c-format
@@ -1685,8 +1686,8 @@ msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
 msgstr ""
-"  --интихобҳои-бештар - ҳангоме, ки бастаҳои гуногун пайдо гарданд, "
-"интихобҳои бештар пешкаш мегарданд\n"
+"  --more-choices - ҳангоме, ки бастаҳои гуногун пайдо гарданд, интихобҳои "
+"бештар пешкаш мегарданд\n"
 "                   назар ба нобаёнӣ.\n"
 
 #: ../urpmi:131 ../urpmi.addmedia:68 ../urpmi.update:41
@@ -1965,7 +1966,7 @@ msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
-"  --disrtib      - аз сарчашмаи коргузорӣ ба таври автоматикӣ дигар\n"
+"  --distrib      - аз сарчашмаи коргузорӣ ба таври автоматикӣ дигар\n"
 "манбаъҳоро                    созед.\n"
 
 #: ../urpmi.addmedia:58
@@ -1984,9 +1985,9 @@ msgid ""
 "                   from the version of the distribution told by the\n"
 "                   installed mandriva-release package.\n"
 msgstr ""
-" --version      - аз рӯи пешфарз намуди нишондодашудаи тақсимотро\n"
-"                  истифодабаред тафсири тақсимоте ки бо барномаи коромодаи\n"
-"                  mandriva-release муқаррар шудааст, истифода мегардад.\n"
+"  --version      - аз рӯи пешфарз намуди нишондодашудаи тақсимотро\n"
+"                   истифодабаред тафсири тақсимоте ки бо барномаи коромодаи\n"
+"                   mandriva-release муқаррар шудааст, истифода мегардад.\n"
 
 #: ../urpmi.addmedia:63
 #, c-format
@@ -2372,15 +2373,6 @@ msgstr "Ягон рӯйхати файл пайдо нагашт\n"
 msgid "No changelog found\n"
 msgstr "Ягон номнависи тағиротҳо пайдо нагардид\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "  --keep         - keep existing packages if possible, reject requested\n"
-#~ "                   packages that leads to remove.\n"
-#~ msgstr ""
-#~ " --keep         - аз имконият истифода бурда барномаҳои коромодаро нигоҳ "
-#~ "доред, хориҷ намоед\n"
-#~ "                   барномаҳои коромодаҳое ки ба хориҷшавӣ меоранд.\n"
-
 #~ msgid "unable to write file [%s]"
 #~ msgstr "навиштани файли [%s] номумкин аст"
 
diff --git a/po/th.po b/po/th.po
index d7704be9..cb4490d9 100644
--- a/po/th.po
+++ b/po/th.po
@@ -457,11 +457,11 @@ msgid "there doesn't seem to be devices in the chroot in \"%s\""
 msgstr ""
 
 #: ../urpm.pm:478
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
-msgstr "--synthesis cannot be used with --media, --update or --parallel"
+msgstr ""
 
 #: ../urpm.pm:539 ../urpm.pm:565 ../urpm.pm:1047 ../urpm.pm:1058
 #: ../urpm.pm:1130 ../urpm.pm:1147 ../urpm.pm:1217 ../urpm.pm:1276
@@ -1048,7 +1048,7 @@ msgstr "  --help         - พิมพ์ข้อความช่วย\n"
 #: ../urpme:44 ../urpmi:86
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --อัตโนมัติ         - ทำการเลือกแพ็คเกจโดยอัตโนมัติ.\n"
+msgstr "  --auto         - ทำการเลือกแพ็คเกจโดยอัตโนมัติ.\n"
 
 #: ../urpme:45
 #, fuzzy, c-format
@@ -1136,7 +1136,7 @@ msgid "Removing failed"
 msgstr "ล็อกอินล้มเหลว"
 
 #: ../urpmf:27
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "urpmf version %s\n"
 "Copyright (C) 2002-2004 Mandriva.\n"
@@ -1145,8 +1145,8 @@ msgid ""
 "\n"
 "usage:\n"
 msgstr ""
-"mdkupdate เวอร์ชั่นที่ %s\n"
-"Copyright (C) %s Mandriva.\n"
+"urpmf เวอร์ชั่นที่ %s\n"
+"Copyright (C) 2002-2004 Mandriva.\n"
 "ซอฟท์แวร์นี่เป็นฟรีซอฟท์แวร์และแจกจ่ายภายใต้ระเบียบของ GNU GPL.\n"
 "\n"
 "วิธีใช้:\n"
@@ -1221,19 +1221,19 @@ msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --help         - พิมพ์ข้อความช่วย\n"
 
 #: ../urpmf:47
-#, fuzzy, c-format
+#, c-format
 msgid "  --summary      - print tag summary: summary.\n"
-msgstr " --summary      - พิมพ์ tag summary: summary"
+msgstr "  --summary      - พิมพ์ tag summary: summary\n"
 
 #: ../urpmf:48
 #, fuzzy, c-format
 msgid "  --description  - print tag description: description.\n"
-msgstr " --description  - พิมพ์ tag รายละเอียด  : รายละเอียด"
+msgstr "  --description  - พิมพ์ tag รายละเอียด  : รายละเอียด"
 
 #: ../urpmf:49
 #, fuzzy, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr " --group        - พิมพ์ tag group: group."
+msgstr "  --group        - พิมพ์ tag group: group."
 
 #: ../urpmf:50
 #, fuzzy, c-format
@@ -1243,7 +1243,7 @@ msgstr "  --list         - แสดงรายชื่อแพ็คเก�
 #: ../urpmf:51
 #, fuzzy, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr " --files        - พิมพ์  tag files: file ทั้งหมด (หลายบรรทัด)."
+msgstr "  --files        - พิมพ์  tag files: file ทั้งหมด (หลายบรรทัด)."
 
 #: ../urpmf:52
 #, fuzzy, c-format
@@ -1253,12 +1253,12 @@ msgstr "  --help         - พิมพ์ข้อความช่วย\n"
 #: ../urpmf:53
 #, fuzzy, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
-msgstr " --provides     -พิมพ์  tag provides: all provides (หลายบรรทัด). "
+msgstr "  --provides     -พิมพ์  tag provides: all provides (หลายบรรทัด). "
 
 #: ../urpmf:54
 #, fuzzy, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
-msgstr " --requires     - พิมพ์  tag ที่ต้องการ:ที่ต้องการทั้งหมด(หลายบรรทัด)."
+msgstr "  --requires     - พิมพ์  tag ที่ต้องการ:ที่ต้องการทั้งหมด(หลายบรรทัด)."
 
 #: ../urpmf:55
 #, fuzzy, c-format
@@ -1268,12 +1268,12 @@ msgstr "  --help         - พิมพ์ข้อความช่วย\n"
 #: ../urpmf:56
 #, fuzzy, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr " --conflicts    -พิมพ์ tag ที่เข้ากันไม่ได้:เข้ากันไม่ได้ทั้งหมด(หลายบรรทัด)."
+msgstr "  --conflicts    -พิมพ์ tag ที่เข้ากันไม่ได้:เข้ากันไม่ได้ทั้งหมด(หลายบรรทัด)."
 
 #: ../urpmf:57
 #, fuzzy, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr " --obsoletes    -พิมพ์ tag ไม่ใช้แล้ว:ใช้ไม่ได้ทั้งหมด(หลายบรรทัด)."
+msgstr "  --obsoletes    -พิมพ์ tag ไม่ใช้แล้ว:ใช้ไม่ได้ทั้งหมด(หลายบรรทัด)."
 
 #: ../urpmf:58 ../urpmi:121 ../urpmq:74
 #, c-format
@@ -1351,7 +1351,7 @@ msgid "You may want to use --name to search for package names.\n"
 msgstr ""
 
 #: ../urpmi:74
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "urpmi version %s\n"
 "Copyright (C) 1999-2005 Mandriva.\n"
@@ -1360,8 +1360,8 @@ msgid ""
 "\n"
 "usage:\n"
 msgstr ""
-"mdkupdate เวอร์ชั่นที่ %s\n"
-"Copyright (C) %s Mandriva.\n"
+"urpmi เวอร์ชั่นที่ %s\n"
+"Copyright (C) 1999-2005 Mandriva.\n"
 "ซอฟท์แวร์นี่เป็นฟรีซอฟท์แวร์และแจกจ่ายภายใต้ระเบียบของ GNU GPL.\n"
 "\n"
 "วิธีใช้:\n"
@@ -1382,7 +1382,7 @@ msgstr "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --เลือกอัตโนมัติ  - เลือกแพ็คเกจที่ต้องการอัพเกรดอัตโนมัติ\n"
+msgstr "  --auto-select  - เลือกแพ็คเกจที่ต้องการอัพเกรดอัตโนมัติ\n"
 
 #: ../urpmi:88
 #, c-format
@@ -1432,9 +1432,9 @@ msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
 #: ../urpmi:99
-#, c-format
+#, fuzzy, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --noclean      - เก็บ rpm ซึ่งไม่ถูกใช้ใน cache.\n"
 
 #: ../urpmi:100
 #, fuzzy, c-format
@@ -1562,7 +1562,7 @@ msgstr ""
 #: ../urpmi:131 ../urpmi.addmedia:68 ../urpmi.update:41
 #, fuzzy, c-format
 msgid "  --norebuild    - don't try to rebuild hdlist if not readable.\n"
-msgstr " --files        - พิมพ์  tag files: file ทั้งหมด (หลายบรรทัด)."
+msgstr "  --files        - พิมพ์  tag files: file ทั้งหมด (หลายบรรทัด)."
 
 #: ../urpmi:132
 #, c-format
@@ -1983,7 +1983,7 @@ msgstr ""
 #: ../urpmi.update:44
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
-msgstr " --a          - เลือกมีเดียที่ไม่สามารถเคลื่อนย้ายได้ทั้งหมด \n"
+msgstr "  -a             - เลือกมีเดียที่ไม่สามารถเคลื่อนย้ายได้ทั้งหมด \n"
 
 #: ../urpmi.update:67
 #, fuzzy, c-format
@@ -2073,7 +2073,7 @@ msgstr ""
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
-msgstr "  --โค้ด      - ให้โค้ดของแพ็คเกจก่อนดาวน์โหลด (เฉพาะรูทเท่านั้น).\n"
+msgstr "  --sources      - ให้โค้ดของแพ็คเกจก่อนดาวน์โหลด (เฉพาะรูทเท่านั้น).\n"
 
 #: ../urpmq:66
 #, c-format
@@ -2090,7 +2090,7 @@ msgstr "  --help         - พิมพ์ข้อความช่วย\n"
 #: ../urpmq:77
 #, fuzzy, c-format
 msgid "  --summary, -S  - print summary.\n"
-msgstr " --summary      - พิมพ์ tag summary: summary"
+msgstr "  --summary      - พิมพ์ tag summary: summary"
 
 #: ../urpmq:79
 #, fuzzy, c-format