summaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2014-09-13 21:15:37 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2014-09-13 21:15:37 +0200
commit7b97e6dc767e2115123b89e45116bde116afa7ef (patch)
tree39c554fb360afa4e4044aa71dd10d9a111df393a /po
parentceaf2d93cfb26f649af8b403f6afbfc09a444a71 (diff)
downloadurpmi-7b97e6dc767e2115123b89e45116bde116afa7ef.tar
urpmi-7b97e6dc767e2115123b89e45116bde116afa7ef.tar.gz
urpmi-7b97e6dc767e2115123b89e45116bde116afa7ef.tar.bz2
urpmi-7b97e6dc767e2115123b89e45116bde116afa7ef.tar.xz
urpmi-7b97e6dc767e2115123b89e45116bde116afa7ef.zip
sync with code
Diffstat (limited to 'po')
-rw-r--r--po/af.po142
-rw-r--r--po/ar.po161
-rw-r--r--po/ast.po161
-rw-r--r--po/az.po150
-rw-r--r--po/bg.po158
-rw-r--r--po/bn.po150
-rw-r--r--po/br.po154
-rw-r--r--po/bs.po150
-rw-r--r--po/ca.po154
-rw-r--r--po/cs.po161
-rw-r--r--po/cy.po161
-rw-r--r--po/da.po161
-rw-r--r--po/de.po161
-rw-r--r--po/el.po161
-rw-r--r--po/eo.po150
-rw-r--r--po/es.po161
-rw-r--r--po/et.po161
-rw-r--r--po/eu.po161
-rw-r--r--po/fa.po150
-rw-r--r--po/fi.po165
-rw-r--r--po/fr.po858
-rw-r--r--po/fur.po156
-rw-r--r--po/ga.po142
-rw-r--r--po/gl.po158
-rw-r--r--po/he.po144
-rw-r--r--po/hi.po150
-rw-r--r--po/hr.po154
-rw-r--r--po/hu.po161
-rw-r--r--po/id.po660
-rw-r--r--po/is.po161
-rw-r--r--po/it.po161
-rw-r--r--po/ja.po161
-rw-r--r--po/ka.po146
-rw-r--r--po/ko.po142
-rw-r--r--po/ky.po152
-rw-r--r--po/lt.po152
-rw-r--r--po/lv.po150
-rw-r--r--po/mk.po158
-rw-r--r--po/mn.po142
-rw-r--r--po/ms.po157
-rw-r--r--po/mt.po150
-rw-r--r--po/nb.po161
-rw-r--r--po/nl.po161
-rw-r--r--po/nn.po161
-rw-r--r--po/pa_IN.po150
-rw-r--r--po/pl.po161
-rw-r--r--po/pt.po161
-rw-r--r--po/pt_BR.po161
-rw-r--r--po/ro.po161
-rw-r--r--po/ru.po741
-rw-r--r--po/sc.po150
-rw-r--r--po/sk.po150
-rw-r--r--po/sl.po161
-rw-r--r--po/sq.po150
-rw-r--r--po/sr.po152
-rw-r--r--po/sr@Latn.po152
-rw-r--r--po/sv.po633
-rw-r--r--po/tg.po154
-rw-r--r--po/th.po150
-rw-r--r--po/tl.po152
-rw-r--r--po/tr.po161
-rw-r--r--po/uk.po165
-rw-r--r--po/urpmi.pot138
-rw-r--r--po/uz.po147
-rw-r--r--po/uz@cyrillic.po147
-rw-r--r--po/vi.po150
-rw-r--r--po/wa.po158
-rw-r--r--po/zh_CN.po161
-rw-r--r--po/zh_TW.po161
69 files changed, 7179 insertions, 5779 deletions
diff --git a/po/af.po b/po/af.po
index 0963aa20..0edb145f 100644
--- a/po/af.po
+++ b/po/af.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: Fri May 19 2000 13:02:12+0200\n"
"Last-Translator: Schalk W. Cronjé <schalkc@ntaba.co.za>\n"
"Language-Team: Afrikaans <mandrake@af.org.za>\n"
@@ -60,7 +60,7 @@ msgstr "Installeer tans pakket %s (%s/%s)...."
msgid "Downloading package `%s'..."
msgstr "Laai tans pakket '%s' (%s/%s) af ..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Kanselleer"
@@ -72,22 +72,22 @@ msgstr "Kanselleer"
msgid "...retrieving failed: %s"
msgstr "FAT-grootteverandering het gefaal: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Stelsel-installasie"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Ok"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -100,7 +100,7 @@ msgid ""
"What would you like to do?"
msgstr ""
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -110,7 +110,7 @@ msgid ""
"Proceed?"
msgstr ""
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -120,26 +120,31 @@ msgid ""
"You may prefer to just save it. What is your choice?"
msgstr ""
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Installeer"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Stoor"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "Kanselleer"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, fuzzy, c-format
msgid "Choose location to save file"
msgstr "Kies 'n lêer"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "OK"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -215,24 +220,24 @@ msgstr ""
msgid "No packages specified"
msgstr "Geen opdrag gespesifiseer nie"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, fuzzy, c-format
msgid "Must be root"
msgstr "Muispoort"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Installasievoorbereiding..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr "Sommige pakkette kan nie geïnstalleer word nie"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -240,42 +245,37 @@ msgid ""
"Continue installation anyway?"
msgstr "Sommige pakkette kan nie geïnstalleer word nie"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Waarskuwing"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "OK"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Opgradeer"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, fuzzy, c-format
msgid " (to install)"
msgstr "Verlaat installasie"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Slegs een van die volgende pakkette word benodig:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "Staak"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -286,29 +286,29 @@ msgstr ""
"%s\n"
"Kan ons voort gaan?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
@@ -317,7 +317,7 @@ msgstr ""
"geïnstalleer word:\n"
"\n"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -326,34 +326,34 @@ msgstr ""
"geïnstalleer word:\n"
"\n"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, fuzzy, c-format
msgid "unable to get source packages, aborting"
msgstr "Kan nie die bronpakette bekom nie."
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Plaas asseblief die media bekend as \"%s\" in aandrywer [%s]"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Klaar"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "Installasie het misluk"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, fuzzy, c-format
msgid "You may want to update your urpmi database."
msgstr ""
@@ -361,22 +361,22 @@ msgstr ""
"%s\n"
"Probeer u media se databasis opdateer."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Installasie het misluk"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Alles is alreeds installeer"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Geïnstalleer"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, fuzzy, c-format
msgid "restarting urpmi"
msgstr "Begin slurpd: "
@@ -450,7 +450,7 @@ msgstr "Laai tans pakket '%s' (%s/%s) af ..."
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
@@ -505,62 +505,62 @@ msgstr "Daar was 'n fout met pakkette:"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, fuzzy, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "kan nie kieslyslêer:%s lees nie"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Ontbrekende velde"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -577,7 +577,7 @@ msgstr ""
"\n"
"gebruik:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Kopiereg (C) %s %s"
@@ -624,7 +624,7 @@ msgstr "Kan nie lêer %s oopmaak nie\n"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, fuzzy, c-format
msgid "unable to write config file [%s]"
msgstr "Kan nie lêer %s oopmaak nie\n"
@@ -1309,7 +1309,7 @@ msgstr "Soek"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -1979,7 +1979,7 @@ msgstr ""
#: ../urpmf:75
#, c-format
-msgid " --suggests - suggests tags\n"
+msgid " --recommends - recommends tags\n"
msgstr ""
#: ../urpmf:76
@@ -2007,27 +2007,27 @@ msgstr " -v - woordryke modus.\n"
msgid " -f - print version, release and arch with name.\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "Kopieer die lêer vir media '%s'..."
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "Kopieer die lêer vir media '%s'..."
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "Kopieer die lêer vir media '%s'..."
@@ -2054,7 +2054,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr ""
#: ../urpmi:81
@@ -2143,7 +2143,7 @@ msgstr ""
#: ../urpmi:105
#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr ""
#: ../urpmi:109
@@ -2904,7 +2904,7 @@ msgstr " -v - woordryke modus.\n"
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
+msgid " --recommends - print recommends.\n"
msgstr " -v - woordryke modus.\n"
#: ../urpmq:85
@@ -3060,6 +3060,10 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " -v - woordryke modus.\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d pakket, %d MB)"
diff --git a/po/ar.po b/po/ar.po
index 2a154276..2e92832f 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ar\n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2009-10-26 22:46+0300\n"
"Last-Translator: Ma'moun Diraneyya <mamoun.diraneyya@gmail.com>\n"
"Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -57,7 +57,7 @@ msgstr "Installing package `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Downloading package `%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Cancel"
@@ -69,22 +69,22 @@ msgstr "Cancel"
msgid "...retrieving failed: %s"
msgstr "...retrieving failed: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "RPM installation"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Error: unable to find file %s, will cancel operation"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Ok"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -105,7 +105,7 @@ msgstr ""
"\n"
"What would you like to do?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -120,7 +120,7 @@ msgstr ""
"\n"
"Proceed?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -135,26 +135,31 @@ msgstr ""
"\n"
"You may prefer to just save it. What is your choice?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Install"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Save"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Cancel"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Choose location to save file"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -239,17 +244,17 @@ msgstr ""
msgid "No packages specified"
msgstr "No packages specified"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Must be root"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Preparing packages installation..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -258,7 +263,7 @@ msgstr ""
"Some requested packages cannot be installed:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -269,42 +274,37 @@ msgstr ""
"%s\n"
"Continue installation anyway?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Warning"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (to upgrade)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (to install)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Package choice"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "One of the following packages is needed:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Abort"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -315,22 +315,22 @@ msgstr ""
"%s\n"
"Continue installation anyway?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "%s of additional disk space will be used."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "%s of disk space will be freed."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s of packages will be retrieved."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -341,41 +341,41 @@ msgstr[3] "Proceed with the installation of the %d packages?"
msgstr[4] "Proceed with the installation of the %d packages?"
msgstr[5] "Proceed with the installation of the %d packages?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"To satisfy dependencies, the following package is going to be installed:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
"To satisfy dependencies, the following packages are going to be installed:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "unable to get source packages, aborting"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Please insert the medium named \"%s\""
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Done"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -384,27 +384,27 @@ msgstr ""
"Installation failed, some files are missing:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, fuzzy, c-format
msgid "You may want to update your urpmi database."
msgstr "You may need to update your urpmi database."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Installation failed:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "The package(s) are already installed"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Installation finished"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "restarting urpmi"
@@ -478,7 +478,7 @@ msgstr "Can not download packages into %s"
msgid "Environment directory %s does not exist"
msgstr "Environment directory %s does not exist"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "using specific environment on %s\n"
@@ -533,62 +533,62 @@ msgstr "error registering local packages"
msgid "This operation is forbidden while running in restricted mode"
msgstr "This operation is forbidden while running in restricted mode"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "bad proxy declaration on command line\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: cannot read rpm file \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "unexpected expression %s"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "missing expression before %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "unexpected expression %s (suggestion: use -a or -o ?)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "no expression to close"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr "by default urpmf awaits a regexp. you should use option \"--literal\""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot directory doesn't exist"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "Can't use %s without %s"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "Can't use %s with %s"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "Too many arguments\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -605,7 +605,7 @@ msgstr ""
"\n"
"usage:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "حقوق النسخ %s by %s"
@@ -654,7 +654,7 @@ msgstr "unable to read config file [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "medium `%s' is defined twice, aborting"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "unable to write config file [%s]"
@@ -1344,8 +1344,8 @@ msgstr "Arch"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(suggested)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -2054,9 +2054,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - source rpm name\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - suggests tags\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - requires tags\n"
#: ../urpmf:76
#, c-format
@@ -2083,27 +2083,27 @@ msgstr " -m - the media in which the package was found\n"
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - print version, release and arch with name.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "unterminated expression (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Incorrect format: you may use only one multi-valued tag"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "no hdlist available for medium \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "no synthesis available for medium \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "no xml-info available for medium \"%s\""
@@ -2129,8 +2129,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - remove orphans without asking\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --no-suggests - do not auto select \"suggested\" packages.\n"
#: ../urpmi:81
@@ -2230,8 +2230,8 @@ msgstr ""
" dependencies checking and integrity.\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --allow-suggests - auto select \"suggested\" packages.\n"
#: ../urpmi:109
@@ -3061,9 +3061,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - print requires.\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - print suggests.\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - print requires.\n"
#: ../urpmq:85
#, c-format
@@ -3226,6 +3226,15 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#~ msgid "(suggested)"
+#~ msgstr "(suggested)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - suggests tags\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - print suggests.\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d package, %d MB)"
diff --git a/po/ast.po b/po/ast.po
index 04cda3f9..61ba8e00 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2010-02-01 15:49+0100\n"
"Last-Translator: marquinos <marquinos@mandriva.org>\n"
"Language-Team: Asturian <alministradores@softastur.org>\n"
@@ -56,7 +56,7 @@ msgstr "Instalando paquete `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Baxando paquete `%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Encaboxar"
@@ -68,22 +68,22 @@ msgstr "Encaboxar"
msgid "...retrieving failed: %s"
msgstr "...falló la recuperación: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "Instalación de RPM"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Fallu: nun s'alcontró'l ficheru %s, la operación encaboxaráse"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Val"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -104,7 +104,7 @@ msgstr ""
"\n"
"¿Qué quies facer?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -119,7 +119,7 @@ msgstr ""
"\n"
"¿Siguir?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -134,26 +134,31 @@ msgstr ""
"\n"
"Puede que prefieras namái guardalu. ¿Cuál ye la to escoyeta?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Instalar"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Guardar"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Encaboxar"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Escueyi allugamientu pa guardar ficheru"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Aceutar"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -238,17 +243,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Dengún paquete especificáu"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Tienes de ser root"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Tresnando instalación de paquetes..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -257,7 +262,7 @@ msgstr ""
"Nun pueden instalase dellos paquetes pedíos:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -268,42 +273,37 @@ msgstr ""
"%s\n"
"¿Siguir de toes maneres?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Avisu"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Aceutar"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (p'anovar)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (pa instalar)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Escoyeta de paquetes"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Un de los paquetes siguientes ye necesariu:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Albortar"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -314,61 +314,61 @@ msgstr ""
"%s\n"
"¿Siguir de toes maneres?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Usaránse %s d'espaciu de discu adicional."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "Lliberaráse %s d'espaciu de discu."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "Baxaránse %s de paquetes."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "¿Efectuar la instalación del paquete?"
msgstr[1] "¿Efectuar la instalación de los %d paquetes?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Pa satisfacer les dependencies, instalaráse'l paquete siguiente"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Pa satisfacer les dependencies, instalaránse los paquetes siguientes:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "nun pudieron obtenese los paquetes orixe, albortando"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Por favor, inxerta'l preséu nomáu «%s»"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Fecho"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -377,27 +377,27 @@ msgstr ""
"Falló la instalación, falten dellos ficheros:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Puedes querer anovar la base de datos d'urpmi."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Falló la instalación:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "El(los) paquete(s) ya tan instalaos"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Finó la instalación"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "reaniciando urpmi"
@@ -471,7 +471,7 @@ msgstr "Nun pueden baxase los paquetes en %s"
msgid "Environment directory %s does not exist"
msgstr "El direutoriu d'entornu %s nun esiste"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "usando un entornu específicu en %s\n"
@@ -526,64 +526,64 @@ msgstr "fallu rexistrando paquetes llocales"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Esta operación ta torgada en mou restrinxíu"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "declaración incorreuta del proxy na llinia de comandos\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: nun puede lleese'l ficheru rpm «%s»\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "espresión %s non esperada"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "falta esxpresion enantes de %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "espresión non esperada %s (suxerencia: usar -a o -o)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "nun hai espresión a zarrar"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"de manera predeterminada urpmf espera una regexp. Deberíes usar la opción «--"
"literal»"
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "el direutoriu chroot nun esiste"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "Nun puede usase %s ensin %s"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "Nun puede usase %s con %s"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "Abondos argumentos\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -600,7 +600,7 @@ msgstr ""
"\n"
"usu:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Copyright (C) %s by %s"
@@ -649,7 +649,7 @@ msgstr "nun pudo lleese'l ficheru de configuración [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "el mediu «%s» ta definíu dos vegaes, albortando"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "nun puede escribise'l ficheru de configuración [%s]"
@@ -1345,8 +1345,8 @@ msgstr "Arq."
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(suxeríu)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -2028,9 +2028,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - nome del rpm fonte\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - etiquetes suxeríes\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - etiquetes requerimientos\n"
#: ../urpmf:76
#, c-format
@@ -2058,27 +2058,27 @@ msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - imprenta versión, release y arquitectura con nome.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "espresión non finada (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Formatu incorreutu: tienes d'usar namái una etiqueta multi-valor"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "nun hai hdlist pal mediu \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "nun hai synthesis pal mediu \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "nun hai xml-info pal mediu «%s»"
@@ -2104,8 +2104,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - desaniciar los güérfanos ensin entrugar\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr ""
" --no-suggests - non escoyer automáticamente paquetes \"suxeríos\".\n"
@@ -2207,8 +2207,8 @@ msgstr ""
" verificar les dependencies nin integridá.\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr ""
" --allow-suggests - escoyer automáticamente los paquetes \"suxeríos\".\n"
@@ -3050,9 +3050,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - imprenta lo que necesita.\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - amuesa les suxerencies.\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - imprenta lo que necesita.\n"
#: ../urpmq:85
#, c-format
@@ -3225,6 +3225,15 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#~ msgid "(suggested)"
+#~ msgstr "(suxeríu)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - etiquetes suxeríes\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - amuesa les suxerencies.\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d paquete, %d MB)"
diff --git a/po/az.po b/po/az.po
index 01b341b9..a5a241ac 100644
--- a/po/az.po
+++ b/po/az.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-az\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2004-09-12 20:33+0300\n"
"Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
"Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -63,7 +63,7 @@ msgstr "`%s' paketi qurulur (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "`%s' paketi endirilir..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Ləğv et"
@@ -75,22 +75,22 @@ msgstr "Ləğv et"
msgid "...retrieving failed: %s"
msgstr "...alış bacarılmadı: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Sistem qurulumu"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Oldu"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, fuzzy, c-format
msgid ""
"You have selected a source package:\n"
@@ -111,7 +111,7 @@ msgstr ""
"\n"
"İndi nə etmək istəyirsiniz?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, fuzzy, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -127,7 +127,7 @@ msgstr ""
"Bunun yerinə sadəcə olaraq qeyd etməyi də seçə bilərsiniz.\n"
"Seçiminiz nədir?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -143,26 +143,31 @@ msgstr ""
"Bunun yerinə sadəcə olaraq qeyd etməyi də seçə bilərsiniz.\n"
"Seçiminiz nədir?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Qur"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Qeyd Et"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Ləğv Et"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Qeyd ediləcək ünvanı seçin"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Oldu"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -245,17 +250,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Əmr tə'yin edilməyib"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, fuzzy, c-format
msgid "Must be root"
msgstr "Siçan Qapısı"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Paketlər qurulum üçün hazırlanır..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -264,7 +269,7 @@ msgstr ""
"Bəzi istənən paketlər qurula bilmir:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -274,42 +279,37 @@ msgstr ""
"Bəzi istənən paketlər qurula bilmir:\n"
"%s"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Xəbərdarlıq"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Oldu"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Yeniləmə"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, fuzzy, c-format
msgid " (to install)"
msgstr "Qurulumun sonu"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Aşağıdakı paketlərin bir dənəsinə ehtiyac var:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Ləğv Et"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -319,69 +319,69 @@ msgstr ""
"Paketlərin yenilənməsi üçün aşağıdakı paketlərin çıxardılması lazımdır:\n"
"%s"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"Asılıqları ortadan qaldırmaq üçün, aşağıdakılar da qurulmalıdır (%d Mb)"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
"Asılıqları ortadan qaldırmaq üçün, aşağıdakılar da qurulmalıdır (%d Mb)"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "qaynaq paketi alına bilmir, çıxılır"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Lütfən \"%s\" medyasını [%s] avadanlığına yerləşdirin"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, fuzzy, c-format
msgid "_Done"
msgstr "Qurtardı"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "Qurulum iflas etdi"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, fuzzy, c-format
msgid "You may want to update your urpmi database."
msgstr ""
@@ -389,22 +389,22 @@ msgstr ""
"%s\n"
"Sizə, urpmi databeyzinizi yeniləməyi məsləhət görürük."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Qurulum iflas etdi"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "hər şey onsuzda quruludur"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Qurulum bitdi"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "urpmi yenidən başladılır"
@@ -476,7 +476,7 @@ msgstr "`%s' paketi endirilir..."
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "%s üstündə xüsusi mühit istifadə edilir\n"
@@ -531,62 +531,62 @@ msgstr "yerli paket qeydiyyat xətası"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "əmr sətirində hökmsüz vəkil tə'yini\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: \"%s\" rpm faylı oxuna bilmir\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Əksik imza (%s)"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -603,7 +603,7 @@ msgstr ""
"\n"
"istifadə qaydası:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Müəllif Hüququ (C) %s %s"
@@ -650,7 +650,7 @@ msgstr "[%s] quraşdırma faylı yazıla bilmir"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "[%s] quraşdırma faylı yazıla bilmir"
@@ -1338,7 +1338,7 @@ msgstr "Axtar"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -1987,8 +1987,8 @@ msgstr " --sourcerpm - taq sourcerpm'ini göstər: source rpm.\n"
#: ../urpmf:75
#, fuzzy, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --obsoletes - taq mütləqlərini göstər: bütün mütləqlər.\n"
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - taq lazımlılarını göstər: bütün lazımlılar.\n"
#: ../urpmf:76
#, fuzzy, c-format
@@ -2016,27 +2016,27 @@ msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - adla birlikdə buraxılış, yayını və arch'ı da çap et.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "\"%s\" medyası hdlist faylı tapılmadı"
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "\"%s\" medyası hdlist sintezi inşa edilid"
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "\"%s\" medyası üçün siyahı faylı yazılır"
@@ -2063,7 +2063,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --obsoletes - taq mütləqlərini göstər: bütün mütləqlər.\n"
#: ../urpmi:81
@@ -2162,7 +2162,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --obsoletes - taq mütləqlərini göstər: bütün mütləqlər.\n"
#: ../urpmi:109
@@ -2956,8 +2956,8 @@ msgstr " --requires - taq lazımlılarını göstər: bütün lazımlılar
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --obsoletes - taq mütləqlərini göstər: bütün mütləqlər.\n"
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - taq lazımlılarını göstər: bütün lazımlılar.\n"
#: ../urpmq:85
#, fuzzy, c-format
@@ -3115,6 +3115,14 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#, fuzzy
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --obsoletes - taq mütləqlərini göstər: bütün mütləqlər.\n"
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --obsoletes - taq mütləqlərini göstər: bütün mütləqlər.\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d paket, %d MB)"
diff --git a/po/bg.po b/po/bg.po
index 817a5aa3..a3a022a6 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-bg\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2003-08-18 15:59+0300\n"
"Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
"Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -62,7 +62,7 @@ msgstr "Инсталиране на пакет `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Сваляне на пакет `%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Отказ"
@@ -74,22 +74,22 @@ msgstr "Отказ"
msgid "...retrieving failed: %s"
msgstr "...грешка при получаване: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "RPM Инсталация"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Добре"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -110,7 +110,7 @@ msgstr ""
"\n"
"Какво бихте желали да направите?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -125,7 +125,7 @@ msgstr ""
"\n"
"Продължение?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -140,26 +140,31 @@ msgstr ""
"\n"
"Вие може би предпочитате само да го запишете. Какъв е вашият избор?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Инсталиране"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Запазване"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr " Отказ"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Изберете място за запис на файл"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Добре"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -239,17 +244,17 @@ msgstr " --update - създаване на ъпдейт посредни
msgid "No packages specified"
msgstr "Не е въведена команда"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Трябва да бъдете root/админ"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Подготвяне на пакетите за инсталация..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -259,7 +264,7 @@ msgstr ""
"%s\n"
"Продължение?"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -270,42 +275,37 @@ msgstr ""
"%s\n"
"Продължение?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Предупреждение"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Добре"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr "(за обновяване)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr "(към инсталация)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Необходим е един от следните пакети:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Прекъсване"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -317,36 +317,36 @@ msgstr ""
"%s\n"
"Продължение"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "%s допълнително досково пространство ще бъде използвано."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "%s дисково пространство ще бъде освободено. "
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s пакета ще да бъдат изтеглени."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"За да се запазят зависимостите,тези пакети ще бъдат деинсталирани (%d МБ)"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -355,54 +355,54 @@ msgstr ""
"бъдат инсталирани:\n"
"%s\n"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "не мога да получа сорс пакетите, прекратявам"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Моля, поставете източник с име \"%s\" в устройство [%s]"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Готово"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "Инсталацията провалена"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Искате ли да обновите вашата urpmi база данни."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Инсталацията провалена"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Пакета(тите) вече са инсталирани"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Инсталацията приключи"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, fuzzy, c-format
msgid "restarting urpmi"
msgstr "Стартира slurpd: "
@@ -477,7 +477,7 @@ msgstr "Сваляне на пакет `%s'..."
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
@@ -532,62 +532,62 @@ msgstr "грешка при регистрация на локалните па
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "грешна прокси декларация на командния ред\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: не може да се прочете rpm файл \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Липсващ подпис (%s)"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -604,7 +604,7 @@ msgstr ""
"\n"
"начин на ползване:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr ""
@@ -651,7 +651,7 @@ msgstr "невъзможно да се запише конфигурационе
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "невъзможно да се запише конфигурационен файл [%s]"
@@ -1349,7 +1349,7 @@ msgstr "Архит."
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -2025,10 +2025,8 @@ msgstr " --summary - отпечатва резюме за тага: summa
#: ../urpmf:75
#, fuzzy, c-format
-msgid " --suggests - suggests tags\n"
-msgstr ""
-" --conflicts - отпечатва конфликтите на тага: всички конфликти "
-"(множество редове)."
+msgid " --recommends - recommends tags\n"
+msgstr " --url - отпечатва url тага: url.\n"
#: ../urpmf:76
#, fuzzy, c-format
@@ -2055,27 +2053,27 @@ msgstr " -l - извежда файловете в пакет.\n"
msgid " -f - print version, release and arch with name.\n"
msgstr " -r - отпечатай версия и също така реализация с име.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "не е намерен hdlist файл за източник \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "създаден е hdlist синтезис файл за източник \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "записване на лист файл за източник \"%s\""
@@ -2103,7 +2101,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr ""
" --conflicts - отпечатва конфликтите на тага: всички конфликти "
"(множество редове)."
@@ -2194,7 +2192,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr ""
" --conflicts - отпечатва конфликтите на тага: всички конфликти "
"(множество редове)."
@@ -2981,10 +2979,8 @@ msgstr " --url - отпечатва url тага: url.\n"
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
-msgstr ""
-" --conflicts - отпечатва конфликтите на тага: всички конфликти "
-"(множество редове)."
+msgid " --recommends - print recommends.\n"
+msgstr " --url - отпечатва url тага: url.\n"
#: ../urpmq:85
#, fuzzy, c-format
@@ -3139,6 +3135,18 @@ msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
#, fuzzy
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr ""
+#~ " --conflicts - отпечатва конфликтите на тага: всички конфликти "
+#~ "(множество редове)."
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr ""
+#~ " --conflicts - отпечатва конфликтите на тага: всички конфликти "
+#~ "(множество редове)."
+
+#, fuzzy
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "%d пакета"
diff --git a/po/bn.po b/po/bn.po
index 6404b33d..4612aedb 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -25,7 +25,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2005-02-13 13:39+0600\n"
"Last-Translator: Jamil Ahmed <jamil@bengalinux.org>\n"
"Language-Team: Bangla <mdk-translation@bengalinux.org>\n"
@@ -75,7 +75,7 @@ msgstr "`%s' প্যাকেজ ইনস্টল করা হচ্ছে
msgid "Downloading package `%s'..."
msgstr "`%s' প্যাকেজ ডাউনলোড করা হচ্ছে..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "বাতিল"
@@ -87,22 +87,22 @@ msgstr "বাতিল"
msgid "...retrieving failed: %s"
msgstr "...আনতে ব্যর্থ হয়েছি: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "আরপিএম ইনস্টলেশন"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "ঠিক আছে (_ঠ)"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -123,7 +123,7 @@ msgstr ""
"\n"
"আপনি কি করতে চান?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -138,7 +138,7 @@ msgstr ""
"\n"
"এগিয়ে যাবো?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -153,26 +153,31 @@ msgstr ""
"\n"
"আপনি হয়তো এটা সেভ করে রাখতে চাইবেন। আপনার পছন্দ কি?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_ইনস্টল"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_সংরক্ষণ"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "বাতিল (_ত)"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "ফাইল সংরক্ষণ করার অবস্থান বেছে নিন"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "ঠিক আছে"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -253,17 +258,17 @@ msgstr ""
msgid "No packages specified"
msgstr "কোন নির্দেশ পাওয়া যায় নি"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "অবশ্যই root হতে হবে"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "প্যাকেজ ইনস্টলেশন প্রক্রিয়ার জন্য প্রস্তুতি নেওয়া হচ্ছে..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -272,7 +277,7 @@ msgstr ""
"আবেদনকৃত কিছু প্যাকেজ ইনস্টল করা যায়নি:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -283,42 +288,37 @@ msgstr ""
"%s\n"
"এগিয়ে যাবো?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "নোটিশ"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "ঠিক আছে"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (আপগ্রেডের জন্য)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (ইনস্টলের জন্য)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "নিম্নলিখিত প্যাকেজসমুহের মধ্যে একটির প্রয়োজন আছে:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_বাতিল"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -329,36 +329,36 @@ msgstr ""
"%s\n"
"এগিয়ে যাবো?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"নিম্নলিখিত প্যাকেজগুলি ইনস্টল হতে যাচ্ছে, ডিপেন্ডেন্সিদের সন্তুষ্ট করতে (%d এমবি)"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -366,34 +366,34 @@ msgstr ""
"ডিপেন্ডেন্সি সন্তুষ্ট করতে নিম্নলিখিত %d প্যাকেজগুলো ইনস্টল হতে যাচ্ছে:\n"
"%s\n"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "সোর্স প্যাকেজ গুলি পাওয়া যায়নি, থামানো হচ্ছে"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "অনুগ্রহ করে \"%s\" নামের মাধ্যম [%s] নামের ডিভাইসে প্রবেশ করান"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_সম্পন্ন"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "ইনস্টলেশন ব্যর্থ"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, fuzzy, c-format
msgid "You may want to update your urpmi database."
msgstr ""
@@ -401,22 +401,22 @@ msgstr ""
"%s\n"
"আপনি হয়তো আপনার urpmi ডাটাবেস আপডেট করতে চাইবেন"
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "ইনস্টলেশন ব্যর্থ"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "ইনস্টলেশন প্রক্রিয়া সম্পূর্ণ হয়েছে"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "urpmi আবার শুরু করা হচ্ছে"
@@ -490,7 +490,7 @@ msgstr "`%s' প্যাকেজ ডাউনলোড করা হচ্ছ
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "%s-এর ওপর সুনির্দিষ্ট পরিবেশ ব্যবহার করো\n"
@@ -545,62 +545,62 @@ msgstr "স্থানীয় প্যাকেজসমূহ রেজিস
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "কমান্ড লাইনের ওপর বাজে প্রক্সি ঘোষণা\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: \"%s\" rpm ফাইল পড়া যাচ্ছেনা\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "(%s) স্বাক্ষর পাওয়া যাচ্ছে না"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -616,7 +616,7 @@ msgstr ""
"\n"
"ব্যবহার:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, fuzzy, c-format
msgid "Copyright (C) %s by %s"
msgstr "কপিরাইট (C) ১৯৯৯-২০০৬ ম্যান্ড্রিব।"
@@ -663,7 +663,7 @@ msgstr "কনফিগ ফাইল [%s]-এ লেখা সম্ভব হ
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "কনফিগ ফাইল [%s]-এ লেখা সম্ভব হয়নি"
@@ -1353,7 +1353,7 @@ msgstr "অনুসন্ধান"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -2008,8 +2008,8 @@ msgstr " --sourcerpm - source rpm: sourcerpm ট্যাগ ছাপাও
#: ../urpmf:75
#, fuzzy, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --obsoletes - all obsoletes: obsoletes ট্যাগ ছাপাও।\n"
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - all requires: requires ট্যাগ ছাপাও।\n"
#: ../urpmf:76
#, fuzzy, c-format
@@ -2036,27 +2036,27 @@ msgstr " -l - প্যাকেজে ফাইলের তাল
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - ভার্সন, প্রকাশ এবং আর্ক এর সঙ্গে নাম ছাপাও।\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "\"%s\" মাধ্যমের জন্য কোন hdlist ফাইল পাওয়া যায়নি"
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "\"%s\" মাধ্যমের জন্য hdlist synthesis ফাইল তৈরি করা হচ্ছে"
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "\"%s\"-এর তালিকা ফাইল লিখছি..."
@@ -2084,7 +2084,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --obsoletes - all obsoletes: obsoletes ট্যাগ ছাপাও।\n"
#: ../urpmi:81
@@ -2186,7 +2186,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --obsoletes - all obsoletes: obsoletes ট্যাগ ছাপাও।\n"
#: ../urpmi:109
@@ -2990,8 +2990,8 @@ msgstr " --requires - all requires: requires ট্যাগ ছাপা
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --obsoletes - all obsoletes: obsoletes ট্যাগ ছাপাও।\n"
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - all requires: requires ট্যাগ ছাপাও।\n"
#: ../urpmq:85
#, fuzzy, c-format
@@ -3155,6 +3155,14 @@ msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
#, fuzzy
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --obsoletes - all obsoletes: obsoletes ট্যাগ ছাপাও।\n"
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --obsoletes - all obsoletes: obsoletes ট্যাগ ছাপাও।\n"
+
+#, fuzzy
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "%d প্যাকেজ সমূহ"
diff --git a/po/br.po b/po/br.po
index f3ac8375..87bcc2d4 100644
--- a/po/br.po
+++ b/po/br.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2013-05-08 16:30+0200\n"
"Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
"Language-Team: Breton <LL@li.org>\n"
@@ -56,7 +56,7 @@ msgstr "O staliañ ar pakad `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "O tigas ar pakad « %s » ..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Nullañ"
@@ -68,22 +68,22 @@ msgstr "Nullañ"
msgid "...retrieving failed: %s"
msgstr "... sac'het eo ar resev : %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "Staliadur ar RPM"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Fazi : n'hell ket bet kavet ar restr %s, nullet e vo"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Ya"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -96,7 +96,7 @@ msgid ""
"What would you like to do?"
msgstr ""
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -111,7 +111,7 @@ msgstr ""
"\n"
"Gra ?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -126,26 +126,31 @@ msgstr ""
"\n"
"Marteze e plij deoc'h enrollañ anezhañ kentoc'h. Petra a blij deoc'h ?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Staliañ"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Enrollañ"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Nullañ"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Dibabit lec'hiadur da enrollañ ar restr"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Ya"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -221,17 +226,17 @@ msgstr ""
msgid "No packages specified"
msgstr "N'eus pakad dibabet ebet"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Ret eo bezañ root"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "O prientiñ ar staliadur ..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -240,7 +245,7 @@ msgstr ""
"N'em eus ket gallet staliañ un darn pakad goulennet :\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -251,42 +256,37 @@ msgstr ""
"%s\n"
"Kenderc'hel ar staliadur evelato ?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Diwallit"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Ya"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (da vremanaat)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (da staliañ)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Choaz ar pakad"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Unan eus ar pakadoù a-heul a zo war-nes bezañ staliet :"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Dilaoskel"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -298,61 +298,61 @@ msgstr ""
"%s\n"
"Kenderc'hel evelato ?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "%s egor pladenn ouzhpenn a vo bet implijet."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "%s egor pladenn a vo bet dieubet."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s a bakad a vo bet degaset."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "War-nes bezañ staliañ eo %d pakad. Mont war-raok ?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Ar pakad a-heul a zo war-nes bezañ staliet evit dalc'hen an ezhommoù :"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
"Ar pakadoù a-heul a zo war-nes bezañ staliet evit dalc'hen an ezhommoù :"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "n'hellan ket digas ar pakadoù tarzh, emaon o terriñ"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Enlakait ar mediom a vez graet « %s » anezhañ"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Graet"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -361,27 +361,27 @@ msgstr ""
"Sac'het eo ar staliadur, restroù zo a vank :\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Marteze ho pefe c'hoant da vremanaat ho stlennvon urpmi."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Sac'het eo ar staliadur :"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Staliet eo ar pakad(où) c'hoazh"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Echu eo ar staliadur"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "oc'h adloc'hañ urpmi"
@@ -453,7 +453,7 @@ msgstr "N'eus ket tu da bellgargañ ar pakadoù e %s"
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
@@ -508,62 +508,62 @@ msgstr "fazi en ur enskrivañ ar pakadoù lec'hel"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq : n'hellan ket lenn ar restr rpm « %s »\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Mankout a ra ar sinadur (%s)"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "n'eo ket endeo renkell ar chroot"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "N'hell ket bet implijet %s hep %s"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "N'hell ket bet implijet %s gant %s"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -579,7 +579,7 @@ msgstr ""
"\n"
"arveriadur :\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Copyright (C) %s gant %s"
@@ -626,7 +626,7 @@ msgstr "n'hell ket bet lenn restr ar c'hefluniadur [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "n'hellan ket skrivañ restr ar c'hefluniadur [%s]"
@@ -1313,8 +1313,8 @@ msgstr ""
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(damantet)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -1959,8 +1959,8 @@ msgstr " --sourcerpm - anv ar rpm tizh\n"
#: ../urpmf:75
#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - liketennoù damantet\n"
+msgid " --recommends - recommends tags\n"
+msgstr ""
#: ../urpmf:76
#, c-format
@@ -1987,27 +1987,27 @@ msgstr ""
msgid " -f - print version, release and arch with name.\n"
msgstr ""
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "n'eus restr hdlist ebet evit ar mediom « %s »"
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "n'eus restr synthesis ebet evit ar mediom « %s »"
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "n'eus titour XML ebet evit ar mediom « %s »"
@@ -2034,7 +2034,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --suggests - liketennoù damantet\n"
#: ../urpmi:81
@@ -2123,7 +2123,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --suggests - liketennoù damantet\n"
#: ../urpmi:109
@@ -2876,8 +2876,8 @@ msgstr " --buildtime - amzer ar sevel\n"
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - liketennoù damantet\n"
+msgid " --recommends - print recommends.\n"
+msgstr " --buildtime - amzer ar sevel\n"
#: ../urpmq:85
#, fuzzy, c-format
@@ -3031,6 +3031,16 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#~ msgid "(suggested)"
+#~ msgstr "(damantet)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - liketennoù damantet\n"
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - liketennoù damantet\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d pakad, %d Mo)"
diff --git a/po/bs.po b/po/bs.po
index 3f65c9c0..88356055 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: bs\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2006-09-13 21:02+0200\n"
"Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
"Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -63,7 +63,7 @@ msgstr "Instaliram paket `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Downloadujem paket `%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Odustani"
@@ -75,22 +75,22 @@ msgstr "Odustani"
msgid "...retrieving failed: %s"
msgstr "...dobavljanje nije uspjelo: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "RPM instalacija"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Greška: ne mogu naći datoteku %s, prekidam operaciju"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_U redu"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -111,7 +111,7 @@ msgstr ""
"\n"
"Šta želite uraditi?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -126,7 +126,7 @@ msgstr ""
"\n"
"Da nastavim?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -141,26 +141,31 @@ msgstr ""
"\n"
"Možda želite da ih samo snimite. Šta je vaš izbor?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Instaliraj"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Snimi"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Odustani"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Izaberi lokaciju za snimanje"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "U redu"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -244,17 +249,17 @@ msgstr " --searchmedia - koristi samo navedene medije za pretragu paketa.\n"
msgid "No packages specified"
msgstr "Nije naveden paket"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Morate biti root"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Pripremam instalaciju paketa..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -263,7 +268,7 @@ msgstr ""
"Neki od traženih paketa se ne mogu instalirati:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -274,42 +279,37 @@ msgstr ""
"%s\n"
"Da nastavim?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Upozorenje"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "U redu"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (za ažuriranje)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (za instalaciju)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Izbor paketa"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Jedan od sljedećih paketa je potreban:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Prekini"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -320,22 +320,22 @@ msgstr ""
"%s\n"
"Da nastavim?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, fuzzy, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -343,46 +343,46 @@ msgstr[0] "Da nastavim sa instalacijom %d paketa? (%d MB)"
msgstr[1] "Da nastavim sa instalacijom %d paketa? (%d MB)"
msgstr[2] "Da nastavim sa instalacijom %d paketa? (%d MB)"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Da bih zadovoljio ovisnosti, instaliraću sljedeći paket"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Da bih zadovoljio ovisnosti, instaliraću sljedeće pakete"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ne mogu dobiti izvorne pakete, prekidam"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Molim ubacite medij sa imenom \"%s\" u uređaj [%s]"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Gotovo"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "Instalacija nije uspjela na čvoru %s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, fuzzy, c-format
msgid "You may want to update your urpmi database."
msgstr ""
@@ -390,22 +390,22 @@ msgstr ""
"%s\n"
"Možda ćete trebati osvježiti vašu urpmi bazu podataka"
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Instalacija nije uspjela:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "sve je već instalirano"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Instalacija završena"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "restartujem urpmi"
@@ -479,7 +479,7 @@ msgstr "Ne mogu pisati u direktorij za prepakiranje [%s]\n"
msgid "Environment directory %s does not exist"
msgstr "Direktorij okruženja %s ne postoji"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "koristim navedenu okolinu na %s\n"
@@ -534,62 +534,62 @@ msgstr "greška pri registrovanju lokalnih paketa"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Ova operacija je zabranjena dok ste u ograničenom režimu"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "pogrešna deklaracija proxy-ja na komandnoj liniji\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: ne mogu pročitati rpm datoteku \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, fuzzy, c-format
msgid "unexpected expression %s"
msgstr "Izrazi za uzorke:\n"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Nedostaje potpis (%s)"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, fuzzy, c-format
msgid "no expression to close"
msgstr "Izrazi za uzorke:\n"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, fuzzy, c-format
msgid "chroot directory doesn't exist"
msgstr "Direktorij okruženja %s ne postoji"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "Previše argumenata\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -605,7 +605,7 @@ msgstr ""
"\n"
"upotreba:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Copyright (C) %s %s"
@@ -652,7 +652,7 @@ msgstr "ne mogu da zapišem konf. datoteku [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "ne mogu da zapišem konf. datoteku [%s]"
@@ -1343,7 +1343,7 @@ msgstr ""
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -2010,8 +2010,8 @@ msgstr " --sourcerpm - naziv izvornog rpm-a\n"
#: ../urpmf:75
#, fuzzy, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --obsoletes - tag 'prevaziđeno'\n"
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - tag 'zahtijeva'\n"
#: ../urpmf:76
#, c-format
@@ -2038,27 +2038,27 @@ msgstr " -m - medij na kojem je paket pronađen\n"
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - štampa verziju, izdanje i arhitekturu sa imenom.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, fuzzy, c-format
msgid "unterminated expression (%s)"
msgstr "Izrazi za uzorke:\n"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Neispravan format: možete koristiti samo jedan viševrijednosni tag"
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "izgrađena hdlist synthesis datoteka za medij \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "ispisujem list datoteku za medij \"%s\""
@@ -2086,7 +2086,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --obsoletes - tag 'prevaziđeno'\n"
#: ../urpmi:81
@@ -2186,7 +2186,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --obsoletes - tag 'prevaziđeno'\n"
#: ../urpmi:109
@@ -2998,8 +2998,8 @@ msgstr " --requires - tag 'zahtijeva'\n"
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --obsoletes - tag 'prevaziđeno'\n"
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - tag 'zahtijeva'\n"
#: ../urpmq:85
#, fuzzy, c-format
@@ -3167,6 +3167,14 @@ msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
#, fuzzy
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --obsoletes - tag 'prevaziđeno'\n"
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --obsoletes - tag 'prevaziđeno'\n"
+
+#, fuzzy
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d paketa, %d MB)"
diff --git a/po/ca.po b/po/ca.po
index caf8b448..829f226d 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2014-06-28 12:32+0200\n"
"Last-Translator: Francesc Pinyol Margalef <francesc.pinyol.m@gmail.com>\n"
"Language-Team: Catalan <>\n"
@@ -55,7 +55,7 @@ msgstr "S'està instal·lant el paquet «%s» (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "S'està descarregant el paquet «%s»..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Cancel·la"
@@ -67,22 +67,22 @@ msgstr "Cancel·la"
msgid "...retrieving failed: %s"
msgstr "...ha fallat la recuperació: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "Instal·lació de RPM"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Error: no es troba el fitxer %s, es cancel·larà l'operació"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_D'acord"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -103,7 +103,7 @@ msgstr ""
"\n"
"Què voleu fer?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -119,7 +119,7 @@ msgstr ""
"\n"
"Voleu continuar?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -135,26 +135,31 @@ msgstr ""
"\n"
"Potser preferiu només desar-lo. Que voleu fer?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Instal·la"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Desa"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Cancel·la"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Escolliu la ubicació on desar el fitxer"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "D'acord"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -237,25 +242,24 @@ msgstr " --test - només verifica si es pot instal·lar correctament.\n
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
-" --searchmedia - utilitza només les fonts donades per cercar "
-"paquets.\n"
+" --searchmedia - utilitza només les fonts donades per cercar paquets.\n"
#: ../gurpmi.pm:115
#, c-format
msgid "No packages specified"
msgstr "No s'ha especificat cap paquet"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Cal ser root"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "S'estan preparant els paquets per a la instal·lació... "
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -264,7 +268,7 @@ msgstr ""
"Alguns dels paquets demanats no es poden instal·lar:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -275,42 +279,37 @@ msgstr ""
"%s\n"
"Voleu continuar igualment?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Advertència"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "D'acord"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (a actualitzar)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (a instal·lar)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Elecció de paquets"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Cal un dels paquets següents:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Avorta"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -321,61 +320,61 @@ msgstr ""
"%s\n"
"Voleu continuar igualment?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "s'utilitzarà %s d'espai de disc addicional"
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "s'alliberarà %s d'espai de disc."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "es recuperarà %s dels paquets."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Voleu continuar amb la instal·lació del paquet?"
msgstr[1] "Voleu continuar amb la instal·lació dels %d paquets?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Per complir les dependències, s'instal·larà el següent paquet:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Per complir les dependències, s'instal·laran els paquets següents:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "no es poden recuperar els paquets font. S'està interrompent"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Inseriu el suport anomenat «%s»"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr "S'ha produït un error:"
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Fet"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -384,27 +383,27 @@ msgstr ""
"La instal·lació ha fallat, no s'han trobat alguns fitxers:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Pot ser necessari actualitzar la base de dades urpmi."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "La instal·lació ha fallat:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Ja està tot instal·lat"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Instal·lació finalitzada"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "s'esta reiniciant urpmi"
@@ -478,7 +477,7 @@ msgstr "No ha estat possible descarregar paquets a %s"
msgid "Environment directory %s does not exist"
msgstr "El directori d'entorn %s no existeix"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
@@ -533,62 +532,62 @@ msgstr "error registrant els paquets locals"
msgid "This operation is forbidden while running in restricted mode"
msgstr "L'operació no està permesa mentre s'executa en mode restringit"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "declaració errònia del proxy a la línia d'ordres\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: no s'ha pogut llegir el fitxer rpm «%s»\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "expressió inesperada %s"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "manca una expressió abans de %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "expressió inesperada %s (suggeriment: cal utilitzar -a o bé -o?)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "no hi ha expressió per a tancar"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "el directori chroot no existeix"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "Impossible utilitzar %s sense %s"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "Impossible utilitzar %s amb %s"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "Massa arguments\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -605,7 +604,7 @@ msgstr ""
"\n"
"sintaxi:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Copyright (C) %s per %s"
@@ -655,7 +654,7 @@ msgstr "no s'ha pogut llegir el fitxer de configuració [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "el suport «%s» està definit dues vegades, s'interromp"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "no s'ha pogut escriure el fitxer de configuració [%s]"
@@ -1352,8 +1351,8 @@ msgstr "Arq"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(suggerit)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -2028,9 +2027,10 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - nom de l'rpm de les fonts\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
msgstr ""
+" --requires - mostra l'etiqueta requires: tots allò que necessita.\n"
#: ../urpmf:76
#, c-format
@@ -2058,27 +2058,27 @@ msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - mostra la versió, llançament i arquitectura amb el nom.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "expressió inacabada (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "no hi ha hdlist disponible per al suport «%s»"
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "no hi ha síntesi disponible per al suport «%s»"
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "no hi ha xml-info disponible per al suport «%s»"
@@ -2104,9 +2104,10 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - esborra els fitxers orfes sense preguntar\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr ""
+" --allow-suggests - selecciona automàticament els paquets «suggerits».\n"
#: ../urpmi:81
#, c-format
@@ -2206,8 +2207,8 @@ msgstr ""
" comprovar les dependències i la integritat.\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr ""
" --allow-suggests - selecciona automàticament els paquets «suggerits».\n"
@@ -2991,7 +2992,7 @@ msgstr ""
#: ../urpmq:84
#, c-format
-msgid " --suggests - print suggests.\n"
+msgid " --recommends - print recommends.\n"
msgstr ""
#: ../urpmq:85
@@ -3153,6 +3154,9 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#~ msgid "(suggested)"
+#~ msgstr "(suggerit)"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d paquet, %d MB)"
diff --git a/po/cs.po b/po/cs.po
index 18120802..6ed6eb9c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2012-03-10 14:33+0000\n"
"Last-Translator: Petos Safarik <petos@mandrivalinux.cz>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,7 +55,7 @@ msgstr "Instaluji balíček `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Stahuje se balíček `%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Zrušit"
@@ -67,22 +67,22 @@ msgstr "Zrušit"
msgid "...retrieving failed: %s"
msgstr "...načítání selhalo: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "Instalace RPM"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Chyba: nelze nalézt soubor %s, operace bude zrušena"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Ok"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -104,7 +104,7 @@ msgstr ""
"\n"
"Jak chcete pokračovat?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -119,7 +119,7 @@ msgstr ""
"\n"
"Pokračovat?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -134,26 +134,31 @@ msgstr ""
"\n"
"Možná chcete tento balíček pouze uložit. Jak chcete pokračovat?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Instalovat"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Uložit"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Přerušit"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Vyberte, kam chcete uložit soubor"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "OK"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -238,17 +243,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Nebyly zadány žádné balíčky"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Musíte být root"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Připravuji instalaci balíčků..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -257,7 +262,7 @@ msgstr ""
"Některé požadované balíčky nebylo možné nainstalovat:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -268,42 +273,37 @@ msgstr ""
"%s\n"
"Pokračovat i přesto v instalaci?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Varování"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "OK"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (k aktualizaci)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (k instalaci)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Výběr balíčků"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Je zapotřebí jeden z následujících balíčků:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Přerušit"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -314,22 +314,22 @@ msgstr ""
"%s\n"
"Pokračovat i přesto v instalaci?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Navíc bude použito %s diskového prostoru."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "Bude uvolněno %s diskového prostoru."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "Bude staženo %s balíčků."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -337,39 +337,39 @@ msgstr[0] "Pokračovat v instalaci %d balíčku?"
msgstr[1] "Pokračovat v instalaci %d balíčků?"
msgstr[2] "Pokračovat v instalaci %d balíčků?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Aby byly splněny závislosti, bude nainstalován následující balíček:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Aby byly splněny závislosti, budou nainstalovány následující balíčky:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "nelze získat zdrojový balíček, končím"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Prosím vložte médium nazvané \"%s\""
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Hotovo"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -378,27 +378,27 @@ msgstr ""
"Instalace selhala, chybí některé soubory:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Možná byste měli aktualizovat databázi urpmi."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Instalace selhala:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Balíčky jsou již nainstalovány"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Instalace dokončena"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "restartuje se urpmi"
@@ -472,7 +472,7 @@ msgstr "Nelze stáhnout balíčky do %s"
msgid "Environment directory %s does not exist"
msgstr "Adresář prostředí %s neexistuje"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "používá se specifické prostředí na %s\n"
@@ -527,62 +527,62 @@ msgstr "chyba při registraci lokálních balíčků"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Tato operace je zakázána při běhu v omezeném režimu"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "špatně zadaná proxy na příkazové řádce\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: nemohu přečíst rpm soubor \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "neočekávaný výraz %s"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "chybí výraz před %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "neočekávaný výraz %s (návrh: použijte -a nebo -o ?)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "chybí výraz pro zavření"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr "urpmf očekává implicitně regulární výraz, použijte volbu \"--literal\""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "adresář chroot neexistuje"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "Nelze použít %s bez %s"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "Nelze použít %s zároveň s %s"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "Příliš mnoho parametrů\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -599,7 +599,7 @@ msgstr ""
"\n"
"použití:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Copyright (C) %s %s"
@@ -648,7 +648,7 @@ msgstr "nelze načíst soubor s nastavením [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "zdroj `%s' je definovaný dvakrát, končím"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "nelze zapsat soubor s nastavením [%s]"
@@ -1340,8 +1340,8 @@ msgstr "Arch."
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(navrhováno)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -2039,9 +2039,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - název zdrojového balíčku rpm\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - doporučené (navrhované) balíčky\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - co se požaduje\n"
#: ../urpmf:76
#, c-format
@@ -2069,27 +2069,27 @@ 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"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "neukončený výraz (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Nesprávný formát: můžete použít pouze jeden vícehodnotový tag"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "není k dispozici žádný soubor hdlist pro zdroj \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "není k dispozici žádný soubor se syntézou pro zdroj \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "není k dispozici žádné xml-info pro zdroj \"%s\""
@@ -2116,8 +2116,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - odstraní sirotky bez potvrzení\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --no-suggests - automaticky nevybírat \"navrhované\" balíčky\n"
#: ../urpmi:81
@@ -2221,8 +2221,8 @@ msgstr ""
" kontroly závislostí a integrity\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --allow-suggests - automaticky vybírat \"navrhované\" balíčky\n"
#: ../urpmi:109
@@ -3058,9 +3058,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - vypíše, co se požaduje\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - vypíše navrhované balíčky\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - vypíše, co se požaduje\n"
#: ../urpmq:85
#, c-format
@@ -3230,6 +3230,15 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#~ msgid "(suggested)"
+#~ msgstr "(navrhováno)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - doporučené (navrhované) balíčky\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - vypíše navrhované balíčky\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d balíček, %d MB)"
diff --git a/po/cy.po b/po/cy.po
index e0027e88..60319807 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mandriva Linux\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2009-08-24 20:33-0000\n"
"Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
"Language-Team: Cymraeg\n"
@@ -61,7 +61,7 @@ msgstr "Gosod pecyn `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Llwytho pecynnau i lawr ' %s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Dileu"
@@ -73,22 +73,22 @@ msgstr "Dileu"
msgid "...retrieving failed: %s"
msgstr "... methodd ail-lwytho: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "Gosod RPM"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Gwall: methu canfod ffeil %s, diddymu'r weithred"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Iawn"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -109,7 +109,7 @@ msgstr ""
"\n"
"Beth hoffech chi ei wneud?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -124,7 +124,7 @@ msgstr ""
"\n"
"Parhau?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -139,26 +139,31 @@ msgstr ""
"\n"
"Efallai byddai'n well gennych ei gadw. Beth yw eich dewis?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Gosod"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Cadw"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Dileu"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Dewiswch leoliad i gadw'r ffeil"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Iawn"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -242,17 +247,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Heb enwi pecyn"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Rhaid bod yn root"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Paratoi pecynnau i'w gosod..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -261,7 +266,7 @@ msgstr ""
"Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -272,42 +277,37 @@ msgstr ""
"%s\n"
"Parhau beth bynnag?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Rhybudd"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Iawn"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr "(uwchraddio)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr "(gosod)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Dewis pecyn"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Mae angen un o'r pecynnau canlynol:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Atal"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -318,61 +318,61 @@ msgstr ""
"%s\n"
"Parhau beth bynnag?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Bydd %s o le ychwanegol ar ddisg yn cael ei ddefnyddio."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "Bydd %s o le ar ddisg ar gael."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "bydd %s o becynnau yn cael eu hadfer."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Parhau gyda gosod %d pecyn?"
msgstr[1] "Parhau gyda gosod %d pecyn?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu gosod"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "I fodloni dibyniaethau, bydd y pecyn canlynol yn cael ei osod"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "methu estyn pecynnau ffynhonnell, atal"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Rhowch gyfrwng \"%s\" yn y ddyfais"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Gorffen"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -381,27 +381,27 @@ msgstr ""
"Methodd y gosod, mae rhai ffiliau ar goll:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Efallai eich bod angen diweddaru cronfa ddata urpmi."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Methodd y gosod:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Popeth wedi eu gosod eisoes"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Cwblhawyd y gosod"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "ailgychwyn urpmi"
@@ -475,7 +475,7 @@ msgstr "Methu llwytho pecynnau i lawr i %s"
msgid "Environment directory %s does not exist"
msgstr "Nid yw cyfeiriadur amgylchedd %s yn bodoli"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "ddefnyddio amgylchedd penodol ar %s\n"
@@ -530,64 +530,64 @@ msgstr "gwall cofrestru pecynnau lleol"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Mae'r weithred yn waharddedig wrth redeg ym modd cyfyngedig"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "mynegiadau annisgwyl %s"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "mynegiad coll cyn %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "mynegiad annisgwyl %s (awgrym: defnyddio -a neu-0 ?)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "dim mynegiad i'w gau"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"drwy ragosodiad mae urmpf yn disgwyl regexp, dylech ddefnyddio dewis \"--"
"literal\""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "Nid yw cyfeiriadur chroot yn bodoli"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "Methu defnyddio %s heb %s"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "Methu defnyddio %s gyda %s"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "Gormod o ymresymiadau\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -603,7 +603,7 @@ msgstr ""
"\n"
"defnydd:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Hawlfraint (C) %s %s"
@@ -652,7 +652,7 @@ msgstr "Methu creu ffeil config (%s)"
msgid "medium `%s' is defined twice, aborting"
msgstr "mae cyfrwng '%s' wedi ei ddiffinio ddwy waith, cau"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "methu ysgrifennu i ffeil ffurfweddiad (%s)"
@@ -1344,8 +1344,8 @@ msgstr "Arch"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(awgrym)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -2021,9 +2021,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - enw rpm ffynhonnell\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - cynnig tagiau\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - tagiau angenrhaid\n"
#: ../urpmf:76
#, c-format
@@ -2050,27 +2050,27 @@ msgstr " -m - y cyfrwng lle cafwyd y pecyn\n"
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "Mynegiadauheb ei derfynnu (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Fformat anghywir: gallwch ddefnyddio un tag aml-werth yn unig"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "dim ffeil hdlist ar gyfer cyfrwng \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "adeiladu ffeil synthesis file ar gyfer cyfrwng \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "dim xml-info ar gyfer cyfrwng \"%s\""
@@ -2096,8 +2096,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - tynnu'r amddifad heb ofyn\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --no-suggests - peidio awto ddewis pecynnau \"suggested\" .\n"
#: ../urpmi:81
@@ -2197,8 +2197,8 @@ msgstr ""
" wirio dibyniaethau na'u cyfanrwydd.\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --allow-suggests - awto ddewis pecynnau \"awgrymwyd\".\n"
#: ../urpmi:109
@@ -3034,9 +3034,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - angenrhaid argraffu.\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - argraffu'r awgrym.\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - angenrhaid argraffu.\n"
#: ../urpmq:85
#, c-format
@@ -3213,6 +3213,15 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#~ msgid "(suggested)"
+#~ msgstr "(awgrym)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - cynnig tagiau\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - argraffu'r awgrym.\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d pecyn, %d MB)"
diff --git a/po/da.po b/po/da.po
index fff6f24f..b77d99d0 100644
--- a/po/da.po
+++ b/po/da.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: da\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2009-10-22 12:59+0200\n"
"Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -68,7 +68,7 @@ msgstr "Installerer pakke `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Henter pakke %s..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Annullér"
@@ -80,22 +80,22 @@ msgstr "Annullér"
msgid "...retrieving failed: %s"
msgstr "...hentning mislykkedes: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "RPM-installering"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Fejl: kunne ikke finde fil %s, vil afbryde handling"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_O.k."
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -117,7 +117,7 @@ msgstr ""
"\n"
"Hvad ønsker du at gøre?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -132,7 +132,7 @@ msgstr ""
"\n"
"Fortsæt?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -147,26 +147,31 @@ msgstr ""
"\n"
"Du vil måske foretrække blot at gemme den. Hvad er dit valg?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Installér"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Gem"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Annullér"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Vælg sted at gemme filen"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "O.k."
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -251,17 +256,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Ingen pakker angivet"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Skal være root"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Forbereder installation af pakker"
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -270,7 +275,7 @@ msgstr ""
"Nogen forespurgte pakker kan ikke installeres:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -281,42 +286,37 @@ msgstr ""
"%s\n"
"Skal installationen fortsættes alligevel?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Advarsel"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "O.k."
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (skal opgraderes)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (skal installeres)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Pakkevalg"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Der er brug for en af de følgende pakker:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Afbryd"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -327,63 +327,63 @@ msgstr ""
"%s\n"
"Skal installationen fortsættes alligevel?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "%s mere diskplads vil blive brugt."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "%s diskplads vil blive frigjort."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s pakker vil blive hentet."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Fortsæt installationen med %d pakke?"
msgstr[1] "Fortsæt installationen med de %d pakker?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"For at tilfredsstille afhængigheder vil den følgende pakke blive installeret "
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
"For at tilfredsstille afhængigheder vil de følgende pakker blive installeret"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "kan ikke hente kilde-pakker, afslutter med fejl"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Vær venlig at indsætte mediet med navnet %s"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Færdig"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -392,27 +392,27 @@ msgstr ""
"Installation mislykkedes, der mangler nogen filer:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Måske skulle du opdatere din urpmi-database."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Installationen fejlede:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "alting er allerede installeret"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Installationen færdig"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "genstarter urpmi"
@@ -486,7 +486,7 @@ msgstr "Kan ikke hente pakker til %s"
msgid "Environment directory %s does not exist"
msgstr "Miljøkatalog %s eksisterer ikke"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "bruger særligt miljø på %s\n"
@@ -541,62 +541,62 @@ msgstr "fejl ved registrering af lokale pakker"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Denne handling er forbudt ved kørsel i begrænset tilstand"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "Forkert proxy-erklæring på kommandolinje\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: kan ikke læse rpm-fil \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "Uventet udtryk %s"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "manglende udtryk før %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "uventet udtryk %s (forslag: brug -a eller -o ?)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "intet udtryk at lukke"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr "normalt venter urpmf en regexp. du bør bruge parameteren \"--literal\""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot-katalog eksisterer ikke"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "Kan ikke bruge %s uden %s."
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "Kan ikke bruge '%s' med '%s'."
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "For mange argumenter\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -612,7 +612,7 @@ msgstr ""
"\n"
"brug:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Ophavsret © %s ved %s"
@@ -661,7 +661,7 @@ msgstr "kunne ikke læse config-fil [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "Mediet '%s' er defineret to gange. Afbryder"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "kunne ikke skrive config-fil [%s]"
@@ -1353,8 +1353,8 @@ msgstr "Arkitektur"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(forslag)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -2032,9 +2032,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - navn på kilde-rpm\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - Forslagsetiketter.\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - afhængighedsetiketter\n"
#: ../urpmf:76
#, c-format
@@ -2061,27 +2061,27 @@ msgstr " -m - mediet i hvilken pakken blev fundet\n"
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - udskriv version, udgave og arkitektur med navn.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "uafsluttet udtryk (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Ugyldigt format: du kan kun bruge flerværdi-etiketter"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "ingen hdlist-fil tilgængelig for medie \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "ingen syntese-fil tilgængelig for medie \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "ingen xml-info-fil tilgængelig for medie \"%s\""
@@ -2107,8 +2107,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - fjern forældreløse uden at spørge\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --no-suggests - vælg ikke automatisk \"suggested\" pakker.\n"
#: ../urpmi:81
@@ -2210,8 +2210,8 @@ msgstr ""
" uden kontrol af afhængigheder og integritet.\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --allow-suggests - vælg automatisk \"foreslåede\" pakker.\n"
#: ../urpmi:109
@@ -3045,9 +3045,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - udskriv afhængigheder\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - udskriv forslag.\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - udskriv afhængigheder\n"
#: ../urpmq:85
#, c-format
@@ -3209,6 +3209,15 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#~ msgid "(suggested)"
+#~ msgstr "(forslag)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - Forslagsetiketter.\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - udskriv forslag.\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d pakke, %d MB)"
diff --git a/po/de.po b/po/de.po
index 7019a495..7cac9e8d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2013-01-16 16:51+0100\n"
"Last-Translator: Oliver Burger <obgr_seneca@mageia.org>\n"
"Language-Team: German <mageia-i18n@mageia.org>\n"
@@ -55,7 +55,7 @@ msgstr "Installieren des Pakets `%s' (%s/%s) …"
msgid "Downloading package `%s'..."
msgstr "Holen des Pakets »%s« …"
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Abbruch"
@@ -67,22 +67,22 @@ msgstr "Abbruch"
msgid "...retrieving failed: %s"
msgstr " …Holen fehlgeschlagen: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "RPM-Installation"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Fehler: Datei %s kann nicht gefunden werden, Vorgang wird abgebrochen"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_OK"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -104,7 +104,7 @@ msgstr ""
"\n"
"Was wollen Sie machen?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -119,7 +119,7 @@ msgstr ""
"\n"
"Wollen Sie fortfahren?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -134,26 +134,31 @@ msgstr ""
"\n"
"Vielleicht bevorzugen Sie, es nur zu speichern. Was ist Ihre Wahl?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Installieren"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Speichern"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Abbrechen"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Speicherort auswählen"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "OK"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -243,17 +248,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Keine Pakete angegeben"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Sie müssen root sein"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Paketinstallation wird vorbereitet …"
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -262,7 +267,7 @@ msgstr ""
"Einige der gewünschten Pakete können nicht installiert werden:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -273,42 +278,37 @@ msgstr ""
"%s\n"
"Wollen Sie trotzdem fortfahren?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Warnung"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "OK"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (zu aktualisieren)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (zu installieren)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Paketauswahl"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Eines der folgenden Pakete wird benötigt:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Abbruch"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -320,62 +320,62 @@ msgstr ""
"%s\n"
"Wollen Sie trotzdem fortfahren?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "%s zusätzlicher Speicher werden benötigt"
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "%s Speicher werden frei."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s an Paketen werden geholt"
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Fortfahren mit der Installation von einem Paket?"
msgstr[1] "Fortfahren mit der Installation der %d Pakete?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Um die Abhängigkeiten zu erfüllen, wird folgendes Paket installiert:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
"Um die Abhängigkeiten zu erfüllen, werden die folgenden Pakete installiert:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "Quellpakete können nicht gefunden werden, Abbruch"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Bitte legen Sie das Medium mit dem Namen »%s« ein"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Fertig"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -384,27 +384,27 @@ msgstr ""
"Installation fehlgeschlagen, einige Dateien fehlen:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Sie sollten Ihre urpmi-Datenbank aktualisieren."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Installation fehlgeschlagen:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Alles bereits installiert"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Installation beendet"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "urpmi wird neu gestartet"
@@ -480,7 +480,7 @@ msgstr "Pakete können nicht im Ordner »%s« gespeichert werden"
msgid "Environment directory %s does not exist"
msgstr "Der angegebene Ordner %s existiert nicht"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "Spezielle Umgebung für %s wird benutzt\n"
@@ -535,64 +535,64 @@ msgstr "Fehler bei der Registrierung lokaler Pakete"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Diese Operation ist im eingeschränkten Modus verboten"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "Ungültige Proxyangabe als Befehlszeilenparameter\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: RPM-Datei »%s« kann nicht gelesen werden.\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "unerwarteter Ausdruck %s"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "fehlender Ausdruck vor (%s)"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "unerwarteter Ausdruck %s (Vorschlag: Benutzen Sie -a oder -o)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "Kein Ausdruck zu schließen"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"Als Standard erwartet urpmf einen regulären Ausdruck. Sie sollten die Option "
"»--literal« verwenden"
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot-Ordner existiert nicht"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "Es ist nicht möglich, %s ohne %s zu verwenden"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "Es ist nicht möglich, %s mit %s zu verwenden"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "zu viele Argumente\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -609,7 +609,7 @@ msgstr ""
"\n"
"Aufruf:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Copyright (C) %s durch %s"
@@ -658,7 +658,7 @@ msgstr "Es ist nicht möglich, die Konfigurationsdatei zu lesen [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "Medium `%s' ist bereits vorhanden, Abbruch"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "Die Konfigurationsdatei [%s] kann nicht geschrieben werden"
@@ -1364,8 +1364,8 @@ msgstr "Arch"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(Vorschlag)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -2063,9 +2063,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - Name des Quell-RPMs\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - Schlägt vor\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - Benötigt\n"
#: ../urpmf:76
#, c-format
@@ -2094,29 +2094,29 @@ msgstr ""
" -f - Ausgabe von Version, Release und Architektur mit dem "
"Namen.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "Nicht erkannter Ausdruck (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
"Fehlerhaftes Format: Sie können nur eine Markierung mit mehrfachen Werten "
"anhängen"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "Keine HD-Liste für das Medium »%s« verfügbar"
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "Keine Synthesis-Liste für das Medium »%s« verfügbar"
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "keine xml-Info für das Medium »%s« verfügbar"
@@ -2144,8 +2144,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - Verwaiste Pakete ohne Nachfrage deinstallieren\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --no-suggests - »Vorgeschlagene« Pakete nicht auswählen.\n"
#: ../urpmi:81
@@ -2246,8 +2246,8 @@ msgstr ""
" Abhängigkeits- und Integritätskontrolle ermöglichen.\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr ""
" --allow-suggests - Die »vorgeschlagenen« Pakete automatisch auswählen.\n"
@@ -3125,9 +3125,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - »Benötigt« ausgeben.\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - Vorschläge auflisten.\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - »Benötigt« ausgeben.\n"
#: ../urpmq:85
#, c-format
@@ -3301,6 +3301,15 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#~ msgid "(suggested)"
+#~ msgstr "(Vorschlag)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - Schlägt vor\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - Vorschläge auflisten.\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d Paket, %d MB)"
diff --git a/po/el.po b/po/el.po
index 9d86d282..9651f17a 100644
--- a/po/el.po
+++ b/po/el.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-el\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2014-01-18 17:17+0100\n"
"Last-Translator: Dimitrios Glentadakis <dglent@gmail.com>\n"
"Language-Team: Greek <i18n-el@ml.mageia.org>\n"
@@ -71,7 +71,7 @@ msgstr "Εγκατάσταση του πακέτου `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Λήψη του πακέτου `%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Ακύρωση"
@@ -83,22 +83,22 @@ msgstr "Ακύρωση"
msgid "...retrieving failed: %s"
msgstr "... η ανάκτηση απέτυχε: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "Εγκατάσταση των RPM"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Σφάλμα: αδυναμία εύρεσης του αρχείου %s, η διαδικασία θα ακυρωθεί"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Εντάξει"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -120,7 +120,7 @@ msgstr ""
"\n"
"Τι θέλετε να κάνετε;"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -136,7 +136,7 @@ msgstr ""
" \n"
"Να συνεχίσω;"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -152,26 +152,31 @@ msgstr ""
"\n"
"Μπορεί να προτιμάτε απλά να το αποθηκεύσετε. Ποια είναι η επιλογή σας;"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Εγκατάσταση"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Αποθήκευση"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Ακύρωση"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Επιλέξτε μια τοποθεσία για την αποθήκευση του αρχείου"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Εντάξει"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -266,17 +271,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Δεν ορίστηκαν πακέτα"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Πρέπει να είστε διαχειριστής"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Προετοιμασία των πακέτων για την εγκατάσταση..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -285,7 +290,7 @@ msgstr ""
"Ορισμένα πακέτα που ζητήθηκαν δεν μπορούν να εγκατασταθούν:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -296,42 +301,37 @@ msgstr ""
"%s\n"
"Συνέχιση της εγκατάστασης ;"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Προσοχή"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Εντάξει"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (προς αναβάθμιση)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (προς εγκατάσταση)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Επιλογή πακέτων"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Ένα εκ των παρακάτω πακέτων απαιτείται:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Ματαίωση"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -342,63 +342,63 @@ msgstr ""
"%s\n"
"Συνέχεια εγκατάστασης;"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Θα χρησιμοποιηθεί επιπλέον χώρος %s στο σκληρό δίσκο."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "Θα ελευθερωθεί %s χώρου στο σκληρό δίσκο."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s των πακέτων θα ανακτηθούν."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Συνέχιση με την εγκατάσταση ενός πακέτου;"
msgstr[1] "Συνέχιση με την εγκατάσταση των %d πακέτων;"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"Για να ικανοποιηθούν οι εξαρτήσεις, θα εγκατασταθεί το παρακάτω πακέτο:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
"Για να ικανοποιηθούν οι εξαρτήσεις, θα εγκατασταθούν τα ακόλουθα πακέτα:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "αδυναμία λήψης των πακέτων πηγαίου κώδικα, ματαίωση"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Παρακαλώ εισήγαγε το μέσο με το όνομα «%s»"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Ολοκληρώθηκε"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -407,27 +407,27 @@ msgstr ""
"Η εγκατάσταση απέτυχε, λείπουν μερικά αρχεία : \n"
" %s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Μπορείτε να ενημερώσετε τη βάση δεδομένων urpmi."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Η εγκατάσταση απέτυχε:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Το(α) πακέτο(α) είναι ήδη εγκατεστημένα"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Η εγκατάσταση τελείωσε"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "Επανεκκίνηση urpmi"
@@ -502,7 +502,7 @@ msgstr "Αδυναμία λήψης του πακέτου, στο %s"
msgid "Environment directory %s does not exist"
msgstr "Ο κατάλογος του περιβάλλοντος %s δεν υπάρχει"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "χρήση συγκεκριμένου περιβάλλοντος στο %s\n"
@@ -559,64 +559,64 @@ msgstr ""
"Αυτή η λειτουργία απαγορεύεται να εκτελεστεί, όταν ισχύει κατάσταση "
"περιορισμένης λειτουργίας"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "μη ορθή διακήρυξη proxy στη γραμμή εντολών\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: αδυναμία ανάγνωσης αρχείου rpm \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "απρόσμενη έκφραση %s"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "απουσία έκφρασης πριν το %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "απρόσμενη έκφραση %s (πρόταση: να χρησιμοποιήσεις -a ή -o ; )"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "δεν υπάρχει έκφραση για να τερματιστεί"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"από προεπιλογή η urpmf αναμένει μια regexp. Θα πρέπει να χρησιμοποιήσετε την "
"επιλογή \"--literal\""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "ο κατάλογος chroot δεν υπάρχει"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "Αδύνατη η χρήση του %s χωρίς το %s"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "Αδύνατη η χρήση του %s με το %s"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "Πάρα πολλά ορίσματα\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -633,7 +633,7 @@ msgstr ""
"\n"
"χρήση :\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Πνευματικά δικαιώματα %s από τη %s"
@@ -682,7 +682,7 @@ msgstr "αδυναμία ανάγνωσης του αρχείου ρυθμίσε
msgid "medium `%s' is defined twice, aborting"
msgstr "το μέσο `%s' προσδιορίστηκε δύο φορές, γίνεται εγκατάλειψη"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "αδυναμία εγγραφής του αρχείου ρυθμίσεων [%s]"
@@ -1382,8 +1382,8 @@ msgstr "Αρχιτεκ."
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(προτεινόμενα)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -2080,9 +2080,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - αναζήτηση στο όνομα του πηγαίου πακέτου\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - αναζήτηση στο πεδίο «Suggests»\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - αναζήτηση στο πεδίο Εξαρτήσεων\n"
#: ../urpmf:76
#, c-format
@@ -2111,29 +2111,29 @@ msgstr ""
" -f - εμφανίζει την έκδοση, κυκλοφορία και αρχιτεκτονική στο "
"όνομα του πακέτου.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "μη τερματισμένη έκφραση (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
"Άγνωστος τύπος: μπορείτε να χρησιμοποιήσετε μόνο μια επιλογή πολλαπλών τιμών "
"(multi-valued tag)"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "δεν βρέθηκε αρχείο hdlist για το μέσο \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "δεν υπάρχει διαθέσιμη σύνθεση για το μέσο \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "δεν υπάρχουν διαθέσιμες πληροφορίες xml για το μέσο \"%s\""
@@ -2159,8 +2159,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - απομάκρυνση των ορφανών, χωρίς επιβαιβέωση\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr ""
" --no-suggests - να μην επιλεγούν αυτόματα τα \"προτεινόμενα\" πακέτα.\n"
@@ -2269,8 +2269,8 @@ msgstr ""
" να ελέγχει τις εξαρτήσεις και την ακεραιότητα.\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --allow-suggests - αυτόματη επιλογή των \"προτεινόμενων\" πακέτων.\n"
#: ../urpmi:109
@@ -3163,9 +3163,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - εμφανίζει τις εξαρτήσεις.\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - εκτύπωση των προτεινόμενων (suggests).\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - εμφανίζει τις εξαρτήσεις.\n"
#: ../urpmq:85
#, c-format
@@ -3349,6 +3349,15 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#~ msgid "(suggested)"
+#~ msgstr "(προτεινόμενα)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - αναζήτηση στο πεδίο «Suggests»\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - εκτύπωση των προτεινόμενων (suggests).\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d πακέτο, %d MB)"
diff --git a/po/eo.po b/po/eo.po
index 1a76da73..2eb531a0 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-eo\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2005-01-13 10:05+0100\n"
"Last-Translator: Grégoire COLBERT <gcolbert2004@noos.fr>\n"
"Language-Team: Esperanto <mandrak-eo@yahoogroups.com>\n"
@@ -64,7 +64,7 @@ msgstr "Mi instalas pakaĵon '%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Mi elŝutas pakaĵon '%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Nuligu"
@@ -76,22 +76,22 @@ msgstr "Nuligu"
msgid "...retrieving failed: %s"
msgstr "...ekstraktado malsukcesis: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "RPM instalado"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Jes"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -112,7 +112,7 @@ msgstr ""
"\n"
"Kion vi volas fari?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -127,7 +127,7 @@ msgstr ""
"\n"
"Ĉu mi daŭrigu?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -142,26 +142,31 @@ msgstr ""
"\n"
"Eble vi preferas konservi ĝin kiel dosiero. Kion vi decidas?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Instalu"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Konservu"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Nuligu"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Elektu dosieraron por konservi tiun dosieron"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Jes"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -246,17 +251,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Neniu pakaĵo indikita"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Devas esti sistemestro"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Preparas instaladonn de pakaĵoj..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -265,7 +270,7 @@ msgstr ""
"Iuj postulataj pakaĵoj ne instaleblas:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -276,42 +281,37 @@ msgstr ""
"%s\n"
"Ĉu vi deziras tamen daŭrigi?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Averto"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Jes"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (ĝisdatigi)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (instali)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Unu el la sekvantaj pakaĵoj estas bezonata:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "Ĉ_esigu"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -322,36 +322,36 @@ msgstr ""
"%s\n"
"Ĉu vi deziras tamen daŭrigi?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "%s da kroma diskospaco estos uzata."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "%s da diskospaco estos liberigitaj."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s da pakaĵoj estos ricevitaj."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"Por plenumi dependaĵojn, la sekvanta pakaĵo estos ankaŭ instalita (%d MB)"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -360,54 +360,54 @@ msgstr ""
"esti instalataj:\n"
"%s\n"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "Ne povas preni fontajn pakaĵojn, mi ĉesiĝas."
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Bonvolu enmeti la portilon nomitan\"%s\""
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Finata"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "Instalado malsukcesis:"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Eble vi deziras ĝisdatigi vian urpm-datumbazon."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Instalado malsukcesis:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "La pakaĵo(j) estas jam instalita(j)"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Instalo finita"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "restartas urpmi"
@@ -481,7 +481,7 @@ msgstr "Mi elŝutas pakaĵon '%s'..."
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "uzante specifan medion sur %s\n"
@@ -536,62 +536,62 @@ msgstr "eraro dum registri lokajn pakaĵojn"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "malĝusta deklaro de prokuro en la komanda linio\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: ne povas legi rpm-an dosieron \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Mankas signaturo (%s)"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -608,7 +608,7 @@ msgstr ""
"\n"
"uzado:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Kopirajto © %s %s"
@@ -655,7 +655,7 @@ msgstr "ne povas skribi konfigurodosieron [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "ne povas skribi konfigurodosieron [%s]"
@@ -1344,7 +1344,7 @@ msgstr "Arch"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -2000,8 +2000,8 @@ msgstr " --sourcerpm - printu etikedon sourcerpm: source rpm.\n"
#: ../urpmf:75
#, fuzzy, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --obsoletes - printu etikedajn arkaikojn: ĉiuj arkaikoj.\n"
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - printu etikedan postulojn: ĉiujn postulojn.\n"
#: ../urpmf:76
#, fuzzy, c-format
@@ -2029,27 +2029,27 @@ msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - printu version, eldonon kaj arkitekturon kun nomo.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "neniu \"hdlist\" dosiero trovita por medio \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "konstruis hdlist-an sintezan dosieron por medio \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "Nenia xml-informo havebla por portilo \"%s\""
@@ -2077,7 +2077,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --obsoletes - printu etikedajn arkaikojn: ĉiuj arkaikoj.\n"
#: ../urpmi:81
@@ -2178,7 +2178,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --obsoletes - printu etikedajn arkaikojn: ĉiuj arkaikoj.\n"
#: ../urpmi:109
@@ -2979,8 +2979,8 @@ msgstr " --requires - printu etikedan postulojn: ĉiujn postulojn.\n"
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --obsoletes - printu etikedajn arkaikojn: ĉiuj arkaikoj.\n"
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - printu etikedan postulojn: ĉiujn postulojn.\n"
#: ../urpmq:85
#, fuzzy, c-format
@@ -3147,6 +3147,14 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#, fuzzy
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --obsoletes - printu etikedajn arkaikojn: ĉiuj arkaikoj.\n"
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --obsoletes - printu etikedajn arkaikojn: ĉiuj arkaikoj.\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d pakaĵo, %d MB)"
diff --git a/po/es.po b/po/es.po
index fffe8dc3..757c8caf 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2013-04-22 16:16-0500\n"
"Last-Translator: Diego Bello <dbello@gmail.com>\n"
"Language-Team: Spanish <cooker-i18n@mandrivalinux.org >\n"
@@ -72,7 +72,7 @@ msgstr "Instalando paquete `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Descargando paquete `%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Cancelar"
@@ -84,22 +84,22 @@ msgstr "Cancelar"
msgid "...retrieving failed: %s"
msgstr "...falló la recuperación: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "Instalación de RPMs"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Error: no se puede encontrar el archivo %s, se cancelará la operación"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Ok"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -120,7 +120,7 @@ msgstr ""
"\n"
"¿Qué desea hacer?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -136,7 +136,7 @@ msgstr ""
"\n"
"¿Continuar?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -152,26 +152,31 @@ msgstr ""
"\n"
"Puede que prefiera sólo guardarlo. ¿Cuál es su elección?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Instalar"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Guardar"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Cancelar"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Elija ubicación para guardar archivo"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Aceptar"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -260,17 +265,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Ningún paquete especificado"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Debe ser root"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Preparando instalación de paquetes..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -279,7 +284,7 @@ msgstr ""
"No se puede instalar algunos paquetes pedidos:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -290,42 +295,37 @@ msgstr ""
"%s\n"
"¿Continuar a de todos modos?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Advertencia"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Aceptar"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (para actualizar)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (para instalar)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Elección de paquetes"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Uno de los paquetes siguientes es necesario:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Abortar"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -336,62 +336,62 @@ msgstr ""
"%s\n"
"¿Continuar de todas maneras?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "se utilizarán %s de espacio de disco adicional."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "se liberará %s de espacio de disco."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "se descargarán %s de paquetes."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "¿Efectuar la instalación del paquete?"
msgstr[1] "¿Efectuar la instalación de los %d paquetes?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Para satisfacer las dependencias, se instalará el paquete siguiente"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
"Para satisfacer las dependencias, se instalarán los paquetes siguientes:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "no se pueden obtener los paquetes fuente, abortando"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Por favor, inserte el soporte denominado «%s»"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Hecho"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -400,27 +400,27 @@ msgstr ""
"Falló la instalación, algunos archivos están ausentes:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Tal vez quiera actualizar su base de datos de urpmi."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Falló la instalación:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "El(los) paquete(s) ya está(n) instalado(s)"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Finalizó la instalación"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "reiniciando urpmi"
@@ -495,7 +495,7 @@ msgstr "No se pueden descargar los paquetes en %s"
msgid "Environment directory %s does not exist"
msgstr "El directorio de entorno %s no existe"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "usando un entorno específico en %s\n"
@@ -550,64 +550,64 @@ msgstr "error registrando paquetes locales"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Esta operación está prohibida en modo restringido"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "declaración incorrecta del proxy en la línea de comandos\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: no se puede leer el archivo rpm «%s»\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "expresión %s no esperada"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "falta expresíón antes de %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "expresión no esperada %s (sugerencia: usar -a o -o)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "no hay expresión a cerrar"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"de manera predeterminada, urpmf espera una expresión regular. Debería usar "
"la opción \"--literal\""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "el directorio chroot no existe"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "No se puede usar %s sin %s"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "No se puede usar %s con %s"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "Demasiados argumentos\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -624,7 +624,7 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Copyright © %s por %s"
@@ -673,7 +673,7 @@ msgstr "no se puede leer el archivo de configuración [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "el soporte «%s» está definido dos veces, abortando"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "no se puede escribir el archivo de configuración [%s]"
@@ -1369,8 +1369,8 @@ msgstr "Arq."
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(sugerido)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -2069,9 +2069,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - nombre del rpm fuente\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - lo que sugiere\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - lo que necesita\n"
#: ../urpmf:76
#, c-format
@@ -2099,27 +2099,27 @@ msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - imprime versión, release y arquitectura con nombre.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "expresión no terminada (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Formato incorrecto: debe usar sólo una etiqueta multi-valor"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "no hay hdlist para el soporte «%s»"
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "no hay synthesis para el soporte «%s»"
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "no hay xml-info para el soporte «%s»"
@@ -2146,8 +2146,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - quitar paquetes huérfanos sin preguntar\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr ""
" --no-suggests - no seleccionar automáticamente paquetes «sugeridos».\n"
"\n"
@@ -2254,8 +2254,8 @@ msgstr ""
" verificar las dependencias ni la integridad.\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr ""
" --allow-suggests - seleccionar automáticamente los paquetes «sugeridos».\n"
@@ -3104,9 +3104,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - imprime lo que necesita.\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - muestra los sugeridos.\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - imprime lo que necesita.\n"
#: ../urpmq:85
#, c-format
@@ -3281,6 +3281,15 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#~ msgid "(suggested)"
+#~ msgstr "(sugerido)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - lo que sugiere\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - muestra los sugeridos.\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d paquete, %d MB)"
diff --git a/po/et.po b/po/et.po
index 6c87f842..67040549 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2013-03-01 06:46+0300\n"
"Last-Translator: Marek Laane <bald@starman.ee>\n"
"Language-Team: Estonian <linux-ee@lists.eenet.ee>\n"
@@ -58,7 +58,7 @@ msgstr "Paketi '%s' paigaldamine (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Paketi '%s' allalaadimine..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Loobu"
@@ -70,22 +70,22 @@ msgstr "Loobu"
msgid "...retrieving failed: %s"
msgstr "...tõmbamine nurjus: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "RPM-i paigaldamine"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Viga: faili %s ei leitud, toiming katkestatakse"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Olgu"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -106,7 +106,7 @@ msgstr ""
"\n"
"Mida nüüd ette võtta?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -121,7 +121,7 @@ msgstr ""
"\n"
"Kas jätkata?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -136,26 +136,31 @@ msgstr ""
"\n"
"Võib-olla soovite siiski seda lihtsalt salvestada? Mida ette võtta?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Paigalda"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Salvesta"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Loobu"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Valige faili salvestamise koht"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Olgu"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -242,17 +247,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Pakette pole valitud"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Vajalikud on administraatori õigused"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Paigaldamiseks valmistumine..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -261,7 +266,7 @@ msgstr ""
"Mõnda soovitud paketti ei õnnestu paigaldada:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -272,42 +277,37 @@ msgstr ""
"%s\n"
"Kas siiski jätkata paigaldamist?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Hoiatus"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Olgu"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (uuendus)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (paigaldus)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Paketivalik"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Vajalik on üks järgnevatest pakettidest:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Katkesta"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -318,61 +318,61 @@ msgstr ""
"%s\n"
"Kas siiski jätkata paigaldamist?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Kasutusele võetakse veel %s kettaruumi."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "Vabaneb %s kettaruumi."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "Tõmmatakse %s andmeid."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Kas paigaldada 1 pakett?"
msgstr[1] "Kas paigaldada %d paketti?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmine pakett:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmised paketid:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "pakette ei õnnestunud hankida, katkestatakse"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Palun sisestage andmekandja nimega \"%s\""
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Tehtud"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -381,27 +381,27 @@ msgstr ""
"Paigaldamine nurjus, mõned failid on puudu:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Te võiksite ehk uuendada urpmi andmebaasi."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Paigaldamine nurjus:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Kõik on juba paigaldatud"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Paigaldus lõpetatud"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "urpmi taaskäivitamine"
@@ -476,7 +476,7 @@ msgstr "%s pakettide allalaadimine nurjus"
msgid "Environment directory %s does not exist"
msgstr "Keskkonna kataloogi %s ei ole olemas"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "spetsiifilise keskkonna kasutamine %s puhul\n"
@@ -531,63 +531,63 @@ msgstr "viga kohalike pakettide registreerimisel"
msgid "This operation is forbidden while running in restricted mode"
msgstr "See operatsioon on piiratud režiimis keelatud"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "käsureal on määratud vigane puhverserver\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: RPM-faili \"%s\" lugemine nurjus\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "ootamatu avaldis %s"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "avaldis puudub %s ees"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "ootamatu avaldis %s (soovitus: kasutada võiks võtit -a või -o)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "pole ühtegi avaldist lõpetada"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"vaikimisi ootab urpmf regulaaravaldist, peaksite kasutama võtit \"--literal\""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot-kataloogi ei ole olemas"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "%s kasutamine on võimalik ainult koos %s-ga"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "%s kasutamine ei ole võimalik %s-ga"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "Liiga palju argumente\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -604,7 +604,7 @@ msgstr ""
"\n"
"kasutamine:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Autoriõigus (C) %s: %s"
@@ -653,7 +653,7 @@ msgstr "seadistustefaili [%s] lugemine nurjus"
msgid "medium `%s' is defined twice, aborting"
msgstr "andmekandja '%s' on määratud kaks korda, loobutakse'"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "seadistustefaili [%s] kirjutamine nurjus"
@@ -1344,8 +1344,8 @@ msgstr "Arhit."
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(soovitatud)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -2031,9 +2031,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - lähtekoodi RPM-i nimi\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - soovituste sildid\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - nõutavate sildid\n"
#: ../urpmf:76
#, c-format
@@ -2062,27 +2062,27 @@ msgstr ""
" -f - näitab koos nimega versiooni, väljalaset ja "
"arhitektuuri.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "lõpetamata avaldis (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Vigane vorming: kasutada tohib ainult üht mitme väärtusega silti"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "andmekandjale \"%s\" ei leitud hdlist-faili"
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "andmekandjale \"%s\" ei leitud sünteesifaili"
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "andmekandjale \"%s\" ei leitud XML-infot"
@@ -2108,8 +2108,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - orbude eemaldamine ilma küsimusi esitamata\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --no-suggests - \"soovitatud\" pakette ei valita automaatselt.\n"
#: ../urpmi:81
@@ -2214,8 +2214,8 @@ msgstr ""
" sõltuvusi ja sobivust kontrollimata.\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --allow-suggests - automaatne \"soovitatud\" pakettide valimine.\n"
#: ../urpmi:109
@@ -3063,9 +3063,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - näitab nõutavaid.\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - näitab soovitusi.\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - näitab nõutavaid.\n"
#: ../urpmq:85
#, c-format
@@ -3233,6 +3233,15 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#~ msgid "(suggested)"
+#~ msgstr "(soovitatud)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - soovituste sildid\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - näitab soovitusi.\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d pakett, %d MB)"
diff --git a/po/eu.po b/po/eu.po
index c2f80c6e..00af248c 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2009-11-01 09:36+0100\n"
"Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
"Language-Team: Basque <kde-i18n-doc@kde.org>\n"
@@ -60,7 +60,7 @@ msgstr "`%s' paketea instalatzen (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "`%s' paketea deskargatzen..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Utzi"
@@ -72,22 +72,22 @@ msgstr "Utzi"
msgid "...retrieving failed: %s"
msgstr "...berreskuratzeak huts egin du: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "RPM instalaketa"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Akatsa: ezin da %s fitxategia aurkitu, eragiketa galaraziko da"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Ados"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -108,7 +108,7 @@ msgstr ""
"\n"
"Zer egin nahi duzu?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -123,7 +123,7 @@ msgstr ""
"\n"
"Jarraitu?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -138,26 +138,31 @@ msgstr ""
"\n"
"Baliteke gordetzea bakarrik nahi izatea. Zer egin nahi duzu?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Instalatu"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Gorde"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Utzi"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Aukeratu fitxategiko gordetzeko kokalekua"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Ados"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -247,17 +252,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Ez da paketerik zehaztu"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Root izan behar da"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Paketeen instalazioa prestatzen..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -266,7 +271,7 @@ msgstr ""
"Eskatutako pakete bat ezin da instalatu:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -277,42 +282,37 @@ msgstr ""
"%s\n"
"Instalazioarekin jarraitu hala ere?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Kontuz"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Ados"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (Eguneratu)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (instalatu)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Paketa aukera"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Ondoko paketeetako bat behar da:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Geldiarazi"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -323,61 +323,61 @@ msgstr ""
"%s\n"
"Instalazioarekin jarraitu hala ere?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "diskoan %s leku gehiago erabiliko da."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "diskoan %s lekua askatuko da."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "paketeen %s eskuratuko dira."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Pakete baten instalaketarekin arrera jarraitu nahi duzu?"
msgstr[1] "%d paketeen instalaketarekin jarraitu nahi duzu?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Mendekotasunak asetzeko, ondorengo paketea instalatuko da:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Mendekotasunak asetzeko, ondoko paketeak instalatuko dira:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ezin dira iturburuko paketeak lortu, abortatzen"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Mesedez, sartu \"%s\" izeneko euskarria"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Eginda"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -386,27 +386,27 @@ msgstr ""
"Instalaketak huts egin du, fitxategi batzuk falta dira:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "urpmi datubasea eguneratu nahi izan dezakezu."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Instalaketak huts egin du:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Dena dago instalatuta"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Instalazioa amaitu da"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "urpmi berrabiarazten"
@@ -480,7 +480,7 @@ msgstr "Paketeak ezin dira %s-ra jaitsi"
msgid "Environment directory %s does not exist"
msgstr "%s ingurune direktorioa ez da existitzen"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "%s(e)n ingurune espezifikoa erabiliz\n"
@@ -535,64 +535,64 @@ msgstr "errorea pakete lokalak erregistratzean"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Eragiketa hau debekatuta dago modu murriztuan exekutatzerakoan"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "proxy-adierazpen okerra komando-lerroan\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: ezin da \"%s\" rpm fitxategia irakurri\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "%s ezusteko adierazpena"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "%s-ren aurretik adierazpena falta da"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "%s ezusteko adierazpena (iradokizuna: erabili -a edo -o ?)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "ez dago itxi beharreko adierazpenik"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"era lehenetsian urpmf-k regexp bat espero du. \"--literal\" aukera erabili "
"beharko zenuke"
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot direktorioa ez da existitzen"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "Ezin da %s %s gabe erabili"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "Ezin da %s %s-rekin erabili"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "Argumentu gehiegi\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -609,7 +609,7 @@ msgstr ""
"\n"
"erabilera:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Copyright (C) %s %s"
@@ -658,7 +658,7 @@ msgstr "ezin da konfig fitxategia irakurri [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "'%s' euskarria bitan definituta dago, galarazten"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "ezin da [%s] konfigurazio-fitxategia idatzi"
@@ -1356,8 +1356,8 @@ msgstr "Arkitektura"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(iradokita)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -2038,9 +2038,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - rpm iturburu izena.\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - bilatu «suggests» bezala markatutakoen artean\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - \"beharrezko\" etiketak\n"
#: ../urpmf:76
#, c-format
@@ -2069,27 +2069,27 @@ msgstr ""
" -f - bertsioa, argitalpena eta fitxategia ere izenarekin inprimatzen "
"ditu.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "amaitugabeko adierazpena (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Formatu okerra: etiketa balio-anitz bakarra erabili dezakezu"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "ez dago \"%s\" euskarriarentzako hdlist eskuragarri"
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "ez dago \"%s\" euskarriarentzako synthesis eskuragarri"
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "ez dago \"%s\" euskarriarentzako xml-info eskuragarri"
@@ -2115,8 +2115,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - umezurtzak ezabatu galdetu gabe\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --no-suggests - ez aukeratu automatikoki \"suggested\" paketeak.\n"
#: ../urpmi:81
@@ -2219,8 +2219,8 @@ msgstr ""
"ematen du, mendekotasunak eta osotasuna egiaztatu gabe.\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --allow-suggests - automatikoki aukeratu \"suggested\" packeteak.\n"
#: ../urpmi:109
@@ -3070,9 +3070,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - beharrezko dituenak erakutsi.\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - inprimatu iradokitakoak.\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - beharrezko dituenak erakutsi.\n"
#: ../urpmq:85
#, c-format
@@ -3249,6 +3249,15 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#~ msgid "(suggested)"
+#~ msgstr "(iradokita)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - bilatu «suggests» bezala markatutakoen artean\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - inprimatu iradokitakoak.\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(pakete %d, %d MB)"
diff --git a/po/fa.po b/po/fa.po
index 7142e021..6e03a6ca 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-fa\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2005-02-06 08:42-0500\n"
"Last-Translator: \n"
"Language-Team: <en@li.org>\n"
@@ -61,7 +61,7 @@ msgstr "نصب بسته `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "بارگیری بسته `%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "لغو"
@@ -73,22 +73,22 @@ msgstr "لغو"
msgid "...retrieving failed: %s"
msgstr "...دریافت شکست خورد: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "نصب RPM"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_تأیید"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -109,7 +109,7 @@ msgstr ""
"\n"
"چکار می‌خواهید انجام دهید؟"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -124,7 +124,7 @@ msgstr ""
"\n"
"ادامه میدهید؟"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -139,26 +139,31 @@ msgstr ""
"\n"
"ممکن ایت ترجیح دهید فقط آن را ذخیره کنید. امنخاب شما کدام است؟"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_نصب"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_ذخیره"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_لغو"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "مکان ذخیره‌ی پرونده را انتخاب کنید"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "تایید"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -241,17 +246,17 @@ msgstr ""
msgid "No packages specified"
msgstr "هیچ بسته‌ای با نام %s"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "باید مدیر باشید"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "در حال آماده کردن نصب بسته‌ها..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -260,7 +265,7 @@ msgstr ""
"بعضی از بسته‌های خواسته شده نمی‌توانند نصب شوند:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -271,42 +276,37 @@ msgstr ""
"%s\n"
"ادامه میدهید؟"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "هشدار"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "تایید"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (ارتقاء دادن)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (نصب کردن)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "یکی از بسته‌های بدنبال آمده لازم است:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_ترک"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -317,67 +317,67 @@ msgstr ""
"%s\n"
"ادامه میدهید؟"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "برای ارضای وابستگی‌ها، بسته‌ی بدنبال آمده نصب خواهد شد (%d مگابایت)"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "برای ارضای وابستگی‌ها، بسته‌ی بدنبال آمده نصب خواهد شد (%d مگابایت)"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "نمب‌توان بسته های منبع را دریافت کرد، پایان داده می‌شود"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "لطفاً رسانه‌ی بنام \"%s\" بر دستگاه [%s] را داخل نمایید"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_انجام شد"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "نصب شکست خورد"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, fuzzy, c-format
msgid "You may want to update your urpmi database."
msgstr ""
@@ -385,22 +385,22 @@ msgstr ""
"%s\n"
"بهتر است بانک اطلاعات urpmi را بروزسازی نمایید"
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "نصب شکست خورد"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "همه چیز قبلاً نصب شده است"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "نصب پایان یافت"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "راه‌اندازی دوباره‌ی urpmi"
@@ -474,7 +474,7 @@ msgstr "بارگیری بسته `%s'..."
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "استفاده از محیط مشخص بر %s\n"
@@ -529,62 +529,62 @@ msgstr "خطا در بایگانی کردن بسته‌های محلی"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "تعریف بد پراکسی بر خط فرمان\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: نمی‌توان پرونده rpm \"%s\" را خواند\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "عدم وجود امضا (%s)"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -600,7 +600,7 @@ msgstr ""
"\n"
"طرز استفاده:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr ""
@@ -647,7 +647,7 @@ msgstr "نمی‌توان پرونده‌ی تنظیم [%s] را نوشت"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "نمی‌توان پرونده‌ی تنظیم [%s] را نوشت"
@@ -1336,7 +1336,7 @@ msgstr "جستجو"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -1988,8 +1988,8 @@ msgstr " --sourcerpm - چاپ برچسب sourcerpm: منبع rpm.\n"
#: ../urpmf:75
#, fuzzy, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --obsoletes - چاپ برچسب کهنه‌ها: همه کهنه‌ها.\n"
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - چاپ برچسب لازمه: همه لازم.\n"
#: ../urpmf:76
#, fuzzy, c-format
@@ -2016,27 +2016,27 @@ msgstr " -l - پرونده‌های در بسته را فهرست
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - چاپ نسخه، انتشار و ساختار با نام.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "هیچ پرونده‌ی hdlist برای رسانه \"%s\" یافت شد"
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "ساختن پرونده ترکیب hdlist برای رسانه \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "نگارش پرونده لیست برای رسانه \"%s\""
@@ -2063,7 +2063,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --obsoletes - چاپ برچسب کهنه‌ها: همه کهنه‌ها.\n"
#: ../urpmi:81
@@ -2161,7 +2161,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --obsoletes - چاپ برچسب کهنه‌ها: همه کهنه‌ها.\n"
#: ../urpmi:109
@@ -2972,8 +2972,8 @@ msgstr " --requires - چاپ برچسب لازمه: همه لازم.\n"
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --obsoletes - چاپ برچسب کهنه‌ها: همه کهنه‌ها.\n"
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - چاپ برچسب لازمه: همه لازم.\n"
#: ../urpmq:85
#, fuzzy, c-format
@@ -3138,6 +3138,14 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#, fuzzy
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --obsoletes - چاپ برچسب کهنه‌ها: همه کهنه‌ها.\n"
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --obsoletes - چاپ برچسب کهنه‌ها: همه کهنه‌ها.\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(بسته‌های %d، %d مگابایت)"
diff --git a/po/fi.po b/po/fi.po
index 3747b21b..05cf2b3a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2009-11-04 17:15+0200\n"
"Last-Translator: Jani Välimaa <wally@mandriva.org>\n"
"Language-Team: Finnish <cooker-i18n@mandrivalinux.org>\n"
@@ -66,7 +66,7 @@ msgstr "Asennetaan pakettia %s (%s / %s)..."
msgid "Downloading package `%s'..."
msgstr "Ladataan tiedostoa %s..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Peruuta"
@@ -78,22 +78,22 @@ msgstr "Peruuta"
msgid "...retrieving failed: %s"
msgstr "...noutaminen epäonnistui: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "RPM-pakettien asennus"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Virhe: tiedostoa %s ei löydy, toimenpide peruutetaan"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Ok"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -115,7 +115,7 @@ msgstr ""
"\n"
"Mitä tehdään?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -130,7 +130,7 @@ msgstr ""
"\n"
"Jatka?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -145,26 +145,31 @@ msgstr ""
"\n"
"Paketti voidaan myös vain tallentaa koneelle. Mitä tehdään?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Asenna"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Tallenna"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Peruuta"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Valitse tallennettavalle tiedostolle sijainti"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -256,17 +261,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Paketteja ei määritelty"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "On oltava pääkäyttäjän oikeudet"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Valmistellaan ohjelmistopakettien asennusta..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -275,7 +280,7 @@ msgstr ""
"Joitakin haluttuja paketteja ei voida asentaa:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -286,42 +291,37 @@ msgstr ""
"%s\n"
"Jatka muiden pakettien asentamista?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Varoitus"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (päivitettävä)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (asennettava)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Pakettivalinta"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Jokin seuraavista paketeista tarvitaan:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Hylkää"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -332,61 +332,61 @@ msgstr ""
"%s\n"
"Jatka asennusta?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Pakettien asentaminen vie %s lisää levytilaa."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "Levytilaa vapautuu %s."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "Noudetaan yhteensä %s."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Asennetaanko valittu paketti?"
msgstr[1] "Asennetaanko valitut %d pakettia?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Riippuvuuksien täyttämiseksi seuraava paketti asennetaan:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Riippuvuuksien täyttämiseksi seuraavat paketit asennetaan:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "Lähdekoodipaketteja ei voida hakea, keskeytetään asennus"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Aseta media \"%s\" asemaan"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Valmis"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -395,27 +395,27 @@ msgstr ""
"Asennus epäonnistui, joitakin tiedostoja puuttuu:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Urpmi-tietokanta tulisi päivittää."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Asennus epäonnistui:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Paketit on jo asennettu"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Asennus on valmis"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "Käynnistetään urpmi uudelleen"
@@ -489,7 +489,7 @@ msgstr "Paketteja ei voida ladata hakemistoon %s"
msgid "Environment directory %s does not exist"
msgstr "Ympäristökansiota %s ei ole olemassa"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "Käytetään määrättyä ympäristöä kohteelle %s\n"
@@ -544,64 +544,64 @@ msgstr "Virhe rekisteröitäessä paikallisia paketteja"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Toiminto on kielletty, koska ohjelmaa käytetään rajoitetussa tilassa"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "Virheellinen välityspalvelinmääritys komentorivillä\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: rpm-pakettia %s ei voida lukea\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "Odottamaton hakulauseke %s"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "Puuttuva hakulauseke ennen %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "Odottamaton hakulauseke %s (ehdotus: käytä valitsimia -a tai -o)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "Ei suljettavaa hakulauseketta"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"urpmf odottaa oletuksena säännöllistä lauseketta. Käytä valitsinta \"--"
"literal\""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "Chroot-kansiota ei ole olemassa"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "Valitsinta %s ei voida käyttää ilman valitsinta %s"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "Valitsinta %s ei voida käyttää valitsimen %s kanssa"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "Liian monta argumenttia\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -617,7 +617,7 @@ msgstr ""
"\n"
"Käyttö:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Copyright (C) %s, %s"
@@ -666,7 +666,7 @@ msgstr "Asetustiedostoa [%s] ei voitu lukea"
msgid "medium `%s' is defined twice, aborting"
msgstr "Media \"%s\" on asetettu kahdesti, keskeytetään"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "Asetustiedostoon [%s] ei voitu kirjoittaa"
@@ -1358,8 +1358,8 @@ msgstr "Arkkitehtuuri"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(ehdotettu)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -2047,9 +2047,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - lähdepaketin nimi.\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - ehdotusmerkinnät (\"Suggests\").\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - riippuvuusmerkinnät (\"Requires\").\n"
#: ../urpmf:76
#, c-format
@@ -2077,28 +2077,28 @@ msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - tulosta nimen lisäksi versio, julkaisu ja arkkitehtuuri.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "Päättämätön hakulauseke (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
"Virheellinen muoto: vain yhtä moniarvoista merkintää voi käyttää kerrallaan"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "Medialle \"%s\" ei löydy hdlist-tiedostoa"
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "Medialle \"%s\" ei löydy synthesis-tiedostoa"
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "Medialle \"%s\" ei löydy xml-info -tiedostoa"
@@ -2124,8 +2124,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - poista tarpeettomat paketit (orphans) kysymättä.\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr ""
" --no-suggests - älä valitse ehdotettuja paketteja automaattisesti\n"
" (\"Suggests\").\n"
@@ -2231,8 +2231,8 @@ msgstr ""
" eheyden tarkistusta.\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr ""
" --allow-suggests - asenna ehdotetut paketit automaattisesti\n"
" (\"Suggests\").\n"
@@ -3094,11 +3094,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - tulosta riippuvuusmerkinnät (\"Requires\").\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr ""
-" --suggests - näytä asennettavaksi ehdotettavat paketit\n"
-" (\"Suggests\").\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - tulosta riippuvuusmerkinnät (\"Requires\").\n"
#: ../urpmq:85
#, c-format
@@ -3274,6 +3272,17 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#~ msgid "(suggested)"
+#~ msgstr "(ehdotettu)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - ehdotusmerkinnät (\"Suggests\").\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr ""
+#~ " --suggests - näytä asennettavaksi ehdotettavat paketit\n"
+#~ " (\"Suggests\").\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d paketti, %d Mt)"
diff --git a/po/fr.po b/po/fr.po
index 96d2f2e1..9bf1231c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,6 +1,6 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR Free Software Foundation, Inc.
-#
+#
# Translators:
# Christophe Berthelé <berthy@mandriva.org>, 2009
# Christophe Berthelé <cpjc@free.fr>, 2005-2008
@@ -23,14 +23,15 @@
msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2014-05-12 20:44+0000\n"
"Last-Translator: Dune <dune06@free.fr>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/mageia/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/projects/p/mageia/language/"
+"fr/)\n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8-bit\n"
-"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: ../gurpm/RPMProgressDialog.pm:47
@@ -73,7 +74,7 @@ msgstr "Installation du paquetage « %s » (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Téléchargement du paquetage « %s »..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Annuler"
@@ -85,34 +86,44 @@ msgstr "Annuler"
msgid "...retrieving failed: %s"
msgstr "... échec de la récupération : %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "Installation du RPM"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Erreur : fichier %s introuvable, annulation de l'opération"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Ok"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
"\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 "Vous avez choisi un paquetage de sources :\n\n%s\n\nVous ne désirez probablement pas l'installer sur votre ordinateur. (L'installer vous permettra de modifier le code source, puis de le recompiler).\n\nQue voulez-vous faire ?"
+msgstr ""
+"Vous avez choisi un paquetage de sources :\n"
+"\n"
+"%s\n"
+"\n"
+"Vous ne désirez probablement pas l'installer sur votre ordinateur. "
+"(L'installer vous permettra de modifier le code source, puis de le "
+"recompiler).\n"
+"\n"
+"Que voulez-vous faire ?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -120,9 +131,15 @@ msgid ""
"%s\n"
"\n"
"Proceed?"
-msgstr "Vous êtes sur le point d'installer les paquetages suivants sur votre ordinateur :\n\n%s\n\nContinuer ?"
+msgstr ""
+"Vous êtes sur le point d'installer les paquetages suivants sur votre "
+"ordinateur :\n"
+"\n"
+"%s\n"
+"\n"
+"Continuer ?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -130,28 +147,39 @@ msgid ""
"%s\n"
"\n"
"You may prefer to just save it. What is your choice?"
-msgstr "Vous êtes sur le point d'installer le paquetage suivant sur votre ordinateur :\n\n%s\n\nPeut-être préférez-vous simplement l'enregistrer. Quel est votre choix ?"
+msgstr ""
+"Vous êtes sur le point d'installer le paquetage suivant sur votre "
+"ordinateur :\n"
+"\n"
+"%s\n"
+"\n"
+"Peut-être préférez-vous simplement l'enregistrer. Quel est votre choix ?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Installer"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Sauver"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Annuler"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Choisissez un emplacement pour enregistrer le fichier"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -168,215 +196,241 @@ msgstr " --help - afficher ce message d'aide.\n"
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
-msgstr " --auto - mode non intéractif, utilisation des paramètres par défaut.\n"
+msgstr ""
+" --auto - mode non intéractif, utilisation des paramètres par "
+"défaut.\n"
#: ../gurpmi.pm:59 ../urpmi:75 ../urpmq:48
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - sélection automatique des paquetages à mettre à jour.\n"
+msgstr ""
+" --auto-select - sélection automatique des paquetages à mettre à jour.\n"
#: ../gurpmi.pm:60 ../urpme:46 ../urpmi:100 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - forcer l'invocation même si certains paquetages n'existent pas.\n"
+msgstr ""
+" --force - forcer l'invocation même si certains paquetages "
+"n'existent pas.\n"
#: ../gurpmi.pm:61 ../urpmi:131
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr " --verify-rpm - vérifier la signature du rpm avant l'installation\n (--no-verify-rpm le désactive, activé par défaut).\n"
+msgstr ""
+" --verify-rpm - vérifier la signature du rpm avant l'installation\n"
+" (--no-verify-rpm le désactive, activé par défaut).\n"
#: ../gurpmi.pm:63 ../urpmf:36 ../urpmi:68 ../urpmq:43
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
-msgstr " --media - utiliser seulement les médias listés (séparés par des virgules).\n"
+msgstr ""
+" --media - utiliser seulement les médias listés (séparés par des "
+"virgules).\n"
#: ../gurpmi.pm:64 ../urpmi:147
#, c-format
msgid " -p - allow search in provides to find package.\n"
-msgstr " -p - cherche dans les apports pour trouver le paquetage.\n"
+msgstr ""
+" -p - cherche dans les apports pour trouver le paquetage.\n"
#: ../gurpmi.pm:65 ../urpmi:148
#, c-format
msgid " -P - do not search in provides to find package.\n"
-msgstr " -P - ne pas chercher dans les apports pour trouver un paquetage.\n"
+msgstr ""
+" -P - ne pas chercher dans les apports pour trouver un "
+"paquetage.\n"
#: ../gurpmi.pm:66 ../urpmi:107 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - utiliser un autre répertoire racine pour l'installation.\n"
+msgstr ""
+" --root - utiliser un autre répertoire racine pour l'installation.\n"
#: ../gurpmi.pm:67 ../urpmi:133
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
-msgstr " --test - vérifier si l'installation peut se dérouler correctement.\n"
+msgstr ""
+" --test - vérifier si l'installation peut se dérouler "
+"correctement.\n"
#: ../gurpmi.pm:68 ../urpmi:71
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --searchmedia - utiliser seulement le média spécifié pour rechercher les paquetages.\n"
+msgstr ""
+" --searchmedia - utiliser seulement le média spécifié pour rechercher les "
+"paquetages.\n"
#: ../gurpmi.pm:115
#, c-format
msgid "No packages specified"
msgstr "Pas de paquetage spécifié"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Vous devez être administrateur"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Préparation de l'installation des paquetages..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
-msgstr "Certains paquetages demandés ne peuvent pas être installés :\n%s"
+msgstr ""
+"Certains paquetages demandés ne peuvent pas être installés :\n"
+"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s\n"
"Continue installation anyway?"
-msgstr "Certains paquetages demandés ne peuvent pas être installés :\n%s\nContinuer quand même l'installation ?"
+msgstr ""
+"Certains paquetages demandés ne peuvent pas être installés :\n"
+"%s\n"
+"Continuer quand même l'installation ?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Attention"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (à mettre à jour)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (à installer)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Choix d'un paquetage"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Un des paquetages suivants est nécessaire :"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Abandonner"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s\n"
"Continue installation anyway?"
-msgstr "Pour permettre la mise à jour, les paquetages suivants doivent être désinstallés :\n%s\nContinuer quand même l'installation ?"
+msgstr ""
+"Pour permettre la mise à jour, les paquetages suivants doivent être "
+"désinstallés :\n"
+"%s\n"
+"Continuer quand même l'installation ?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "un espace additionnel de %s sera utilisé."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "un espace de %s sera libéré."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s de paquets seront récupérés."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Procéder à l'installation d'un paquetage ?"
msgstr[1] "Procéder à l'installation des %d paquetages ?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgstr "Pour satisfaire les dépendances, le paquetage suivant va être installé :"
+msgstr ""
+"Pour satisfaire les dépendances, le paquetage suivant va être installé :"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
-msgstr "Pour satisfaire les dépendances, les paquetages suivants vont être installés :"
+msgstr ""
+"Pour satisfaire les dépendances, les paquetages suivants vont être "
+"installés :"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "impossible de récupérer les paquetages de sources, abandon"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Veuillez insérer le média nommé « %s »"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr "Une erreur est survenue :"
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Fini"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
-msgstr "L'installation a échoué, certains fichiers sont manquants :\n%s"
+msgstr ""
+"L'installation a échoué, certains fichiers sont manquants :\n"
+"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Vous pouvez mettre à jour votre base de données urpmi."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "L'installation a échoué :"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Tous les paquetages sont déjà installés"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "L'installation est terminée"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "redémarrage de urpmi"
@@ -386,7 +440,9 @@ msgstr "redémarrage de urpmi"
msgid ""
"usage: %s [options]\n"
"where [options] are from\n"
-msgstr "utilisation : %s [options]\noù les [options] sont parmi\n"
+msgstr ""
+"utilisation : %s [options]\n"
+"où les [options] sont parmi\n"
#: ../rpm-find-leaves:17
#, c-format
@@ -396,7 +452,9 @@ msgstr " -h|--help - afficher ce message d'aide.\n"
#: ../rpm-find-leaves:18
#, c-format
msgid " --root <path> - use the given root instead of /\n"
-msgstr " --root <chemin>  - utiliser l'emplacement spécifié comme racine à la place de « / »\n"
+msgstr ""
+" --root <chemin>  - utiliser l'emplacement spécifié comme racine à la "
+"place de « / »\n"
#: ../rpm-find-leaves:19
#, c-format
@@ -448,7 +506,7 @@ msgstr "Impossible de télécharger dans %s"
msgid "Environment directory %s does not exist"
msgstr "Le répertoire d'environnement %s n'existe pas"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "avec environnement spécifique sur %s\n"
@@ -503,72 +561,80 @@ msgstr "erreur lors de l'inscription des paquetages locaux"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Cette opération est interdite en mode restreint"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "mauvaise déclaration de serveur mandataire en ligne de commande\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq : impossible de lire le fichier rpm « %s »\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "expression inattendue %s"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "expression manquante avant %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "expression inattendue %s (suggestion : utilisez -a ou -o ?)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "pas d'expression à fermer"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
-msgstr "par défaut urpmf s'attend à une regexp, utilisez l'option « --literal »"
+msgstr ""
+"par défaut urpmf s'attend à une regexp, utilisez l'option « --literal »"
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "le répertoire chroot n'existe pas"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "Impossible d'utiliser %s sans %s"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "Impossible d'utiliser %s avec %s"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "Trop d'arguments\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
"%s\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 "%s version %s\n%s\nCeci est un logiciel libre pouvant être redistribué selon les termes de la licence GNU GPL.\n\nutilisation :\n"
+msgstr ""
+"%s version %s\n"
+"%s\n"
+"Ceci est un logiciel libre pouvant être redistribué selon les termes de la "
+"licence GNU GPL.\n"
+"\n"
+"utilisation :\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Copyright (C) %s par %s"
@@ -583,7 +649,9 @@ msgstr "La copie a échoué"
msgid ""
"You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done "
"automatically)"
-msgstr "Vous devez monter le CD-ROM vous-même (ou installer perl-Hal-Cdroms afin que celà soit fait automatiquement)"
+msgstr ""
+"Vous devez monter le CD-ROM vous-même (ou installer perl-Hal-Cdroms afin que "
+"celà soit fait automatiquement)"
#: ../urpm/cdrom.pm:82
#, c-format
@@ -615,7 +683,7 @@ msgstr "impossible de lire le fichier de configuration [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "le média « %s » est défini deux fois, interruption"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "impossible d'écrire le fichier de configuration [%s]"
@@ -794,7 +862,9 @@ msgstr "désinstallation du paquetage %s"
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "transaction créée pour l'installation sur %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"transaction créée pour l'installation sur %s (remove=%d, install=%d, upgrade="
+"%d)"
#: ../urpm/install.pm:344
#, c-format
@@ -871,14 +941,20 @@ msgstr "Vous devriez mettre à jour votre base de données urpmi."
msgid ""
"Installation failed, bad rpms:\n"
"%s"
-msgstr "L'installation a échoué à cause de paquets bogués :\n%s"
+msgstr ""
+"L'installation a échoué à cause de paquets bogués :\n"
+"%s"
#: ../urpm/main_loop.pm:108
#, c-format
msgid ""
-"There is not enough space on your filesystem to download all packages (%s needed, %s available).\n"
+"There is not enough space on your filesystem to download all packages (%s "
+"needed, %s available).\n"
"Are you sure you want to continue?"
-msgstr "Il n'y a pas assez d'espace sur votre système de fichier pour télécharger tous les paquets (%s sont nécessaires, %s sont disponibles).\nÊtes-vous sur de vouloir continuer ?"
+msgstr ""
+"Il n'y a pas assez d'espace sur votre système de fichier pour télécharger "
+"tous les paquets (%s sont nécessaires, %s sont disponibles).\n"
+"Êtes-vous sur de vouloir continuer ?"
#: ../urpm/main_loop.pm:138
#, c-format
@@ -984,7 +1060,8 @@ msgstr "le fichier de configuration [%s] a été écrit"
#: ../urpm/media.pm:649
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Le mode distribué ne peut pas être utilisé avec le mode « use-distrib »"
+msgstr ""
+"Le mode distribué ne peut pas être utilisé avec le mode « use-distrib »"
#: ../urpm/media.pm:657
#, c-format
@@ -994,9 +1071,11 @@ msgstr "utilisation du média associé pour le mode distribué : %s"
#: ../urpm/media.pm:673
#, c-format
msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, "
-"--update, --use-distrib or --parallel"
-msgstr "--synthesis ne peut être utilisé avec --media, --excludemedia, --sortmedia, --update, --use-distrib ou --parallel"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update, --use-distrib or --parallel"
+msgstr ""
+"--synthesis ne peut être utilisé avec --media, --excludemedia, --sortmedia, "
+"--update, --use-distrib ou --parallel"
#: ../urpm/media.pm:786
#, c-format
@@ -1006,12 +1085,16 @@ msgstr "média non libre %s ignoré"
#: ../urpm/media.pm:795
#, c-format
msgid "un-ignoring non-free medium `%s' b/c nonfree packages are installed"
-msgstr "Prise en compte des medium non-free `%s' car des paquetages nonfree sont installés"
+msgstr ""
+"Prise en compte des medium non-free `%s' car des paquetages nonfree sont "
+"installés"
#: ../urpm/media.pm:799
#, c-format
msgid "un-ignoring tainted medium `%s' b/c tainted packages are installed"
-msgstr "Prise en compte des medium tainted `%s' car des paquetages tainted sont installés"
+msgstr ""
+"Prise en compte des medium tainted `%s' car des paquetages tainted sont "
+"installés"
#: ../urpm/media.pm:827
#, c-format
@@ -1071,7 +1154,9 @@ msgstr "impossible d'analyser media.cfg"
#: ../urpm/media.pm:1127
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
-msgstr "impossible d'accéder au média de distribution (pas de fichier media.cfg trouvé)"
+msgstr ""
+"impossible d'accéder au média de distribution (pas de fichier media.cfg "
+"trouvé)"
#: ../urpm/media.pm:1149
#, c-format
@@ -1296,8 +1381,8 @@ msgstr "Arch"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(conseillé)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -1337,7 +1422,9 @@ msgstr "To"
#: ../urpm/orphans.pm:79
#, c-format
msgid "Marking %s as manually installed, it won't be auto-orphaned"
-msgstr "Marque %s comme étant manuellement installé, il ne sera pas considéré comme un paquet orphelin"
+msgstr ""
+"Marque %s comme étant manuellement installé, il ne sera pas considéré comme "
+"un paquet orphelin"
#: ../urpm/orphans.pm:527
#, c-format
@@ -1349,8 +1436,14 @@ msgid_plural ""
"The following packages:\n"
"%s\n"
"are now orphaned."
-msgstr[0] "Le paquetage :\n%s\nest maintenant orphelin."
-msgstr[1] "Les paquetages :\n%s\nsont maintenant orphelins."
+msgstr[0] ""
+"Le paquetage :\n"
+"%s\n"
+"est maintenant orphelin."
+msgstr[1] ""
+"Les paquetages :\n"
+"%s\n"
+"sont maintenant orphelins."
#: ../urpm/orphans.pm:530
#, c-format
@@ -1364,13 +1457,23 @@ msgstr[1] "Vous pouvez, si vous le souhaitez, les effacer."
msgid ""
"The following package:\n"
"%s\n"
-"is now orphaned, if you wish to remove it, you can use \"urpme --auto-orphans\""
+"is now orphaned, if you wish to remove it, you can use \"urpme --auto-orphans"
+"\""
msgid_plural ""
"The following packages:\n"
"%s\n"
-"are now orphaned, if you wish to remove them, you can use \"urpme --auto-orphans\""
-msgstr[0] "Le paquetage suivant :\n%s\nest désormais orphelin, si vous voulez le désinstaller, vous pouvez utiliser « urpme --auto-orphans »"
-msgstr[1] "Les paquetages suivants :\n%s\nsont désormais orphelins, si vous voulez les désinstaller, vous pouvez utiliser « urpme --auto-orphans »"
+"are now orphaned, if you wish to remove them, you can use \"urpme --auto-"
+"orphans\""
+msgstr[0] ""
+"Le paquetage suivant :\n"
+"%s\n"
+"est désormais orphelin, si vous voulez le désinstaller, vous pouvez utiliser "
+"« urpme --auto-orphans »"
+msgstr[1] ""
+"Les paquetages suivants :\n"
+"%s\n"
+"sont désormais orphelins, si vous voulez les désinstaller, vous pouvez "
+"utiliser « urpme --auto-orphans »"
#: ../urpm/parallel.pm:15
#, c-format
@@ -1425,9 +1528,11 @@ msgstr "cp a échoué sur l'hôte %s (%d)"
#: ../urpm/parallel_ssh.pm:84
#, c-format
msgid ""
-"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit"
-" code: %d)"
-msgstr "%s a échoué sur l'hôte %s (peut-être n'a-t-il pas la bonne version d'urpmi ?) (code de sortie : %d)"
+"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
+"code: %d)"
+msgstr ""
+"%s a échoué sur l'hôte %s (peut-être n'a-t-il pas la bonne version "
+"d'urpmi ?) (code de sortie : %d)"
#: ../urpm/removable.pm:46
#, c-format
@@ -1447,13 +1552,16 @@ msgstr "démontage de %s"
#: ../urpm/select.pm:45
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "urpmi a été relancé et la liste des paquetages prioritaires est inchangée"
+msgstr ""
+"urpmi a été relancé et la liste des paquetages prioritaires est inchangée"
#: ../urpm/select.pm:47
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "urpmi a été relancé et la liste des paquetages prioritaires a changé : %s vs %s"
+msgstr ""
+"urpmi a été relancé et la liste des paquetages prioritaires a changé : %s vs "
+"%s"
#: ../urpm/select.pm:220
#, c-format
@@ -1510,14 +1618,20 @@ msgstr "afin de garder %s"
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgstr "Afin de poursuivre la mise à jour, le paquetage suivant doit être désinstallé :\n%s"
+msgstr ""
+"Afin de poursuivre la mise à jour, le paquetage suivant doit être "
+"désinstallé :\n"
+"%s"
#: ../urpm/select.pm:675
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s"
-msgstr "Afin de poursuivre la mise à jour, les paquetages suivants doivent être désinstallés :\n%s"
+msgstr ""
+"Afin de poursuivre la mise à jour, les paquetages suivants doivent être "
+"désinstallés :\n"
+"%s"
#: ../urpm/select.pm:702
#, c-format
@@ -1542,7 +1656,8 @@ msgstr "SECURITÉ : Les paquetages suivants ne sont _PAS_ signés (%s) : %s"
#: ../urpm/signature.pm:83
#, c-format
msgid "SECURITY: NOT checking package \"%s\" (due to configuration)"
-msgstr "SECURITÉ : PAS de vérification du paquet « %s » (à cause de la configuration)"
+msgstr ""
+"SECURITÉ : PAS de vérification du paquet « %s » (à cause de la configuration)"
#: ../urpm/signature.pm:102
#, c-format
@@ -1602,7 +1717,9 @@ msgstr "Impossible de déplacer %s vers %s"
#: ../urpme:43
#, c-format
msgid " --auto - automatically select a package in choices.\n"
-msgstr " --auto - sélectionner automatiquement un paquetage parmi les choix\n"
+msgstr ""
+" --auto - sélectionner automatiquement un paquetage parmi les "
+"choix\n"
#: ../urpme:44
#, c-format
@@ -1612,28 +1729,37 @@ msgstr " --auto-orphans - supprimer les orphelins\n"
#: ../urpme:45
#, c-format
msgid " --test - verify if the removal can be achieved correctly.\n"
-msgstr " --test - vérifier si la désinstallation peut être achevée correctement.\n"
+msgstr ""
+" --test - vérifier si la désinstallation peut être achevée "
+"correctement.\n"
#: ../urpme:47 ../urpmi:106 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
-msgstr " --parallel - urpmi distribué sur plusieurs machines de l'alias.\n"
+msgstr ""
+" --parallel - urpmi distribué sur plusieurs machines de l'alias.\n"
#: ../urpme:48
#, c-format
msgid " --root - use another root for rpm removal.\n"
-msgstr " --root - utiliser un autre répertoire racine pour la désinstallation.\n"
+msgstr ""
+" --root - utiliser un autre répertoire racine pour la "
+"désinstallation.\n"
#: ../urpme:49 ../urpmf:35 ../urpmi:108 ../urpmi.addmedia:73
#: ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
-msgstr " --urpmi-root - utiliser un autre répertoire racine pour l'installation et la base de donnée urpmi.\n"
+msgstr ""
+" --urpmi-root - utiliser un autre répertoire racine pour l'installation "
+"et la base de donnée urpmi.\n"
#: ../urpme:50 ../urpmi:96
#, c-format
msgid " --justdb - update only the rpm db, not the filesystem.\n"
-msgstr " --justdb - mettre à jour la base rpm mais pas le système de fichiers.\n"
+msgstr ""
+" --justdb - mettre à jour la base rpm mais pas le système de "
+"fichiers.\n"
#: ../urpme:51
#, c-format
@@ -1645,7 +1771,10 @@ msgstr " --noscripts - ne pas exécuter les scripts de désinstallation.\n"
msgid ""
" --use-distrib - configure urpme on the fly from a distrib tree, useful\n"
" to (un)install a chroot with --root option.\n"
-msgstr " --use-distrib - configurer urpmi à la volée d'après l'arbre d'une\n distribution, utile pour (dés)installer un chroot avec\n l'option --root.\n"
+msgstr ""
+" --use-distrib - configurer urpmi à la volée d'après l'arbre d'une\n"
+" distribution, utile pour (dés)installer un chroot avec\n"
+" l'option --root.\n"
#: ../urpme:54 ../urpmi:150 ../urpmq:87
#, c-format
@@ -1655,7 +1784,9 @@ msgstr " --verbose, -v - mode verbeux.\n"
#: ../urpme:55
#, c-format
msgid " -a - select all packages matching expression.\n"
-msgstr " -a - sélectionner tous les paquetages correspondants à\n l'expression.\n"
+msgstr ""
+" -a - sélectionner tous les paquetages correspondants à\n"
+" l'expression.\n"
#: ../urpme:70
#, c-format
@@ -1676,8 +1807,10 @@ msgstr "paquetage inconnu"
#, c-format
msgid "Removing the following package will break your system:"
msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "La désinstallation du paquetage suivant rendra votre système instable"
-msgstr[1] "La désinstallation des paquetages suivants rendra votre système instable"
+msgstr[0] ""
+"La désinstallation du paquetage suivant rendra votre système instable"
+msgstr[1] ""
+"La désinstallation des paquetages suivants rendra votre système instable"
#: ../urpme:123
#, c-format
@@ -1694,8 +1827,11 @@ msgstr "Aucun orphelin à supprimer"
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "Pour satisfaire les dépendances, le paquetages suivant va être désinstallé"
-msgstr[1] "Pour satisfaire les dépendances, les %d paquetages suivants vont être désinstallés"
+msgstr[0] ""
+"Pour satisfaire les dépendances, le paquetages suivant va être désinstallé"
+msgstr[1] ""
+"Pour satisfaire les dépendances, les %d paquetages suivants vont être "
+"désinstallés"
#: ../urpme:151
#, c-format
@@ -1734,24 +1870,32 @@ msgstr " --version - afficher la version de cet utilitaire\n"
#: ../urpmf:32 ../urpmi:130 ../urpmq:78
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
-msgstr " --env - utiliser un environment spécifique (en général\n un rapport d'anomalie).\n"
+msgstr ""
+" --env - utiliser un environment spécifique (en général\n"
+" un rapport d'anomalie).\n"
#: ../urpmf:33 ../urpmi:69 ../urpmq:45
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
-msgstr " --excludemedia - ne pas utiliser les médias spécifiés (séparés\n par des virgules).\n"
+msgstr ""
+" --excludemedia - ne pas utiliser les médias spécifiés (séparés\n"
+" par des virgules).\n"
#: ../urpmf:34
#, c-format
msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
-msgstr " --literal, -l - ne remplace pas les jokers, applique l'argument tel quel.\n"
+msgstr ""
+" --literal, -l - ne remplace pas les jokers, applique l'argument tel "
+"quel.\n"
#: ../urpmf:37 ../urpmi:72 ../urpmq:46
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
-msgstr " --sortmedia - trier les médias selon des sous-chaînes (séparées\n par des virgules).\n"
+msgstr ""
+" --sortmedia - trier les médias selon des sous-chaînes (séparées\n"
+" par des virgules).\n"
#: ../urpmf:38
#, c-format
@@ -1761,7 +1905,9 @@ msgstr " --use-distrib - utiliser le chemin spécifié pour accéder au média
#: ../urpmf:39 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
-msgstr " --synthesis - utiliser le fichier de synthèse donné plutôt que la base\n de données urpmi.\n"
+msgstr ""
+" --synthesis - utiliser le fichier de synthèse donné plutôt que la base\n"
+" de données urpmi.\n"
#: ../urpmf:40
#, c-format
@@ -1791,7 +1937,8 @@ msgstr " -I - respecter la distinction majuscules/minuscules.\n"
#: ../urpmf:45
#, c-format
msgid " -F<str> - change field separator (defaults to ':').\n"
-msgstr " -F<str> - remplacer le séparateur par <str> (par défaut ':').\n"
+msgstr ""
+" -F<str> - remplacer le séparateur par <str> (par défaut ':').\n"
#: ../urpmf:46
#, c-format
@@ -1801,7 +1948,8 @@ msgstr "Motifs de substitution :\n"
#: ../urpmf:47
#, c-format
msgid " text - any text is parsed as a regexp, unless -l is used.\n"
-msgstr " texte - texte traité en expression régulière, sauf si option -l.\n"
+msgstr ""
+" texte - texte traité en expression régulière, sauf si option -l.\n"
#: ../urpmf:48
#, c-format
@@ -1861,7 +2009,8 @@ msgstr " --buildtime - chercher dans le champ « BuildTime »\n"
#: ../urpmf:59
#, c-format
msgid " --conffiles - configuration files\n"
-msgstr " --conffiles - chercher dans la liste des fichiers de configuration\n"
+msgstr ""
+" --conffiles - chercher dans la liste des fichiers de configuration\n"
#: ../urpmf:60
#, c-format
@@ -1891,7 +2040,8 @@ msgstr " --filename - chercher dans le nom de fichier du paquetage\n"
#: ../urpmf:65
#, c-format
msgid " --files - list of files contained in the package\n"
-msgstr " --files - chercher dans la liste des fichiers d'un paquetage\n"
+msgstr ""
+" --files - chercher dans la liste des fichiers d'un paquetage\n"
#: ../urpmf:66
#, c-format
@@ -1939,9 +2089,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - chercher dans le nom du paquetage source\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - chercher dans le champ «suggests»\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - chercher dans la liste des dépendances\n"
#: ../urpmf:76
#, c-format
@@ -1961,34 +2111,38 @@ msgstr " --vendor - chercher dans le nom du fournisseur\n"
#: ../urpmf:79
#, c-format
msgid " -m - the media in which the package was found\n"
-msgstr " -m - chercher dans le média où le paquetage a été trouvé\n"
+msgstr ""
+" -m - chercher dans le média où le paquetage a été trouvé\n"
#: ../urpmf:80 ../urpmq:97
#, c-format
msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - afficher la version, la release et l'architecture\n du paquetage avec le nom.\n"
+msgstr ""
+" -f - afficher la version, la release et l'architecture\n"
+" du paquetage avec le nom.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "expression non terminée (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Format incorrect : vous ne pouvez utiliser qu'une seule option multi-valeur"
+msgstr ""
+"Format incorrect : vous ne pouvez utiliser qu'une seule option multi-valeur"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "pas de fichier hdlist disponible pour le média « %s »"
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "pas de fichier synthesis disponible pour le média « %s »"
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "pas de fichier xml-info disponible pour le média « %s »"
@@ -1996,12 +2150,14 @@ msgstr "pas de fichier xml-info disponible pour le média « %s »"
#: ../urpmi:76
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
-msgstr " --auto-update - rafraîchir les média lors de la mise à jour du système.\n"
+msgstr ""
+" --auto-update - rafraîchir les média lors de la mise à jour du système.\n"
#: ../urpmi:77
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
-msgstr " --no-md5sum - ne pas effectuer la vérification du fichier MD5SUM.\n"
+msgstr ""
+" --no-md5sum - ne pas effectuer la vérification du fichier MD5SUM.\n"
#: ../urpmi:78
#, c-format
@@ -2014,8 +2170,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - supprimer les orphelins sans confirmation\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --no-suggests - pas de sélection auto des paquetages \"suggérés\"\n"
#: ../urpmi:81
@@ -2023,19 +2179,27 @@ msgstr " --no-suggests - pas de sélection auto des paquetages \"suggérés\"\
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
-msgstr " --no-uninstall - ne jamais demander de désinstallation, plutôt annuler\n l'installation.\n"
+msgstr ""
+" --no-uninstall - ne jamais demander de désinstallation, plutôt annuler\n"
+" l'installation.\n"
#: ../urpmi:82
#, c-format
msgid " --no-install - don't install packages (only download)\n"
-msgstr " --no-install - ne pas installer les paquetages (les télécharger seulement)\n"
+msgstr ""
+" --no-install - ne pas installer les paquetages (les télécharger "
+"seulement)\n"
#: ../urpmi:83 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
-msgstr " --keep - conserve les paquetages existants si possible, rejette les\n paquetages demandés qui nécessitent des désinstallations.\n"
+msgstr ""
+" --keep - conserve les paquetages existants si possible, rejette "
+"les\n"
+" paquetages demandés qui nécessitent des "
+"désinstallations.\n"
#: ../urpmi:85
#, c-format
@@ -2043,7 +2207,11 @@ msgid ""
" --split-level - split in small transaction if more than given packages\n"
" are going to be installed or upgraded,\n"
" default is %d.\n"
-msgstr " --split-level - découper en petites transactions si plus du nombre spécifié\n de paquetages doivent être installés ou mis à jour.\n (%d par défaut).\n"
+msgstr ""
+" --split-level - découper en petites transactions si plus du nombre "
+"spécifié\n"
+" de paquetages doivent être installés ou mis à jour.\n"
+" (%d par défaut).\n"
#: ../urpmi:89
#, c-format
@@ -2063,12 +2231,15 @@ msgstr " --buildrequires - installer les buildrequires des paquetages\n"
#: ../urpmi:93
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
-msgstr " --install-src - n'installer que les paquetages de sources (pas les\n binaires).\n"
+msgstr ""
+" --install-src - n'installer que les paquetages de sources (pas les\n"
+" binaires).\n"
#: ../urpmi:94
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
-msgstr " --clean - enlever tous les rpm du cache avant toute opération.\n"
+msgstr ""
+" --clean - enlever tous les rpm du cache avant toute opération.\n"
#: ../urpmi:95
#, c-format
@@ -2080,31 +2251,40 @@ msgstr " --noclean - ne supprime aucun paquetage du cache.\n"
msgid ""
" --downgrade - downgrade a package from the version currently installed\n"
" to the previously highest version\n"
-msgstr " --downgrade - désinstalle la version actuellement installée d'un paquetage\n et installe sa plus haute version précédente\n"
+msgstr ""
+" --downgrade - désinstalle la version actuellement installée d'un "
+"paquetage\n"
+" et installe sa plus haute version précédente\n"
#: ../urpmi:99
#, c-format
msgid ""
" --replacepkgs - force installing packages which are already installed.\n"
-msgstr " --replacepkgs - force l'installation des paquetages qui sont déjà installés.\n"
+msgstr ""
+" --replacepkgs - force l'installation des paquetages qui sont déjà "
+"installés.\n"
#: ../urpmi:101
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
" dependencies checking.\n"
-msgstr " --allow-nodeps - autoriser l'installation des paquetages sans\n vérifier les dépendances.\n"
+msgstr ""
+" --allow-nodeps - autoriser l'installation des paquetages sans\n"
+" vérifier les dépendances.\n"
#: ../urpmi:103
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
" dependencies checking and integrity.\n"
-msgstr " --allow-force - autoriser l'installation des paquetages sans vérifier\n ni les dépendances ni l'intégrité.\n"
+msgstr ""
+" --allow-force - autoriser l'installation des paquetages sans vérifier\n"
+" ni les dépendances ni l'intégrité.\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --allow-suggests - sélection auto des paquetages \"suggérés\".\n"
#: ../urpmi:109
@@ -2112,7 +2292,10 @@ msgstr " --allow-suggests - sélection auto des paquetages \"suggérés\".\n"
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 - configurer urpmi à la volée d'après l'arbre d'une\n distribution; utile pour (dés)installer un chroot avec\n l'option --root.\n"
+msgstr ""
+" --use-distrib - configurer urpmi à la volée d'après l'arbre d'une\n"
+" distribution; utile pour (dés)installer un chroot avec\n"
+" l'option --root.\n"
#: ../urpmi:111 ../urpmi.addmedia:60 ../urpmi.update:37
#, c-format
@@ -2124,14 +2307,18 @@ msgstr " --metalink - générer et utiliser un metalink local.\n"
msgid ""
" --download-all - download all needed packages before trying to install "
"them\n"
-msgstr " --download-all - télécharger tous les paquetages nécessaires avant installation\n"
+msgstr ""
+" --download-all - télécharger tous les paquetages nécessaires avant "
+"installation\n"
#: ../urpmi:113
#, c-format
msgid ""
" --downloader - program to use to retrieve distant files. \n"
" known programs: %s\n"
-msgstr " --downloader - programme à utiliser pour le téléchargement.\n programmes connus : %s\n"
+msgstr ""
+" --downloader - programme à utiliser pour le téléchargement.\n"
+" programmes connus : %s\n"
#: ../urpmi:116
#, c-format
@@ -2168,33 +2355,44 @@ msgstr " --limit-rate - limiter la vitesse de téléchargement.\n"
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
" (--no-resume disables it, default is disabled).\n"
-msgstr " --resume - reprendre le transfert des fichiers incomplets\n (--no-resume le désactive, il est désactivé par défaut).\n"
+msgstr ""
+" --resume - reprendre le transfert des fichiers incomplets\n"
+" (--no-resume le désactive, il est désactivé par défaut).\n"
#: ../urpmi:124 ../urpmi.addmedia:62 ../urpmi.update:39 ../urpmq:74
#, 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 " --proxy - utiliser le proxy HTTP indiqué, le n° de port\n étant 1080 à défaut d'indication (format <proxy[:port]>).\n"
+msgstr ""
+" --proxy - utiliser le proxy HTTP indiqué, le n° de port\n"
+" étant 1080 à défaut d'indication (format <proxy[:"
+"port]>).\n"
#: ../urpmi:126 ../urpmi.addmedia:64 ../urpmi.update:41 ../urpmq:76
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
" authentication (format is <user:password>).\n"
-msgstr " --proxy-user - spécifier l'utilisateur et le mot de passe pour\n l'authentification sur le proxy (<utilisateur:motdepasse>).\n"
+msgstr ""
+" --proxy-user - spécifier l'utilisateur et le mot de passe pour\n"
+" l'authentification sur le proxy (<utilisateur:"
+"motdepasse>).\n"
#: ../urpmi:128
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
" next arg.\n"
-msgstr " --bug - générer un rapport d'anomalie dans le répertoire\n indiqué en second argument.\n"
+msgstr ""
+" --bug - générer un rapport d'anomalie dans le répertoire\n"
+" indiqué en second argument.\n"
#: ../urpmi:134
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
-msgstr " --excludepath - exclure les chemins indiqués, séparés par des virgules.\n"
+msgstr ""
+" --excludepath - exclure les chemins indiqués, séparés par des virgules.\n"
#: ../urpmi:135
#, c-format
@@ -2204,12 +2402,16 @@ msgstr " --excludedocs - exclure les fichiers de documentation.\n"
#: ../urpmi:136
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
-msgstr " --ignoresize - ne pas vérifier la place disque avant installation.\n"
+msgstr ""
+" --ignoresize - ne pas vérifier la place disque avant installation.\n"
#: ../urpmi:137
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
-msgstr " --ignorearch - autoriser l'installation de paquetages prévus pour d'autres\n architectures.\n"
+msgstr ""
+" --ignorearch - autoriser l'installation de paquetages prévus pour "
+"d'autres\n"
+" architectures.\n"
#: ../urpmi:138
#, c-format
@@ -2236,7 +2438,10 @@ msgstr " --prefer - paquetages qui doivent être favorisés\n"
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
-msgstr " --more-choices - lorsque beaucoup de paquetages sont trouvés, proposer plus\n de choix que par défaut.\n"
+msgstr ""
+" --more-choices - lorsque beaucoup de paquetages sont trouvés, proposer "
+"plus\n"
+" de choix que par défaut.\n"
#: ../urpmi:144
#, c-format
@@ -2246,12 +2451,16 @@ msgstr " --nolock - ne pas verrouiller la base rpm.\n"
#: ../urpmi:145
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
-msgstr " --strict-arch - mettre à jour uniquement les paquetages avec la même\n architecture.\n"
+msgstr ""
+" --strict-arch - mettre à jour uniquement les paquetages avec la même\n"
+" architecture.\n"
#: ../urpmi:146 ../urpmq:95
#, c-format
msgid " -a - select all matches on command line.\n"
-msgstr " -a - sélectionner toutes les correspondances de la ligne de\n commande.\n"
+msgstr ""
+" -a - sélectionner toutes les correspondances de la ligne de\n"
+" commande.\n"
#: ../urpmi:149
#, c-format
@@ -2266,24 +2475,30 @@ msgstr " --debug - mode de déboguage.\n"
#: ../urpmi:152
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
-msgstr " les noms ou les fichiers rpm donnés en ligne de commande seront installés.\n"
+msgstr ""
+" les noms ou les fichiers rpm donnés en ligne de commande seront "
+"installés.\n"
#: ../urpmi:180
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
-msgstr "Erreur : options --auto-select et la liste de paquetages incompatibles.\n"
+msgstr ""
+"Erreur : options --auto-select et la liste de paquetages incompatibles.\n"
#: ../urpmi:187
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
-msgstr "Erreur : pour générer un rapport d'anomalie, précisez les arguments de la\nligne de commande accompagnés de --bug.\n"
+msgstr ""
+"Erreur : pour générer un rapport d'anomalie, précisez les arguments de la\n"
+"ligne de commande accompagnés de --bug.\n"
#: ../urpmi:217
#, c-format
msgid "You can't install binary rpm files when using --install-src"
-msgstr "Installation de paquetages binaires impossible avec l'option --install-src"
+msgstr ""
+"Installation de paquetages binaires impossible avec l'option --install-src"
#: ../urpmi:218
#, c-format
@@ -2299,14 +2514,17 @@ msgstr "repli vers --buildrequires"
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "merci d'utiliser --buildrequires ou --install-src, par défaut --buildrequires"
+msgstr ""
+"merci d'utiliser --buildrequires ou --install-src, par défaut --buildrequires"
#: ../urpmi:250
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
-msgstr "Le répertoire [%s] existe déjà, merci d'en utiliser un autre pour le rapport d'anomalie, ou de l'effacer."
+msgstr ""
+"Le répertoire [%s] existe déjà, merci d'en utiliser un autre pour le rapport "
+"d'anomalie, ou de l'effacer."
#: ../urpmi:251
#, c-format
@@ -2318,7 +2536,9 @@ msgstr "Impossible de créer le répertoire [%s] pour le rapport d'anomalie"
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
-msgstr "Erreur : %s semble être monté en lecture seule.\nUtilisez --allow-force afin de forcer l'opération."
+msgstr ""
+"Erreur : %s semble être monté en lecture seule.\n"
+"Utilisez --allow-force afin de forcer l'opération."
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
#: ../urpmi:426
@@ -2349,7 +2569,9 @@ msgstr "%s (à installer)"
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
-msgstr "Afin de satisfaire les dépendances de « %s », un des paquetages suivants est nécessaire :"
+msgstr ""
+"Afin de satisfaire les dépendances de « %s », un des paquetages suivants est "
+"nécessaire :"
#: ../urpmi:443
#, c-format
@@ -2362,7 +2584,10 @@ msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgstr "Le paquetage suivant ne peut pas être installé, car il dépend\nde paquetage qui sont plus anciens que la version installée :\n%s"
+msgstr ""
+"Le paquetage suivant ne peut pas être installé, car il dépend\n"
+"de paquetage qui sont plus anciens que la version installée :\n"
+"%s"
#: ../urpmi:487
#, c-format
@@ -2370,14 +2595,19 @@ msgid ""
"The following packages can't be installed because they depend on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgstr "Les paquetages suivants ne peuvent pas être installés, car ils dépendent\nde paquetages qui sont plus anciens que les versions installées :\n%s"
+msgstr ""
+"Les paquetages suivants ne peuvent pas être installés, car ils dépendent\n"
+"de paquetages qui sont plus anciens que les versions installées :\n"
+"%s"
#: ../urpmi:493 ../urpmi:511
#, c-format
msgid ""
"\n"
"Continue installation anyway?"
-msgstr "\nDésirez-vous tout de même continuer ?"
+msgstr ""
+"\n"
+"Désirez-vous tout de même continuer ?"
#: ../urpmi:494 ../urpmi:512 ../urpmi:627 ../urpmi.addmedia:136
#, c-format
@@ -2389,7 +2619,9 @@ msgstr " (O/n) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgstr "Le paquetage demandé ne peut pas être installé :\n%s"
+msgstr ""
+"Le paquetage demandé ne peut pas être installé :\n"
+"%s"
#: ../urpmi:526
#, c-format
@@ -2402,7 +2634,10 @@ msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgstr "La mise à jour ne peut pas continuer car le paquetage suivant\ndoit être désinstallé :\n%s\n"
+msgstr ""
+"La mise à jour ne peut pas continuer car le paquetage suivant\n"
+"doit être désinstallé :\n"
+"%s\n"
#: ../urpmi:536
#, c-format
@@ -2410,7 +2645,10 @@ msgid ""
"The installation cannot continue because the following packages\n"
"have to be removed for others to be upgraded:\n"
"%s\n"
-msgstr "La mise à jour ne peut pas continuer car les paquetages suivants\ndoivent être désinstallés :\n%s\n"
+msgstr ""
+"La mise à jour ne peut pas continuer car les paquetages suivants\n"
+"doivent être désinstallés :\n"
+"%s\n"
#: ../urpmi:544
#, c-format
@@ -2420,9 +2658,13 @@ msgstr "(test uniquement, la suppression ne sera pas effectuée)"
#: ../urpmi:563
#, c-format
msgid ""
-"You must first call urpmi with --buildrequires to install the following dependencies:\n"
+"You must first call urpmi with --buildrequires to install the following "
+"dependencies:\n"
+"%s\n"
+msgstr ""
+"Vous devez d'abord utiliser urpmi --buildrequires pour installer les "
+"dépendances suivantes :\n"
"%s\n"
-msgstr "Vous devez d'abord utiliser urpmi --buildrequires pour installer les dépendances suivantes :\n%s\n"
#: ../urpmi:573
#, c-format
@@ -2434,7 +2676,9 @@ msgstr[1] "Les paquetages orphelins suivants vont être désinstallés."
#: ../urpmi:597
#, c-format
msgid "WARNING: %s option is in use. Some strange problems may happen"
-msgstr "ATTENTION : L'option %s est activée. Des problèmes étranges peuvent se produire"
+msgstr ""
+"ATTENTION : L'option %s est activée. Des problèmes étranges peuvent se "
+"produire"
#: ../urpmi:609
#, c-format
@@ -2446,10 +2690,8 @@ msgstr "(test uniquement, l'installation ne sera pas effectuée)"
msgid "Press Enter when mounted..."
msgstr "Veuillez sur appuyez sur « Entrée » une fois le média monté ..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not
-#. be translated!
-#. -PO: neither the ``with''. Only what is between <brackets> can be
-#. translated.
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
+#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, c-format
msgid ""
@@ -2472,41 +2714,73 @@ msgid ""
"\n"
"\n"
"and [options] are from\n"
-msgstr "utilisation: urpmi.addmedia [options] <name> <url>\noù <url> est choisi parmi :\n [file:/]/<chemin>\n ftp://<login>:<mot de passe>@<hôte>/<chemin>\n ftp://<hôte>/<chemin>\n http://<hôte>/<chemin>\n cdrom://<chemin>\n\nutilisation : urpmi.addmedia [options] --distrib --mirrorlist <url>\nutilisation : urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n\nexemples:\n\n urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST'\n urpmi.addmedia --mirrorlist '$MIRRORLIST' backports media/main/backports\n urpmi.addmedia --distrib --zeroconf\n\n\net [options] sont choisies parmi\n"
+msgstr ""
+"utilisation: urpmi.addmedia [options] <name> <url>\n"
+"où <url> est choisi parmi :\n"
+" [file:/]/<chemin>\n"
+" ftp://<login>:<mot de passe>@<hôte>/<chemin>\n"
+" ftp://<hôte>/<chemin>\n"
+" http://<hôte>/<chemin>\n"
+" cdrom://<chemin>\n"
+"\n"
+"utilisation : urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
+"utilisation : urpmi.addmedia [options] --mirrorlist <url> <name> <relative "
+"path>\n"
+"\n"
+"exemples:\n"
+"\n"
+" urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST'\n"
+" urpmi.addmedia --mirrorlist '$MIRRORLIST' backports media/main/backports\n"
+" urpmi.addmedia --distrib --zeroconf\n"
+"\n"
+"\n"
+"et [options] sont choisies parmi\n"
#: ../urpmi.addmedia:56 ../urpmi.update:33 ../urpmq:71
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
-msgstr " --wget - utiliser wget pour récupérer les fichiers distants.\n"
+msgstr ""
+" --wget - utiliser wget pour récupérer les fichiers distants.\n"
#: ../urpmi.addmedia:57 ../urpmi.update:34 ../urpmq:72
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
-msgstr " --curl - utiliser curl pour récupérer les fichiers distants.\n"
+msgstr ""
+" --curl - utiliser curl pour récupérer les fichiers distants.\n"
#: ../urpmi.addmedia:58 ../urpmi.update:35 ../urpmq:73
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
-msgstr " --prozilla - utiliser prozilla pour récupérer les fichiers distants.\n"
+msgstr ""
+" --prozilla - utiliser prozilla pour récupérer les fichiers distants.\n"
#: ../urpmi.addmedia:59 ../urpmi.update:36
#, c-format
msgid " --aria2 - use aria2 to retrieve distant files.\n"
-msgstr " --aria2 - utiliser aria2 pour récupérer les fichiers distants.\n"
+msgstr ""
+" --aria2 - utiliser aria2 pour récupérer les fichiers distants.\n"
#: ../urpmi.addmedia:66
#, c-format
msgid ""
" --update - create an update medium, \n"
" or discard non-update media (when used with --distrib)\n"
-msgstr " --update - créer une source «mise à jour» ou forcer l'utilisation,\n des sources type «mise à jour» (si utilisé avec --distrib)\n"
+msgstr ""
+" --update - créer une source «mise à jour» ou forcer l'utilisation,\n"
+" des sources type «mise à jour» (si utilisé avec --"
+"distrib)\n"
#: ../urpmi.addmedia:68
#, c-format
msgid ""
" --xml-info - use the specific policy for downloading xml info files\n"
-" one of: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
-msgstr " --xml-info - télécharger les fichiers xml-info avec la politique donnée\n parmi : never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+" one of: never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
+msgstr ""
+" --xml-info - télécharger les fichiers xml-info avec la politique "
+"donnée\n"
+" parmi : never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
#: ../urpmi.addmedia:70
#, c-format
@@ -2516,7 +2790,8 @@ msgstr " --probe-synthesis - utiliser un fichier de synthèse.\n"
#: ../urpmi.addmedia:71
#, c-format
msgid " --probe-rpms - use rpm files (instead of synthesis).\n"
-msgstr " --probe-rpms - utiliser les fichiers rpm (au lieu des synthesis).\n"
+msgstr ""
+" --probe-rpms - utiliser les fichiers rpm (au lieu des synthesis).\n"
#: ../urpmi.addmedia:72
#, c-format
@@ -2528,12 +2803,15 @@ msgstr " --no-probe - ne pas essayer de trouver de fichier synthesis.\n"
msgid ""
" --distrib - automatically create all media from an installation\n"
" medium.\n"
-msgstr " --distrib - créer automatiquement tous les médias à partir\n d'un média d'installation.\n"
+msgstr ""
+" --distrib - créer automatiquement tous les médias à partir\n"
+" d'un média d'installation.\n"
#: ../urpmi.addmedia:76
#, c-format
msgid " --interactive - with --distrib, ask confirmation for each media\n"
-msgstr " --interactive - avec --distrib, demande confirmation pour chaque média\n"
+msgstr ""
+" --interactive - avec --distrib, demande confirmation pour chaque média\n"
#: ../urpmi.addmedia:77
#, c-format
@@ -2548,17 +2826,21 @@ msgstr " --virtual - créer un média virtuel qui est toujours à jour,\n"
#: ../urpmi.addmedia:79 ../urpmi.update:44
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
-msgstr " --no-md5sum - Supprime la vérification de la somme de contrôle MD5.\n"
+msgstr ""
+" --no-md5sum - Supprime la vérification de la somme de contrôle MD5.\n"
#: ../urpmi.addmedia:80
#, c-format
msgid " --nopubkey - don't import pubkey of added media\n"
-msgstr " --nopubkey - ne pas importer la clé publique des nouveaux médias\n"
+msgstr ""
+" --nopubkey - ne pas importer la clé publique des nouveaux médias\n"
#: ../urpmi.addmedia:81
#, c-format
msgid " --raw - add the media in config, but don't update it.\n"
-msgstr " --raw - ajoute le média dans la configuration, mais sans le mettre à jour.\n"
+msgstr ""
+" --raw - ajoute le média dans la configuration, mais sans le "
+"mettre à jour.\n"
#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
#, c-format
@@ -2583,7 +2865,8 @@ msgstr "pas d'arguments requis pour --distrib --mirrorlist <url>"
#: ../urpmi.addmedia:112
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
-msgstr "<url> incorrecte (pour un répertoire local, le chemin doit être absolu)"
+msgstr ""
+"<url> incorrecte (pour un répertoire local, le chemin doit être absolu)"
#: ../urpmi.addmedia:116
#, c-format
@@ -2610,7 +2893,9 @@ msgstr "inutile de spécifier le <chemin relatif de synthesis> avec --distrib"
msgid ""
"\n"
"Do you want to add media '%s'?"
-msgstr "\nVoulez-vous ajouter le média « %s » ?"
+msgstr ""
+"\n"
+"Voulez-vous ajouter le média « %s » ?"
#: ../urpmi.addmedia:156 ../urpmi.addmedia:181
#, c-format
@@ -2632,7 +2917,9 @@ msgstr "Impossible d'utiliser %s avec un média distant"
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
-msgstr "Utilisation : urpmi.removemedia ([-a] | <nom> ...)\noù <nom> est le nom du média à retirer.\n"
+msgstr ""
+"Utilisation : urpmi.removemedia ([-a] | <nom> ...)\n"
+"où <nom> est le nom du média à retirer.\n"
#: ../urpmi.removemedia:41
#, c-format
@@ -2659,14 +2946,18 @@ msgstr "rien à retirer (utiliser urpmi.addmedia pour ajouter un média)\n"
msgid ""
"the entry to remove is missing\n"
"(one of %s)\n"
-msgstr "L'entrée à retirer est manquante\n (l'une parmi %s)\n"
+msgstr ""
+"L'entrée à retirer est manquante\n"
+" (l'une parmi %s)\n"
#: ../urpmi.update:30
#, c-format
msgid ""
"usage: urpmi.update [options] <name> ...\n"
"where <name> is a medium name to update.\n"
-msgstr "Utillisation : urpmi.update [options] <nom>...\noù <nom> est un nom de média à mettre à jour.\n"
+msgstr ""
+"Utillisation : urpmi.update [options] <nom>...\n"
+"où <nom> est un nom de média à mettre à jour.\n"
#: ../urpmi.update:43
#, c-format
@@ -2681,12 +2972,14 @@ msgstr " --force-key - force la mise à jour de la clef gpg.\n"
#: ../urpmi.update:46
#, c-format
msgid " --ignore - don't update, mark the media as ignored.\n"
-msgstr " --ignore - sans mettre à jour, marquer le média en tant qu'ignoré.\n"
+msgstr ""
+" --ignore - sans mettre à jour, marquer le média en tant qu'ignoré.\n"
#: ../urpmi.update:47
#, c-format
msgid " --no-ignore - don't update, mark the media as enabled.\n"
-msgstr " --no-ignore - sans mettre à jour, marquer le média en tant qu'actif.\n"
+msgstr ""
+" --no-ignore - sans mettre à jour, marquer le média en tant qu'actif.\n"
#: ../urpmi.update:49
#, c-format
@@ -2696,7 +2989,8 @@ msgstr " --probe-rpms - ignorer le synthesis et utiliser les fichiers rpm\n"
#: ../urpmi.update:50
#, c-format
msgid " -a - select all enabled non-removable media.\n"
-msgstr " -a - sélectionner tous les médias non amovibles activés\n"
+msgstr ""
+" -a - sélectionner tous les médias non amovibles activés\n"
#: ../urpmi.update:51
#, c-format
@@ -2706,7 +3000,8 @@ msgstr " -f - forcer la mise à jour des fichiers synthesis.\n"
#: ../urpmi.update:52
#, c-format
msgid " -ff - really force updating synthesis\n"
-msgstr " -ff - vraiment forcer la mise à jour des fichiers synthesis\n"
+msgstr ""
+" -ff - vraiment forcer la mise à jour des fichiers synthesis\n"
#: ../urpmi.update:69
#, c-format
@@ -2723,7 +3018,9 @@ msgstr "rien à mettre à jour (utiliser urpmi.addmedia pour ajouter un média)\
msgid ""
"the entry to update is missing\n"
"(one of %s)\n"
-msgstr "l'entrée à mettre à jour est manquante\n(un parmi %s)\n"
+msgstr ""
+"l'entrée à mettre à jour est manquante\n"
+"(un parmi %s)\n"
#: ../urpmi.update:98
#, c-format
@@ -2743,9 +3040,11 @@ msgstr "activation du média %s"
#: ../urpmq:44
#, c-format
msgid ""
-" --searchmedia - use only the given media to search requested (or updated)"
-" packages.\n"
-msgstr " --searchmedia - utiliser seulement le média spécifié pour rechercher\n (ou mettre à jour) les paquetages\n"
+" --searchmedia - use only the given media to search requested (or updated) "
+"packages.\n"
+msgstr ""
+" --searchmedia - utiliser seulement le média spécifié pour rechercher\n"
+" (ou mettre à jour) les paquetages\n"
#: ../urpmq:49
#, c-format
@@ -2757,7 +3056,10 @@ msgstr " --auto-orphans - lister les orphelins\n"
msgid ""
" --not-available\n"
" - list installed packages not available on any media.\n"
-msgstr " --not-available\n - liste les paquetages installés disponibles sur aucun média.\n"
+msgstr ""
+" --not-available\n"
+" - liste les paquetages installés disponibles sur aucun "
+"média.\n"
#: ../urpmq:53
#, c-format
@@ -2782,7 +3084,9 @@ msgstr " --list-url - montrer tous les médias disponibles et leurs URL.\n"
#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
-msgstr " --list-nodes - montrer tous les noeuds disponibles en\n utilisant --parallel.\n"
+msgstr ""
+" --list-nodes - montrer tous les noeuds disponibles en\n"
+" utilisant --parallel.\n"
#: ../urpmq:60
#, c-format
@@ -2791,30 +3095,40 @@ msgstr " --list-aliases - lister les alias parallèles disponibles.\n"
#: ../urpmq:61
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
-msgstr " --dump-config - afficher la configuration sous forme d'un argument\n pour urpmi.addmedia.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+" --dump-config - afficher la configuration sous forme d'un argument\n"
+" pour urpmi.addmedia.\n"
#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
-msgstr " --src - le prochain paquetage est un paquetage de sources\n (identique à -s).\n"
+msgstr ""
+" --src - le prochain paquetage est un paquetage de sources\n"
+" (identique à -s).\n"
#: ../urpmq:63
#, c-format
msgid " --sources - print source URLs of selected packages\n"
-msgstr " --sources - affiche les URLs de source des paquetages sélectionnés\n"
+msgstr ""
+" --sources - affiche les URLs de source des paquetages sélectionnés\n"
#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
-msgstr " --ignorearch - autoriser la recherche de paquets pour d'autres\n architectures.\n"
+msgstr ""
+" --ignorearch - autoriser la recherche de paquets pour d'autres\n"
+" architectures.\n"
#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
-msgstr " --use-distrib - configure urpmi à la volée d'après l'arbre d'une\n distribution, permettant d'interroger une distribution.\n"
+msgstr ""
+" --use-distrib - configure urpmi à la volée d'après l'arbre d'une\n"
+" distribution, permettant d'interroger une distribution.\n"
#: ../urpmq:79
#, c-format
@@ -2842,9 +3156,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - afficher les dépendances.\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - afficher le champ «suggests»\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - afficher les dépendances.\n"
#: ../urpmq:85
#, c-format
@@ -2861,31 +3175,41 @@ msgstr " --summary, -S - afficher le résumé.\n"
msgid ""
" --requires-recursive, -d\n"
" - query package dependencies.\n"
-msgstr " --requires-recursive, -d\n - interroger les dépendances du paquetage.\n"
+msgstr ""
+" --requires-recursive, -d\n"
+" - interroger les dépendances du paquetage.\n"
#: ../urpmq:90
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
-msgstr " --whatrequires - recherche inversée des items nécessitant ce paquetage.\n"
+msgstr ""
+" --whatrequires - recherche inversée des items nécessitant ce paquetage.\n"
#: ../urpmq:91
#, c-format
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
-msgstr " --whatrequires-recursive\n - recherche inversée étendue (paquetages virtuels compris).\n"
+msgstr ""
+" --whatrequires-recursive\n"
+" - recherche inversée étendue (paquetages virtuels "
+"compris).\n"
#: ../urpmq:93
#, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
-msgstr " --whatprovides, -p\n - chercher dans les apports pour trouver le paquetage.\n"
+msgstr ""
+" --whatprovides, -p\n"
+" - chercher dans les apports pour trouver le paquetage.\n"
#: ../urpmq:96
#, c-format
msgid " -c - complete output with package to be removed.\n"
-msgstr " -c - sortie sur la ligne de commande avec les\n noms des paquetages à désinstaller.\n"
+msgstr ""
+" -c - sortie sur la ligne de commande avec les\n"
+" noms des paquetages à désinstaller.\n"
#: ../urpmq:98
#, c-format
@@ -2895,7 +3219,9 @@ msgstr " -g - afficher les groupes ainsi que les noms.\n"
#: ../urpmq:99
#, c-format
msgid " -i - print useful information in human readable form.\n"
-msgstr " -i - afficher les informations utiles de manière plus lisible.\n"
+msgstr ""
+" -i - afficher les informations utiles de manière plus "
+"lisible.\n"
#: ../urpmq:100
#, c-format
@@ -2915,14 +3241,19 @@ msgstr " -r - afficher la version détaillée ainsi que le nom.\n"
#: ../urpmq:103
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
-msgstr " -s - le prochain paquetage est un paquetage de sources\n (identique à --src).\n"
+msgstr ""
+" -s - le prochain paquetage est un paquetage de sources\n"
+" (identique à --src).\n"
#: ../urpmq:104
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
-msgstr " -u - enlever le paquetage si une version plus récente est déjà\n installée.\n"
+msgstr ""
+" -u - enlever le paquetage si une version plus récente est "
+"déjà\n"
+" installée.\n"
#: ../urpmq:105
#, c-format
@@ -2937,7 +3268,9 @@ msgstr " -Y - comme -y mais n'est pas sensible à la casse\n"
#: ../urpmq:107
#, c-format
msgid " names or rpm files given on command line are queried.\n"
-msgstr " les noms ou fichiers rpm indiqués sur la ligne de commande sont interrogés.\n"
+msgstr ""
+" les noms ou fichiers rpm indiqués sur la ligne de commande sont "
+"interrogés.\n"
#: ../urpmq:154
#, c-format
@@ -2957,22 +3290,32 @@ msgstr "utilisez -l pour lister les fichiers"
#: ../urpmq:415
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
-msgstr "pas d'information xml pour le média « %s », uniquement un résultat partiel pour le paquetage %s"
+msgstr ""
+"pas d'information xml pour le média « %s », uniquement un résultat partiel "
+"pour le paquetage %s"
#: ../urpmq:416
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
-msgstr "pas d'information xml pour le média « %s », uniquement un résultat partiel pour les paquetages %s"
+msgstr ""
+"pas d'information xml pour le média « %s », uniquement un résultat partiel "
+"pour les paquetages %s"
#: ../urpmq:419
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "pas d'information xml pour le média « %s », impossible de retourner un résultat pour le paquetage %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
+msgstr ""
+"pas d'information xml pour le média « %s », impossible de retourner un "
+"résultat pour le paquetage %s"
#: ../urpmq:420
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
-msgstr "pas d'information xml pour le média « %s », impossible de retourner un résultat pour les paquetages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"pas d'information xml pour le média « %s », impossible de retourner un "
+"résultat pour les paquetages %s"
#: ../urpmq:487
#, c-format
@@ -2993,4 +3336,15 @@ msgstr "Lancer l'installeur de paquetage Mageia"
#: ../polkit/org.mageia.gurpmi2.policy.in.h:2
msgid "Authentication is required to run Mageia Package Installer"
-msgstr "Une authentification est nécessaire pour lancer l'installeur de paquetage Mageia."
+msgstr ""
+"Une authentification est nécessaire pour lancer l'installeur de paquetage "
+"Mageia."
+
+#~ msgid "(suggested)"
+#~ msgstr "(conseillé)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - chercher dans le champ «suggests»\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - afficher le champ «suggests»\n"
diff --git a/po/fur.po b/po/fur.po
index 32a32d84..da066b08 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-fur\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2004-05-21 14:55+0200\n"
"Last-Translator: Andrea Gracco <graccoandrea@tin.it>\n"
"Language-Team: Furlan <gft@freelists.org>\n"
@@ -60,7 +60,7 @@ msgstr "Instalazion dal pachet `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "O stoi scjariant il pachet '%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Scancele"
@@ -72,22 +72,22 @@ msgstr "Scancele"
msgid "...retrieving failed: %s"
msgstr "...copie falade: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Instalazion dal pachet..."
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Ok"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, fuzzy, c-format
msgid ""
"You have selected a source package:\n"
@@ -108,7 +108,7 @@ msgstr ""
"\n"
"Ce vuelistu fa?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, fuzzy, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -123,7 +123,7 @@ msgstr ""
"\n"
"Tu podaressis preferî di salvâlu. Cuale ise le to sielte?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -138,26 +138,31 @@ msgstr ""
"\n"
"Tu podaressis preferî di salvâlu. Cuale ise le to sielte?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, fuzzy, c-format
msgid "_Install"
msgstr "Instale"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, fuzzy, c-format
msgid "_Save"
msgstr "Salve"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Scancele"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Sielç un puest dulà salvâ il file"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -242,17 +247,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Nissun comant specificât"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr ""
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Preparazion dai pachets pe instalazion..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -261,7 +266,7 @@ msgstr ""
"Cualchidun dai pachets domandâts no puedin sedi instalât:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -271,42 +276,37 @@ msgstr ""
"Cualchidun dai pachets domandâts no puedin sedi instalât:\n"
"%s"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Avertence"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr ""
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, fuzzy, c-format
msgid " (to install)"
msgstr "Instalazion Automatiche"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Al covente un di chiscj pachets:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, fuzzy, c-format
msgid "_Abort"
msgstr "Informazions"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -316,70 +316,70 @@ msgstr ""
"I pachets listâts e an di sedi rimovûts par podê atualizâ altris:\n"
"%s"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"Par sodisfâ les dipindincis, %d pachets e stan par sedi instalâts (%d MB)"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
"Par sodisfâ les dipindincis, %d pachets e stan par sedi instalâts (%d MB)"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "no rivi a recuperâ i pachets sorzint, o fermi"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Par plasè insede le font clamade \"%s\" te periferiche [%s]"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, fuzzy, c-format
msgid "_Done"
msgstr "Fat"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "Instalazion falade"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, fuzzy, c-format
msgid "You may want to update your urpmi database."
msgstr ""
@@ -387,22 +387,22 @@ msgstr ""
"%s\n"
"Tu podaressis ve voe di atualizâ il to database urpmi"
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Instalazion falade"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Al è dut dizà instalât"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Instalazion finide"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "rinviament di urpmi"
@@ -477,7 +477,7 @@ msgstr "O stoi scjariant il pachet '%s'..."
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "o dopri les variabilis di ambient su %s\n"
@@ -532,62 +532,62 @@ msgstr "fal te regjistrazion dai pachets locâi"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "declarazion di proxy falade doprant le rie di comant\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: no rivi a lei il file rpm \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Firme mancjant (%s)"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -604,7 +604,7 @@ msgstr ""
"\n"
"ûs:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr ""
@@ -651,7 +651,7 @@ msgstr "no rivi a scrivi tal file di configurazion [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "no rivi a scrivi tal file di configurazion [%s]"
@@ -1344,7 +1344,7 @@ msgstr "Cîr"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -2021,10 +2021,9 @@ msgstr " --sourcerpm - stampe il tag sourcerpm: pachets rpm sorzint.\n"
#: ../urpmf:75
#, fuzzy, c-format
-msgid " --suggests - suggests tags\n"
+msgid " --recommends - recommends tags\n"
msgstr ""
-" --obsoletes - stampe il tag obsolete: dut chel fat deventâ vieli dal "
-"pachet.\n"
+" --requires - stampe il tag requires: dutis les pretesis dal pachet.\n"
#: ../urpmf:76
#, fuzzy, c-format
@@ -2051,27 +2050,27 @@ msgstr " -l - liste i file presints int'un pachet.\n"
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - stampe version, release e architeture cun non.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "nissun file hdlist cjatât pe font \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "o ai creât il file synthesis pe font \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "o scrîf le liste pe font \"%s\""
@@ -2100,7 +2099,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr ""
" --obsoletes - stampe il tag obsolete: dut chel fat deventâ vieli dal "
"pachet.\n"
@@ -2206,7 +2205,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr ""
" --obsoletes - stampe il tag obsolete: dut chel fat deventâ vieli dal "
"pachet.\n"
@@ -3020,10 +3019,9 @@ msgstr ""
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
+msgid " --recommends - print recommends.\n"
msgstr ""
-" --obsoletes - stampe il tag obsolete: dut chel fat deventâ vieli dal "
-"pachet.\n"
+" --requires - stampe il tag requires: dutis les pretesis dal pachet.\n"
#: ../urpmq:85
#, fuzzy, c-format
@@ -3191,6 +3189,18 @@ msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
#, fuzzy
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr ""
+#~ " --obsoletes - stampe il tag obsolete: dut chel fat deventâ vieli "
+#~ "dal pachet.\n"
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr ""
+#~ " --obsoletes - stampe il tag obsolete: dut chel fat deventâ vieli "
+#~ "dal pachet.\n"
+
+#, fuzzy
#~ msgid " --repackage - Re-package the files before erasing\n"
#~ msgstr ""
#~ " --packager - mostre le clâf packager: assembladôr dal pachet.\n"
diff --git a/po/ga.po b/po/ga.po
index ed83d249..c611370e 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 1.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2000-04-06 10:25+0100\n"
"Last-Translator: Proinnsias Breathnach <breatpro@dublin.ml.com>\n"
"Language-Team: Gaeilge <ga@li.org>\n"
@@ -60,7 +60,7 @@ msgstr ""
msgid "Downloading package `%s'..."
msgstr "Ag feistiál pacáiste %s"
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Cealaigh"
@@ -72,22 +72,22 @@ msgstr "Cealaigh"
msgid "...retrieving failed: %s"
msgstr "Theip ar uathathmhéadú FAT: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Ag Ullmhaigh feistiú"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, fuzzy, c-format
msgid "_Ok"
msgstr "Ceart go Leor"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -100,7 +100,7 @@ msgid ""
"What would you like to do?"
msgstr ""
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -110,7 +110,7 @@ msgid ""
"Proceed?"
msgstr ""
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -120,26 +120,31 @@ msgid ""
"You may prefer to just save it. What is your choice?"
msgstr ""
-#: ../gurpmi:112
+#: ../gurpmi:116
#, fuzzy, c-format
msgid "_Install"
msgstr "Ag Feistiú:"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Sábháil"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Cealaigh"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr ""
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Ceart go Leor"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -215,24 +220,24 @@ msgstr ""
msgid "No packages specified"
msgstr "pacáiste ar bith den ainm %s"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, fuzzy, c-format
msgid "Must be root"
msgstr "Gaireas luchóige"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, fuzzy, c-format
msgid "Preparing packages installation..."
msgstr "Ag Ullmhaigh feistiú"
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr "tá gach rud ann cheana féin"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -240,42 +245,37 @@ msgid ""
"Continue installation anyway?"
msgstr "tá gach rud ann cheana féin"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Rabhadh"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Ceart go Leor"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr ""
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, fuzzy, c-format
msgid " (to install)"
msgstr "Eirigh as Feistiú"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Tá ceann de na pacáistí seo de dhíth:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, fuzzy, c-format
msgid "_Abort"
msgstr "Tobscoir"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -283,88 +283,88 @@ msgid ""
"Continue installation anyway?"
msgstr "Tá %s ins na pacáistí a leanas: %s \n"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Tá ceann de na pacáistí seo de dhíth:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Tá ceann de na pacáistí seo de dhíth:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr ""
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr ""
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, fuzzy, c-format
msgid "_Done"
msgstr "Críochnithe"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "Theip ag feistiú"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr ""
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Theip ag feistiú"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "tá gach rud ann cheana féin"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, fuzzy, c-format
msgid "Installation finished"
msgstr "Theip ag feistiú"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -436,7 +436,7 @@ msgstr "Ag feistiál pacáiste %s"
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
@@ -491,62 +491,62 @@ msgstr ""
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, fuzzy, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "Teip ag leámh comhad chlár: %s"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -557,7 +557,7 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr ""
@@ -604,7 +604,7 @@ msgstr "Téip ag oscailt comhad: %s\n"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, fuzzy, c-format
msgid "unable to write config file [%s]"
msgstr "Téip ag oscailt comhad: %s\n"
@@ -1286,7 +1286,7 @@ msgstr "Cuardaigh"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -1932,7 +1932,7 @@ msgstr ""
#: ../urpmf:75
#, c-format
-msgid " --suggests - suggests tags\n"
+msgid " --recommends - recommends tags\n"
msgstr ""
#: ../urpmf:76
@@ -1960,27 +1960,27 @@ msgstr ""
msgid " -f - print version, release and arch with name.\n"
msgstr ""
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "léamh depslist comhad [%s]"
@@ -2007,7 +2007,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr ""
#: ../urpmi:81
@@ -2096,7 +2096,7 @@ msgstr ""
#: ../urpmi:105
#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr ""
#: ../urpmi:109
@@ -2836,7 +2836,7 @@ msgstr ""
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
+msgid " --recommends - print recommends.\n"
msgstr "Modúl Cumraíochta Konsole"
#: ../urpmq:85
@@ -2992,6 +2992,10 @@ msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr "Modúl Cumraíochta Konsole"
+
+#, fuzzy
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "%d pacáistí"
diff --git a/po/gl.po b/po/gl.po
index 6a17a0c0..1283a8cc 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-gl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2009-10-05 18:16+0200\n"
"Last-Translator: Alejo Pacín Jul <alejopj@gmail.com>\n"
"Language-Team: Galician <cooker-i18n@mandrivalinux.org>\n"
@@ -63,7 +63,7 @@ msgstr "Instalando o paquete `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Descargando o paquete `%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Cancelar"
@@ -75,22 +75,22 @@ msgstr "Cancelar"
msgid "...retrieving failed: %s"
msgstr "...fallo ó obter: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "Instalación de RPMs"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Erro: non foi posible atopar o ficheiro %s, cancelarase a operación"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Aceptar"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -111,7 +111,7 @@ msgstr ""
"\n"
"Que desexa facer?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -127,7 +127,7 @@ msgstr ""
"\n"
"Desexa continuar?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -142,26 +142,31 @@ msgstr ""
"\n"
"Podería preferir só gardalo. Que desexa facer?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Instalar"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Gardar"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Cancelar"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Escolla a localización onde se gardará o ficheiro"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Aceptar"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -250,17 +255,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Non especificou ningún paquete"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Debe ser root"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Preparando a instalación dos paquetes..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -269,7 +274,7 @@ msgstr ""
"Algún dos paquetes solicitados non se puido instalar:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -280,42 +285,37 @@ msgstr ""
"%s\n"
"Desexa continua-la instalación de tódolos xeitos?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Advertencia"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Aceptar"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr "(para actualizar)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr "(para instalar)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Selección de paquetes"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Necesítase un dos seguintes paquetes:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Abortar"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -326,61 +326,61 @@ msgstr ""
"%s\n"
"Desexa continuar a instalación de tódolos xeitos?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "vanse usar %s de espazo adicional no disco."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "vanse liberar %s de espazo no disco."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "vanse obter %s de paquetes."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Continuar ca instalación dun paquete?"
msgstr[1] "Continuar ca instalación dos %d paquetes?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Para satisface-las dependencias, vaise instala-lo seguinte paquete"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Para satisface-las dependencias, vanse instala-los seguintes paquetes"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "Non foi posible consegui-los paquetes fonte, abortando"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Insira o soporte chamado \"%s\""
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Feito"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -389,27 +389,27 @@ msgstr ""
"Fallou a instalación, rpms incorrectos:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Pode que desexe actualizar a súa base de datos de urpmi."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "A instalación fallou:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Xa está todo instalado"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Instalación rematada"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "reiniciando urpmi"
@@ -483,7 +483,7 @@ msgstr "Non se puido escribir no directorio de reempacamento [%s]\n"
msgid "Environment directory %s does not exist"
msgstr "O directorio de ambiente %s non existe"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "usando ambiente específico en %s\n"
@@ -538,64 +538,64 @@ msgstr "erro ó rexistra-los paquetes locais"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Esta operación está prohibida mentres se executa en modo restrinxido"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "declaración errónea do proxy na liña de comandos\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: non se puido ler o ficheiro rpm \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, fuzzy, c-format
msgid "unexpected expression %s"
msgstr "Expresións patrón:\n"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Falta a sinatura (%s)"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, fuzzy, c-format
msgid "no expression to close"
msgstr "Expresións patrón:\n"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"por defecto urpmf agarda unha expresión regular. Debería usar a opción \"--"
"literal\""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "o directorio de chroot non existe"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "Non se pode usar %s sen %s"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "Non se pode usar %s con %s"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "Demasiados argumentos\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -611,7 +611,7 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Copyright (C) %s de %s"
@@ -660,7 +660,7 @@ msgstr "non foi posible ler o ficheiro de configuración [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "o soporte `%s' está definido dúas veces, abortando"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "non foi posible escribir o ficheiro de configuración [%s]"
@@ -1355,8 +1355,8 @@ msgstr "Arquitectura"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(suxerido)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -2029,9 +2029,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - nome do rpm fonte\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - etiquetas suxire\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - etiquetas require\n"
#: ../urpmf:76
#, c-format
@@ -2059,27 +2059,27 @@ msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - imprime a versión, a edición e o nome da arquitectura.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, fuzzy, c-format
msgid "unterminated expression (%s)"
msgstr "Expresións patrón:\n"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Formato incorrecto: só pode usar unha etiqueta multivaluada"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "non hai un hdlist dispoñible para o soporte \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "non hai un synthesis dispoñible para o soporte \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "non hai xml-info dispoñible para o soporte \"%s\""
@@ -2107,8 +2107,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr ""
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr ""
" --no-suggests - non seleccionar automaticamente os paquetes \"suxeridos"
"\".\n"
@@ -2213,7 +2213,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr ""
" --no-suggests - non seleccionar automaticamente os paquetes \"suxeridos"
"\".\n"
@@ -3042,8 +3042,8 @@ msgstr " --requires - mostra o que require.\n"
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - etiquetas suxire\n"
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - mostra o que require.\n"
#: ../urpmq:85
#, c-format
@@ -3216,6 +3216,16 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#~ msgid "(suggested)"
+#~ msgstr "(suxerido)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - etiquetas suxire\n"
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - etiquetas suxire\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d paquete, %d MB)"
diff --git a/po/he.po b/po/he.po
index 2078e2ed..0b487bc5 100644
--- a/po/he.po
+++ b/po/he.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2008-03-22 15:41+0200\n"
"Last-Translator: Dotan Kamber <kamberd@yahoo.com>\n"
"Language-Team: Hebrew\n"
@@ -65,7 +65,7 @@ msgstr "מתקין חבילה `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "מוריד חבילה `%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "ביטול"
@@ -77,22 +77,22 @@ msgstr "ביטול"
msgid "...retrieving failed: %s"
msgstr "...האיחזור נכשל: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "התקנת חבילות תוכנה"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "שגיאה: לא ניתן למצוא את הקובץ %s, הפעולה תבוטל"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_המשך"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -113,7 +113,7 @@ msgstr ""
"\n"
"מה ברצונך לעשות?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -128,7 +128,7 @@ msgstr ""
"\n"
"האם ברצונך להמשיך?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -143,26 +143,31 @@ msgstr ""
"\n"
"ייתכן וברצונך רק לשמור את החבילה לדיסק. מה ברצונך לעשות?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_התקנה"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_שמירה"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_ביטול"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "עליך לבחור מקום לשמירת הקובץ"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "אישור"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -241,17 +246,17 @@ msgstr " --searchmedia - השתמש רק במקור הנתון לחיפוש ה
msgid "No packages specified"
msgstr "לא צוינו חבילות"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "עליך להיות בעל הרשאות מנהל מערכת"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "מכין חבילות להתקנה..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -260,7 +265,7 @@ msgstr ""
"לא יכול להתקין כמה חבילות מבוקשות:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -271,42 +276,37 @@ msgstr ""
"%s\n"
"האם להמשיך בכל זאת?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "אזהרה"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "אישור"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (לשדרג)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (להתקין)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "בחירת חבילות"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "אחת החבילות הבאות נדרשת:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_בטל"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -317,61 +317,61 @@ msgstr ""
"%s\n"
"האם להמשיך בכל זאת?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "יעשה שימוש ב-%s שטח כונן נוסף."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "%s שטח בכונן יפונה."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s של חבילות יאוחזרו."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "להמשיך בהתקנת החבילה?"
msgstr[1] "להמשיך בהתקנת %d החבילות?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "כדי לספק את התלויות, החבילה הבאה הותקן:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "כדי לספק את התלויות החבילות הבאות יותקנו:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "אין אפשרות לקרוא חבילות מהמאגר, הפעולה מתבטלת"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "נא להכניס את המדיה בשם \"%s\""
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_סיום"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -380,27 +380,27 @@ msgstr ""
"ההתקנה כשלה, חבילות תקולות:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "מומלץ לעדכן את בסיס הנתונים של urpmi."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "ההתקנה כשלה:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "הכל כבר מותקן"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "ההתקנה הסתיימה"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "מפעיל מחדש את urpmi"
@@ -474,7 +474,7 @@ msgstr "מוריד חבילה `%s'..."
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "שימוש בסביבה מסוימת על %s\n"
@@ -529,62 +529,62 @@ msgstr "חלה שגיאה בעת רישום חבילות מקומיות"
msgid "This operation is forbidden while running in restricted mode"
msgstr "פעולה זו אינה מותרת באופן עבודה מוגבל"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "הכרזת proxy לא תקנית בשורת הפקודה\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: לא יכול קובץ RPM \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "חתימה חסרה (%s)"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "ספרית ה-chroot אינה קיימת"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "לא ניתן להשתמש ב-%s ללא %s"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "לא ניתן להשתמש ב-%s עם %s"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "יותר מדי משתנים\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -601,7 +601,7 @@ msgstr ""
"\n"
"שימוש:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "כל הזכויות שמורות (C) %s %s"
@@ -648,7 +648,7 @@ msgstr "לא ניתן לקרוא את קובץ התצורה [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "המקור '%s' מוגדר פעמים, נוטש"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "כתיבת קובץ ההגדרות [%s] נכשלה"
@@ -1337,7 +1337,7 @@ msgstr "ארכיטקטורה"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -1992,7 +1992,7 @@ msgstr ""
#: ../urpmf:75
#, c-format
-msgid " --suggests - suggests tags\n"
+msgid " --recommends - recommends tags\n"
msgstr ""
#: ../urpmf:76
@@ -2020,27 +2020,27 @@ msgstr " -m - המקור בו נמצאה החבילה\n"
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - הדפסת גרסה, שחרור וארכיון עם שם.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "אין קבצי hdlist זמינים עבור המקור \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "אין קבצי synthesis עבור המקור \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "אין קבצי xml info זמינים עבור המקור \"%s\""
@@ -2066,8 +2066,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr ""
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --no-suggests - אל תבחר באופן אוטומטי חבילות \"suggested\".\n"
#: ../urpmi:81
@@ -2166,7 +2166,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --no-suggests - אל תבחר באופן אוטומטי חבילות \"suggested\".\n"
#: ../urpmi:109
@@ -2954,7 +2954,7 @@ msgstr " --requires - הדפס תלויות.\n"
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
+msgid " --recommends - print recommends.\n"
msgstr " --requires - הדפס תלויות.\n"
#: ../urpmq:85
@@ -3113,6 +3113,10 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --requires - הדפס תלויות.\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(חבילה %d, %d MB)"
diff --git a/po/hi.po b/po/hi.po
index f0a0c23e..43c62a5d 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-hi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2005-08-23 20:11+0530\n"
"Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma)\n"
"Language-Team: Hindi, India\n"
@@ -59,7 +59,7 @@ msgstr "`%s' (%s/%s) पैकेज को संसाधित किया
msgid "Downloading package `%s'..."
msgstr "`%s' पैकेज को डॉउनलोड किया जा रहा है..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "निरस्त"
@@ -71,22 +71,22 @@ msgstr "निरस्त"
msgid "...retrieving failed: %s"
msgstr "...पुनः प्राप्त करने में असफ़लता: %s "
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "आरपीएम संसाधन"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "ठीक (_O)"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -107,7 +107,7 @@ msgstr ""
"\n"
"आप क्या करना चाहते है?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -122,7 +122,7 @@ msgstr ""
"\n"
"किया जाएँ?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -137,26 +137,31 @@ msgstr ""
"\n"
"आप हो सकता है कि इसे सिर्फ़ सुरक्षित करना चाहते है । आपकी पसन्द क्या है?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "संसाधन (_I)"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "सुरक्षित (_S)"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "खत्म करें (_C)"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "संचिका को सुरक्षित करने के स्थान का चयन करें"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "ओ०के०"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -241,17 +246,17 @@ msgstr ""
msgid "No packages specified"
msgstr "%s नाम का कोई पैकेज नहीं है"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "रूट होना चाहिए"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "पैकेजों के संसाधन की तैयारी की जा रही है..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -260,7 +265,7 @@ msgstr ""
"निवेदन किये हुए कुछ पैकेज संसाधित नहीं किये जा सके:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -270,42 +275,37 @@ msgstr ""
"निवेदित किये हुए कुछ पैकेज संसाधित नहीं किये जा सके:\n"
"%sजारी रहा जाएँ?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "चेतावनी"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "ओ०के०"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr "(अपग्रेड के लिए)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr "(संसाधन के लिए)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "पैकेज चयन"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "निम्नलिखित पैकेजों में से एक की आवश्यकता है:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "निष्फ़ल (_A)"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -315,36 +315,36 @@ msgstr ""
"अन्य पैकजों को उन्नयन करने के लिए, निम्नलिखित पैकेजों हटाना होगा:\n"
"%sजारी रहा जाएँ?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"आधीनताओं को सन्तुष्ट करने के लिए, निम्नलिखित पैकेज का संसाधन होने जा रहा है(%d एमबी)"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -352,34 +352,34 @@ msgstr ""
"अधीनताओं को सन्तुष्ट करने के लिए, निम्नलिखित %d पैकेजों का संसाधन होने जा रहा है:\n"
"%s\n"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "स्रोत्र पैकेजों को पाने में असमर्थ, कार्यक्रम विफ़ल किया जा रहा है"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "कृपया \"%s\" नामक माध्यम को [%s] साधन पर प्रवेश करें"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "किया गया(_D)"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "संसाधन असफ़ल"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, fuzzy, c-format
msgid "You may want to update your urpmi database."
msgstr ""
@@ -387,22 +387,22 @@ msgstr ""
"%s\n"
"आपको अपना यू०आर०पी०एम०आई० डाटाबेस को अपडेट करना चाहिए"
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "संसाधन असफ़ल"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "सभी कुछ पहिले से ही संसाधित है"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "संसाधन समाप्त"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "यू०आर०पी०एम०आई० को पुनः आरम्भ किया जा रहा है"
@@ -476,7 +476,7 @@ msgstr "`%s' पैकेज को डॉउनलोड किया जा
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "%s पर विशिष्ट वातावरण का उपयोग करते हुए\n"
@@ -531,62 +531,62 @@ msgstr "स्थानीय पैकेजों का पंजीकरण
msgid "This operation is forbidden while running in restricted mode"
msgstr "सीमित विधा में चलते समय, इस संक्रिया को मनाही है"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "निर्देश वाक्य पर निकृष्ट प्रोक्सी की घोषणा\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: आर०पी०एम० संचिका \"%s\" को नहीं पढ़ सकता है\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "विलुप्त हस्ताक्षर (%s)"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, fuzzy, c-format
msgid ""
"%s version %s\n"
@@ -603,7 +603,7 @@ msgstr ""
"\n"
"उपयोग विधि:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, fuzzy, c-format
msgid "Copyright (C) %s by %s"
msgstr "सर्वाधिकार (C) १९९९-२००४ मैनड्रिव सॉफ़्ट ।"
@@ -650,7 +650,7 @@ msgstr "संरचना-संचिका [%s] को लिखने मे
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "संरचना-संचिका [%s] को लिखने में असमर्थ"
@@ -1342,7 +1342,7 @@ msgstr "खोज"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -2006,8 +2006,8 @@ msgstr " --sourcerpm - टैग स्रोत्र आर०पी०ए
#: ../urpmf:75
#, fuzzy, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --obsoletes - टैग के अप्रचलितों को मुद्रित करें: सभी लुप्तप्रयोग\n"
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - टैग की आवश्यकताऐं मुद्रित करें: सभी आवश्यकताऐं (बहु-वाक्य)\n"
#: ../urpmf:76
#, fuzzy, c-format
@@ -2034,27 +2034,27 @@ msgstr " -l - पैकेज में स्थित संच
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - \tमुद्रित संस्मरण, विमोचन और आर्च नाम के साथ\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "\"%s\" माध्यम के लिए कोई हार्डडिस्क सूची संचिका नहीं मिली"
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "\"%s\" माध्यम के लिए हार्डडिस्क-सूची की कृत्रिम संचिका बनायें"
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "\"%s\" माध्यम के लिए संचिका-सूची लिखी जा रही है"
@@ -2081,7 +2081,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --obsoletes - टैग के अप्रचलितों को मुद्रित करें: सभी लुप्तप्रयोग\n"
#: ../urpmi:81
@@ -2181,7 +2181,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --obsoletes - टैग के अप्रचलितों को मुद्रित करें: सभी लुप्तप्रयोग\n"
#: ../urpmi:109
@@ -2999,8 +2999,8 @@ msgstr " --requires - टैग की आवश्यकताऐं म
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --obsoletes - टैग के अप्रचलितों को मुद्रित करें: सभी लुप्तप्रयोग\n"
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - टैग की आवश्यकताऐं मुद्रित करें: सभी आवश्यकताऐं (बहु-वाक्य)\n"
#: ../urpmq:85
#, fuzzy, c-format
@@ -3166,6 +3166,14 @@ msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
#, fuzzy
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --obsoletes - टैग के अप्रचलितों को मुद्रित करें: सभी लुप्तप्रयोग\n"
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --obsoletes - टैग के अप्रचलितों को मुद्रित करें: सभी लुप्तप्रयोग\n"
+
+#, fuzzy
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "%d पैकेज"
diff --git a/po/hr.po b/po/hr.po
index 0f03fd44..bb724a6c 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2005-01-04 21:27+CET\n"
"Last-Translator: auto\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -57,7 +57,7 @@ msgstr "Instaliram paket `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Instaliram pakete..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Odustani"
@@ -69,22 +69,22 @@ msgstr "Odustani"
msgid "...retrieving failed: %s"
msgstr "...dohvaćanje neuspješno: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Pripremam instalaciju"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_U redu"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -97,7 +97,7 @@ msgid ""
"What would you like to do?"
msgstr ""
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, fuzzy, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -109,7 +109,7 @@ msgstr ""
"Morate biti administrator(root) kako bi instalirali slijedeće ovisnosti:\n"
"%s\n"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -119,26 +119,31 @@ msgid ""
"You may prefer to just save it. What is your choice?"
msgstr ""
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "Instaliraj"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Spremi"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Odustani"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, fuzzy, c-format
msgid "Choose location to save file"
msgstr "Izaberite datoteku"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "U redu"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -219,17 +224,17 @@ msgstr " --media - koristi samo medije popisane zarezom.\n"
msgid "No packages specified"
msgstr "Naredba nije specificirana"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, fuzzy, c-format
msgid "Must be root"
msgstr "Port miša"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Pripremam se za instalaciju"
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -238,7 +243,7 @@ msgstr ""
"Naki traženi paketi ne mogu biti instalirani:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -248,42 +253,37 @@ msgstr ""
"Naki traženi paketi ne mogu biti instalirani:\n"
"%s"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Upozorenje"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "U redu"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Dogradnja"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, fuzzy, c-format
msgid " (to install)"
msgstr "Izlaz iz instalacije"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Jedan od slijedećih paketa je potreban:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Prekini"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -291,22 +291,22 @@ msgid ""
"Continue installation anyway?"
msgstr "Slijedeći paketi će biti uklonjeni"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -314,70 +314,70 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
"Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ne mogu dohvatiti izvorne (source) pakete, prekidam"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Molim umetnite medij pod nazivom \"%s\" u uređaj [%s]"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, fuzzy, c-format
msgid "_Done"
msgstr "Gotov"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "Instalacija nije uspjela"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, fuzzy, c-format
msgid "You may want to update your urpmi database."
msgstr ""
"Instalacija neuspješna, neke datoteke nedostaju.\n"
"Možda ćete poželjeti dograditi vašu urpmi bazu"
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Instalacija nije uspjela"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "sve je već instalirano"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Instalirano"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "restartam urpmi"
@@ -453,7 +453,7 @@ msgstr "Instaliram pakete..."
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "koristim posebno okružje na %s\n"
@@ -508,62 +508,62 @@ msgstr "greška prilikom registriranja lokalnih paketa"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "pogrešna deklaracija proxyja u komandnom retku\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: ne mogu pročitati rpm datoteku \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Nedostaje potpis (%s)"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -579,7 +579,7 @@ msgstr ""
"\n"
"uporaba:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "საავტორო უფლებები (C) %s %s."
@@ -626,7 +626,7 @@ msgstr "ne mogu zapisati config datoteku [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "ne mogu zapisati config datoteku [%s]"
@@ -1312,7 +1312,7 @@ msgstr "potraga"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -1983,9 +1983,9 @@ msgstr " --group -ispisuje oznaku group: grupu."
#: ../urpmf:75
#, fuzzy, c-format
-msgid " --suggests - suggests tags\n"
+msgid " --recommends - recommends tags\n"
msgstr ""
-" --obsoletes - ispisuje oznaku obsoletes: sve zastarjele (više linija)."
+" --requires - ispisuje oznaku requires: sve što zahtjeva (više linija)."
#: ../urpmf:76
#, fuzzy, c-format
@@ -2013,27 +2013,27 @@ msgstr ""
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - ispiši verziju, izdanje i arhitekturu sa imenom.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
@@ -2060,7 +2060,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr ""
" --obsoletes - ispisuje oznaku obsoletes: sve zastarjele (više linija)."
@@ -2166,7 +2166,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr ""
" --obsoletes - ispisuje oznaku obsoletes: sve zastarjele (više linija)."
@@ -2968,9 +2968,9 @@ msgstr ""
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
+msgid " --recommends - print recommends.\n"
msgstr ""
-" --obsoletes - ispisuje oznaku obsoletes: sve zastarjele (više linija)."
+" --requires - ispisuje oznaku requires: sve što zahtjeva (više linija)."
#: ../urpmq:85
#, fuzzy, c-format
@@ -3131,6 +3131,18 @@ msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
#, fuzzy
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr ""
+#~ " --obsoletes - ispisuje oznaku obsoletes: sve zastarjele (više "
+#~ "linija)."
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr ""
+#~ " --obsoletes - ispisuje oznaku obsoletes: sve zastarjele (više "
+#~ "linija)."
+
+#, fuzzy
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "%d paketa"
diff --git a/po/hu.po b/po/hu.po
index b800ac8e..c7d8cc7e 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-2010.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2009-10-26 09:01+0100\n"
"Last-Translator: Gergely Lónyai <aleph@mandriva.org>\n"
"Language-Team: Hungarian <aleph@mandriva.org>\n"
@@ -66,7 +66,7 @@ msgstr "A(z) '%s' (%s/%s) csomag telepítése..."
msgid "Downloading package `%s'..."
msgstr "A(z) '%s' csomag letöltése folyik..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Mégsem"
@@ -78,22 +78,22 @@ msgstr "Mégsem"
msgid "...retrieving failed: %s"
msgstr "...a behozatal sikertelen: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "RPM telepítése"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Hiba: %s nevű fájl nem található - a művelet megszakítva"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_OK"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -114,7 +114,7 @@ msgstr ""
"\n"
"Mit szeretne tenni?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -129,7 +129,7 @@ msgstr ""
"\n"
"Kívánja folytatni?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -144,26 +144,31 @@ msgstr ""
"\n"
"Választhatja azt is, hogy csak elmenti a csomagot. Mit szeretne tenni?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Telepítés"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "Menté_s"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Mégsem"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Válasszon helyet a fájlnak"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "OK"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -250,17 +255,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Nincs megadva csomag"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Rendszergazdai jogosultság szükséges"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Csomagtelepítés előkészítése..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -269,7 +274,7 @@ msgstr ""
"A kért csomagok közül néhányat nem lehet telepíteni:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -280,42 +285,37 @@ msgstr ""
"%s\n"
"Kívánja folytatni a telepítést?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Figyelmeztetés"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "OK"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (frissítés)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (telepítés)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Csomagválasztás"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "A következő csomagok valamelyikére szükség van:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Megszakítás"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -327,61 +327,61 @@ msgstr ""
"%s\n"
"Kívánja folytatni a telepítést?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "További %s lemezterület lesz használva."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "%s lemezhely fel lesz szabadítva."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s csomag lesz beszerezve."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Kívánja folytatni a fenti csomag telepítését?"
msgstr[1] "Kívánja folytatni a fenti %d csomag telepítését?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "A függőségek feloldásához a következő csomag telepítésre kerül:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "A függőségek feloldásához a következő csomagok telepítésre kerülnek:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "a forráscsomagok nem elérhetők, ezért a művelet félbeszakad"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Kérem helyezze be a(z) \"%s\" nevű adathordozót"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Kész"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -390,27 +390,27 @@ msgstr ""
"A telepítés nem sikerült, néhány fájl hiányzik:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Lehet, hogy frissítenie kell az urpmi adatbázist."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "A telepítés nem sikerült:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "A csomag(ok) már telepítve van(nak)"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "A telepítés befejeződött"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "az urpmi újraindítása"
@@ -486,7 +486,7 @@ msgstr "Nem sikerült letölteni a csomagot a %s tükörről"
msgid "Environment directory %s does not exist"
msgstr "\"%s\" környezeti könyvtár nem létezik"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "a következő környezet használata: %s\n"
@@ -541,64 +541,64 @@ msgstr "hiba a helyi csomagok regisztrálásakor"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Korlátozott mód esetén ez a művelet nem végezhető el"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "helytelen proxy-megadás a parancssorban\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: egy RPM-fájl nem olvasható: \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "váratlan kifejezés: %s"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "a %s előtt hiányzik a kifejezés"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "váratlan kifejezés: %s (javasolt a -a vagy -o használata)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "nincs a kifejezés lezárárva"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"alapértelmezésben az urpmi egy regexpet vár, ezt megerősítheti a \"--literal"
"\" opcióval"
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot-könyvtár nem létezik"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "%s nem használható %s nélkül"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "%s nem használható ezzel: %s"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "Túl sok argumentum\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -614,7 +614,7 @@ msgstr ""
"\n"
"Használat:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Copyright (C) %s, %s"
@@ -663,7 +663,7 @@ msgstr "nem sikerült olvasni a(z) \"%s\" beállítási fájlt"
msgid "medium `%s' is defined twice, aborting"
msgstr "\"%s\" adatforrás kétszer van megadva - megszakítás"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "a beállítások mentése nem sikerült: \"%s\""
@@ -1366,8 +1366,8 @@ msgstr "Architektúra"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(javasolt)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -2057,9 +2057,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - a forráscsomag neve\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - \"javasol\" címkék\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - \"követelmények\" címkék\n"
#: ../urpmf:76
#, c-format
@@ -2088,27 +2088,27 @@ msgstr ""
" -f - a névvel együtt a verzió, a kiadásszám és az\n"
" architektúra is jelenjen meg\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "befejezetlen kifejezés (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Helytelen formátum: csak egy darab többértékű címke használható"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "a(z) \"%s\" adatforráshoz nem elérhető a fejléclista (hdlist)"
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "a \"%s\" adatforrás kiterjesztett függőséglistája nem elérhető"
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "a(z) \"%s\" adatforrás listafájlja nem elérhető"
@@ -2135,8 +2135,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - kérdés nélkül eltávolítja az árva csomagokat\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr ""
" --suggests - ne legyenek automatikusan kijelölve a \"javasolt\" "
"csomagok.\n"
@@ -2248,8 +2248,8 @@ msgstr ""
" követően)\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --allow-suggests - a \"javasolt\" csomagok automatikus kijelölése.\n"
#: ../urpmi:109
@@ -3116,9 +3116,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - követelmények megjelenítése\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - kapcsolódók megjelenítése.\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - követelmények megjelenítése\n"
#: ../urpmq:85
#, c-format
@@ -3295,6 +3295,15 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#~ msgid "(suggested)"
+#~ msgstr "(javasolt)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - \"javasol\" címkék\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - kapcsolódók megjelenítése.\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d csomag, %d MB)"
diff --git a/po/id.po b/po/id.po
index 86d826cc..c2d759b9 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,6 +1,6 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR Free Software Foundation, Inc.
-#
+#
# Translators:
# Ahmad Ramadhana <ahmad_ramadhana@yahoo.com.sg>, 2005
# Bayu Artanto <bayuart@yahoo.com>, 2005
@@ -12,14 +12,15 @@
msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2014-06-22 03:11+0000\n"
"Last-Translator: Kiki <kiki.syahadat@yahoo.co.id>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/mageia/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/mageia/"
+"language/id/)\n"
+"Language: id\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8-bit\n"
-"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: ../gurpm/RPMProgressDialog.pm:47
@@ -62,7 +63,7 @@ msgstr "Menginstall paket `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Mendownload paket `%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Batal"
@@ -74,34 +75,43 @@ msgstr "Batal"
msgid "...retrieving failed: %s"
msgstr "...pengambilan gagal: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "Instalasi RPM"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Error: tidak bisa menemukan file %s, membatalkan operasi"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Ok"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
"\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 "Anda telah memilih paket sumber:\n\n%s\n\nAnda mungkin tidak ingin menginstall ini pada komputer Anda (menginstall ini akan memungkinkan Anda memodifikasi kode sumber lalu mengkompilenya).\n\nApa yang ingin Anda lakukan?"
+msgstr ""
+"Anda telah memilih paket sumber:\n"
+"\n"
+"%s\n"
+"\n"
+"Anda mungkin tidak ingin menginstall ini pada komputer Anda (menginstall ini "
+"akan memungkinkan Anda memodifikasi kode sumber lalu mengkompilenya).\n"
+"\n"
+"Apa yang ingin Anda lakukan?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -109,9 +119,14 @@ msgid ""
"%s\n"
"\n"
"Proceed?"
-msgstr "Anda akan menginstall paket software berikut pada komputer Anda:\n\n%s\n\nLanjutkan?"
+msgstr ""
+"Anda akan menginstall paket software berikut pada komputer Anda:\n"
+"\n"
+"%s\n"
+"\n"
+"Lanjutkan?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -119,28 +134,38 @@ msgid ""
"%s\n"
"\n"
"You may prefer to just save it. What is your choice?"
-msgstr "Anda akan menginstall paket software berikut pada komputer Anda:\n\n%s\n\nAnda mungkin hanya ingin menyimpannya. Apa pilihan Anda?"
+msgstr ""
+"Anda akan menginstall paket software berikut pada komputer Anda:\n"
+"\n"
+"%s\n"
+"\n"
+"Anda mungkin hanya ingin menyimpannya. Apa pilihan Anda?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Install"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Simpan"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "Batal"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Pilih lokasi untuk menyimpan file"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -157,41 +182,53 @@ msgstr " --help - tampilkan pesan bantuan ini.\n"
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
-msgstr " --auto - mode non-interaktif, mengasumsikan jawaban default untuk pertanyaan-pertanyaan.\n"
+msgstr ""
+" --auto - mode non-interaktif, mengasumsikan jawaban default untuk "
+"pertanyaan-pertanyaan.\n"
#: ../gurpmi.pm:59 ../urpmi:75 ../urpmq:48
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - pilih paket secara otomatis untuk mengupgrade sistem.\n"
+msgstr ""
+" --auto-select - pilih paket secara otomatis untuk mengupgrade sistem.\n"
#: ../gurpmi.pm:60 ../urpme:46 ../urpmi:100 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - paksa permohonan bahkan jika beberapa paket tidak ada.\n"
+msgstr ""
+" --force - paksa permohonan bahkan jika beberapa paket tidak ada.\n"
#: ../gurpmi.pm:61 ../urpmi:131
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr " --verify-rpm - periksa tanda tangan rpm sebelum instalasi\n (--no-verify-rpm akan mematikannya, defaultnya adalah dihidupkan).\n"
+msgstr ""
+" --verify-rpm - periksa tanda tangan rpm sebelum instalasi\n"
+" (--no-verify-rpm akan mematikannya, defaultnya adalah "
+"dihidupkan).\n"
#: ../gurpmi.pm:63 ../urpmf:36 ../urpmi:68 ../urpmq:43
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
-msgstr " --media - hanya gunakan media yang diberikan, dipisahkan dengan koma.\n"
+msgstr ""
+" --media - hanya gunakan media yang diberikan, dipisahkan dengan "
+"koma.\n"
#: ../gurpmi.pm:64 ../urpmi:147
#, c-format
msgid " -p - allow search in provides to find package.\n"
-msgstr " -p - izinkan pencarian di yang disediakan untuk menemukan paket.\n"
+msgstr ""
+" -p - izinkan pencarian di yang disediakan untuk menemukan "
+"paket.\n"
#: ../gurpmi.pm:65 ../urpmi:148
#, c-format
msgid " -P - do not search in provides to find package.\n"
-msgstr " -P - jangan cari di yang disediakan untuk menemukan paket.\n"
+msgstr ""
+" -P - jangan cari di yang disediakan untuk menemukan paket.\n"
#: ../gurpmi.pm:66 ../urpmi:107 ../urpmq:67
#, c-format
@@ -203,168 +240,177 @@ msgstr " --root - gunakan root lain untuk instalasi rpm.\n"
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
-msgstr " --test - hanya verifikasi jika instalasi bisa tercapai dengan benar.\n"
+msgstr ""
+" --test - hanya verifikasi jika instalasi bisa tercapai dengan "
+"benar.\n"
#: ../gurpmi.pm:68 ../urpmi:71
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --searchmedia - hanya gunakan media yang diberikan untuk mencari paket yang diminta.\n"
+msgstr ""
+" --searchmedia - hanya gunakan media yang diberikan untuk mencari paket "
+"yang diminta.\n"
#: ../gurpmi.pm:115
#, c-format
msgid "No packages specified"
msgstr "Tidak ada paket yang ditentukan"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Harus root"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Menyiapkan instalasi paket..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
-msgstr "Beberapa paket yang diminta tidak bisa diinstall:\n%s"
+msgstr ""
+"Beberapa paket yang diminta tidak bisa diinstall:\n"
+"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s\n"
"Continue installation anyway?"
-msgstr "Beberapa paket yang diminta tidak bisa diinstall:\n%s\nLanjutkan saja instalasi?"
+msgstr ""
+"Beberapa paket yang diminta tidak bisa diinstall:\n"
+"%s\n"
+"Lanjutkan saja instalasi?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Peringatan"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (untuk upgrade)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (untuk install)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Pilihan paket"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Satu dari paket berikut diperlukan:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "B_atalkan"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s\n"
"Continue installation anyway?"
-msgstr "Paket berikut harus dihapus agar yang lain bisa diupgrade:\n%s\nLanjutkan saja instalasi?"
+msgstr ""
+"Paket berikut harus dihapus agar yang lain bisa diupgrade:\n"
+"%s\n"
+"Lanjutkan saja instalasi?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "%s dari ruang disk tambahan akan digunakan."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "%s dari ruang disk akan bebas."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s paket akan diambil."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Lanjutkan instalasi %d paket?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Untuk memenuhi dependensi, paket berikut akan diinstall:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Untuk memenuhi dependensi, paket berikut akan diinstall:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "tidak bisa mendapatkan paket sumber, membatalkan"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Silakan masukkan media bernama \"%s\""
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr "Terjadi error:"
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "Selesai"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
-msgstr "Instalasi gagal, beberapa file tidak ada:\n%s"
+msgstr ""
+"Instalasi gagal, beberapa file tidak ada:\n"
+"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Anda mungkin ingin mengupdate basis data uprmi Anda."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Instalasi gagal:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Paket sudah terinstall"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Instalasi selesai"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "merestart urpmi"
@@ -374,7 +420,9 @@ msgstr "merestart urpmi"
msgid ""
"usage: %s [options]\n"
"where [options] are from\n"
-msgstr "penggunaan: %s [opsi]\ndi mana [opsi] adalah dari\n"
+msgstr ""
+"penggunaan: %s [opsi]\n"
+"di mana [opsi] adalah dari\n"
#: ../rpm-find-leaves:17
#, c-format
@@ -436,7 +484,7 @@ msgstr "Tidak bisa mendownload paket ke %s"
msgid "Environment directory %s does not exist"
msgstr "Direktori lingkungan %s tidak ada"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "menggunakan lingkungan spesifik pada %s\n"
@@ -491,72 +539,81 @@ msgstr "error meregister paket lokal"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Operasi ini dilarang ketika berjalan dalam mode terbatas"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "pernyataan proxy salah pada baris perintah\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: tidak bisa membaca file rpm \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "ekspresi %s tak terduga"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "tidak ada ekspresi sebelum %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "ekspresi %s tak terduga (saran: gunakan -a atau -o ?)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "tidak ada ekspresi untuk ditutup"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
-msgstr "secara default urpmf menunggu regexp. Anda harus menggunakan opsi \"--literal\""
+msgstr ""
+"secara default urpmf menunggu regexp. Anda harus menggunakan opsi \"--literal"
+"\""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "direktori chroot tidak ada"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "Tidak bisa menggunakan %s tanpa %s"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "Tidak bisa menggunakan %s dengan %s"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "Terlalu banyak argumen\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
"%s\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 "%s versi %s\n%s\nIni adalah free software dan boleh didistribusikan di bawah ketentuan GNU GPL.\n\npenggunaan:\n"
+msgstr ""
+"%s versi %s\n"
+"%s\n"
+"Ini adalah free software dan boleh didistribusikan di bawah ketentuan GNU "
+"GPL.\n"
+"\n"
+"penggunaan:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Hak Cipta (C) %s oleh %s"
@@ -571,7 +628,9 @@ msgstr "Penyalinan gagal"
msgid ""
"You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done "
"automatically)"
-msgstr "Anda harus memount CD-ROM sendiri (atau install perl-Hal-Cdroms agar bisa dilakukan secara otomatis)"
+msgstr ""
+"Anda harus memount CD-ROM sendiri (atau install perl-Hal-Cdroms agar bisa "
+"dilakukan secara otomatis)"
#: ../urpm/cdrom.pm:82
#, c-format
@@ -603,7 +662,7 @@ msgstr "tidak bisa membaca file config [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "media `%s' ditetapkan dua kali, membatalkan"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "tidak bisa menulis file config [%s]"
@@ -782,7 +841,9 @@ msgstr "menghapus paket %s"
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "membuat transaksi untuk menginstall pada %s (hapus=%d, install=%d, upgrade=%d)"
+msgstr ""
+"membuat transaksi untuk menginstall pada %s (hapus=%d, install=%d, upgrade="
+"%d)"
#: ../urpm/install.pm:344
#, c-format
@@ -859,14 +920,20 @@ msgstr "Anda mungkin perlu mengupdate basis data urpmi."
msgid ""
"Installation failed, bad rpms:\n"
"%s"
-msgstr "Instalasi gagal, rpm rusak:\n%s"
+msgstr ""
+"Instalasi gagal, rpm rusak:\n"
+"%s"
#: ../urpm/main_loop.pm:108
#, c-format
msgid ""
-"There is not enough space on your filesystem to download all packages (%s needed, %s available).\n"
+"There is not enough space on your filesystem to download all packages (%s "
+"needed, %s available).\n"
"Are you sure you want to continue?"
-msgstr "Tidak ada cukup ruang pada sistem file Anda untuk mendownload semua paket (%s diperlukan, %s tersedia).\nApakah Anda yakin ingin melanjutkan?"
+msgstr ""
+"Tidak ada cukup ruang pada sistem file Anda untuk mendownload semua paket "
+"(%s diperlukan, %s tersedia).\n"
+"Apakah Anda yakin ingin melanjutkan?"
#: ../urpm/main_loop.pm:138
#, c-format
@@ -982,9 +1049,11 @@ msgstr "menggunakan media terkait untuk mode paralel: %s"
#: ../urpm/media.pm:673
#, c-format
msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, "
-"--update, --use-distrib or --parallel"
-msgstr "--synthesis tidak bisa digunakan dengan --media, --excludemedia, --sortmedia, --update, --use-distrib atau --parallel"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update, --use-distrib or --parallel"
+msgstr ""
+"--synthesis tidak bisa digunakan dengan --media, --excludemedia, --"
+"sortmedia, --update, --use-distrib atau --parallel"
#: ../urpm/media.pm:786
#, c-format
@@ -994,12 +1063,16 @@ msgstr "mengabaikan media non-free `%s'"
#: ../urpm/media.pm:795
#, c-format
msgid "un-ignoring non-free medium `%s' b/c nonfree packages are installed"
-msgstr "tidak mengabaikan media non-free `%s' karena paket-paket nonfree sudah terinstall"
+msgstr ""
+"tidak mengabaikan media non-free `%s' karena paket-paket nonfree sudah "
+"terinstall"
#: ../urpm/media.pm:799
#, c-format
msgid "un-ignoring tainted medium `%s' b/c tainted packages are installed"
-msgstr "tidak mengabaikan media tanted `%s' karena paket-paket tainted sudah terinstall"
+msgstr ""
+"tidak mengabaikan media tanted `%s' karena paket-paket tainted sudah "
+"terinstall"
#: ../urpm/media.pm:827
#, c-format
@@ -1059,7 +1132,9 @@ msgstr "tidak bisa mengurai media.cfg"
#: ../urpm/media.pm:1127
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
-msgstr "tidak bisa mengakses media distribusi (tidak ada file media.cfg yang ditemukan)"
+msgstr ""
+"tidak bisa mengakses media distribusi (tidak ada file media.cfg yang "
+"ditemukan)"
#: ../urpm/media.pm:1149
#, c-format
@@ -1284,8 +1359,8 @@ msgstr "Arsitektur"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(disarankan)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -1337,7 +1412,10 @@ msgid_plural ""
"The following packages:\n"
"%s\n"
"are now orphaned."
-msgstr[0] "Paket-paket berikut:\n%s\nsudah tidak dibutuhkan."
+msgstr[0] ""
+"Paket-paket berikut:\n"
+"%s\n"
+"sudah tidak dibutuhkan."
#: ../urpm/orphans.pm:530
#, c-format
@@ -1350,12 +1428,18 @@ msgstr[0] "Anda mungkin ingin menghapus semuanya."
msgid ""
"The following package:\n"
"%s\n"
-"is now orphaned, if you wish to remove it, you can use \"urpme --auto-orphans\""
+"is now orphaned, if you wish to remove it, you can use \"urpme --auto-orphans"
+"\""
msgid_plural ""
"The following packages:\n"
"%s\n"
-"are now orphaned, if you wish to remove them, you can use \"urpme --auto-orphans\""
-msgstr[0] "Paket-paket berikut:\n%s\nsudah tidak dibutuhkan, jika Anda ingin menghapus semuanya, gunakan \"urpme --auto-orphans\""
+"are now orphaned, if you wish to remove them, you can use \"urpme --auto-"
+"orphans\""
+msgstr[0] ""
+"Paket-paket berikut:\n"
+"%s\n"
+"sudah tidak dibutuhkan, jika Anda ingin menghapus semuanya, gunakan \"urpme "
+"--auto-orphans\""
#: ../urpm/parallel.pm:15
#, c-format
@@ -1410,9 +1494,11 @@ msgstr "cp gagal pada host %s (%d)"
#: ../urpm/parallel_ssh.pm:84
#, c-format
msgid ""
-"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit"
-" code: %d)"
-msgstr "%s gagal pada host %s (mungkin tidak memiliki versi urpmi yang bagus?) (kode keluar: %d)"
+"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
+"code: %d)"
+msgstr ""
+"%s gagal pada host %s (mungkin tidak memiliki versi urpmi yang bagus?) (kode "
+"keluar: %d)"
#: ../urpm/removable.pm:46
#, c-format
@@ -1495,14 +1581,18 @@ msgstr "untuk menjaga %s"
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgstr "Paket berikut harus dihapus agar yang lain bisa diupgrade:\n%s"
+msgstr ""
+"Paket berikut harus dihapus agar yang lain bisa diupgrade:\n"
+"%s"
#: ../urpm/select.pm:675
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s"
-msgstr "Paket berikut harus dihapus agar yang lain bisa diupgrade:\n%s"
+msgstr ""
+"Paket berikut harus dihapus agar yang lain bisa diupgrade:\n"
+"%s"
#: ../urpm/select.pm:702
#, c-format
@@ -1597,7 +1687,8 @@ msgstr " --auto-orphans - hapus orphans\n"
#: ../urpme:45
#, c-format
msgid " --test - verify if the removal can be achieved correctly.\n"
-msgstr " --test - periksa jika penghapusan bisa dicapai dengan benar.\n"
+msgstr ""
+" --test - periksa jika penghapusan bisa dicapai dengan benar.\n"
#: ../urpme:47 ../urpmi:106 ../urpmq:66
#, c-format
@@ -1630,7 +1721,9 @@ msgstr " --noscripts - jangan eksekusi skrip paket.\n"
msgid ""
" --use-distrib - configure urpme on the fly from a distrib tree, useful\n"
" to (un)install a chroot with --root option.\n"
-msgstr " --use-distrib - konfigurasi urpme secara langsung dari pohon distrib,\n berguna untuk (un)install chroot dengan opsi --root.\n"
+msgstr ""
+" --use-distrib - konfigurasi urpme secara langsung dari pohon distrib,\n"
+" berguna untuk (un)install chroot dengan opsi --root.\n"
#: ../urpme:54 ../urpmi:150 ../urpmq:87
#, c-format
@@ -1715,24 +1808,30 @@ msgstr " --version - tampilkan nomor versi alat ini.\n"
#: ../urpmf:32 ../urpmi:130 ../urpmq:78
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
-msgstr " --env - gunakan lingkungan spesifik (biasanya laporan bug).\n"
+msgstr ""
+" --env - gunakan lingkungan spesifik (biasanya laporan bug).\n"
#: ../urpmf:33 ../urpmi:69 ../urpmq:45
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
-msgstr " --excludemedia - jangan gunakan media yang diberikan, dipisahkan dengan koma.\n"
+msgstr ""
+" --excludemedia - jangan gunakan media yang diberikan, dipisahkan dengan "
+"koma.\n"
#: ../urpmf:34
#, c-format
msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
-msgstr " --literal, -l - jangan cocokkan pola, gunakan argumen sebagai string literal.\n"
+msgstr ""
+" --literal, -l - jangan cocokkan pola, gunakan argumen sebagai string "
+"literal.\n"
#: ../urpmf:37 ../urpmi:72 ../urpmq:46
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
-msgstr " --sortmedia - urutkan media menurut substring dipisahkan dengan koma.\n"
+msgstr ""
+" --sortmedia - urutkan media menurut substring dipisahkan dengan koma.\n"
#: ../urpmf:38
#, c-format
@@ -1767,7 +1866,9 @@ msgstr " -i - abaikan perbedaan huruf besar/kecil pada pola.\n"
#: ../urpmf:44
#, c-format
msgid " -I - honor case distinctions in patterns (default).\n"
-msgstr " -I - berlakukan perbedaan huruf besar/kecil pada pola (default).\n"
+msgstr ""
+" -I - berlakukan perbedaan huruf besar/kecil pada pola "
+"(default).\n"
#: ../urpmf:45
#, c-format
@@ -1782,7 +1883,8 @@ msgstr "Pola ekspresi:\n"
#: ../urpmf:47
#, c-format
msgid " text - any text is parsed as a regexp, unless -l is used.\n"
-msgstr " text - teks apapun diurai sebagai regexp, kecuali -l digunakan.\n"
+msgstr ""
+" text - teks apapun diurai sebagai regexp, kecuali -l digunakan.\n"
#: ../urpmf:48
#, c-format
@@ -1920,9 +2022,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - nama rpm sumber\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - tag yang disarankan\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - tag yang diperlukan\n"
#: ../urpmf:76
#, c-format
@@ -1947,29 +2049,30 @@ msgstr " -m - media di mana paket ditemukan\n"
#: ../urpmf:80 ../urpmq:97
#, c-format
msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - tampilkan versi, rilis dan arsitektur dengan nama.\n"
+msgstr ""
+" -f - tampilkan versi, rilis dan arsitektur dengan nama.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "ekspresi tidak tuntas (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Format salah: Anda hanya boleh menggunakan satu tag multi nilai"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "tidak ada hdlist yang tersedia untuk media \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "tidak ada synthesis yang tersedia untuk media \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "tidak ada info xml yang tersedia untuk media \"%s\""
@@ -1995,8 +2098,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - hapus orphan tanpa bertanya\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --no-suggests - jangan pilih otomatis paket \"disarankan\".\n"
#: ../urpmi:81
@@ -2004,7 +2107,8 @@ msgstr " --no-suggests - jangan pilih otomatis paket \"disarankan\".\n"
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
-msgstr " --no-uninstall - jangan tanya untuk uninstall paket, batalkan instalasi.\n"
+msgstr ""
+" --no-uninstall - jangan tanya untuk uninstall paket, batalkan instalasi.\n"
#: ../urpmi:82
#, c-format
@@ -2016,7 +2120,9 @@ msgstr " --no-install - jangan install paket (hanya download)\n"
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
-msgstr " --keep - pertahankan paket yang ada jika memungkinkan, tolak\n paket yang mengarah pada penghapusan.\n"
+msgstr ""
+" --keep - pertahankan paket yang ada jika memungkinkan, tolak\n"
+" paket yang mengarah pada penghapusan.\n"
#: ../urpmi:85
#, c-format
@@ -2024,7 +2130,10 @@ msgid ""
" --split-level - split in small transaction if more than given packages\n"
" are going to be installed or upgraded,\n"
" default is %d.\n"
-msgstr " --split-level - pisahkan transaksi jika paket yang akan diinstall atau\n upgrade lebih banyak dari apa yang diberikan,\n default adalah %d.\n"
+msgstr ""
+" --split-level - pisahkan transaksi jika paket yang akan diinstall atau\n"
+" upgrade lebih banyak dari apa yang diberikan,\n"
+" default adalah %d.\n"
#: ../urpmi:89
#, c-format
@@ -2061,7 +2170,9 @@ msgstr " --noclean - jangan bersihkan rpm dari cache.\n"
msgid ""
" --downgrade - downgrade a package from the version currently installed\n"
" to the previously highest version\n"
-msgstr " --downgrade - turunkan paket dari versi yang saat ini terinstall ke\n versi tertinggi sebelumnya\n"
+msgstr ""
+" --downgrade - turunkan paket dari versi yang saat ini terinstall ke\n"
+" versi tertinggi sebelumnya\n"
#: ../urpmi:99
#, c-format
@@ -2074,18 +2185,22 @@ msgstr " --replacepkgs - paksa menginstall paket yang sudah terinstall.\n"
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
" dependencies checking.\n"
-msgstr " --allow-nodeps - izinkan menanyakan pengguna untuk menginstall\n paket tanpa pemeriksaan dependensi.\n"
+msgstr ""
+" --allow-nodeps - izinkan menanyakan pengguna untuk menginstall\n"
+" paket tanpa pemeriksaan dependensi.\n"
#: ../urpmi:103
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
" dependencies checking and integrity.\n"
-msgstr " --allow-force - izinkan menanyakan pengguna untuk menginstall paket\n tanpa pemeriksaan dependensi dan integritas.\n"
+msgstr ""
+" --allow-force - izinkan menanyakan pengguna untuk menginstall paket\n"
+" tanpa pemeriksaan dependensi dan integritas.\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --allow-suggests - pilih otomatis paket \"disarankan\".\n"
#: ../urpmi:109
@@ -2093,7 +2208,9 @@ msgstr " --allow-suggests - pilih otomatis paket \"disarankan\".\n"
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 - konfigurasi urpmi langsung dari pohon distrib, berguna\n untuk menginstall chroot dengan opsi --root.\n"
+msgstr ""
+" --use-distrib - konfigurasi urpmi langsung dari pohon distrib, berguna\n"
+" untuk menginstall chroot dengan opsi --root.\n"
#: ../urpmi:111 ../urpmi.addmedia:60 ../urpmi.update:37
#, c-format
@@ -2105,14 +2222,18 @@ msgstr " --metalink - buat dan gunakan metalink lokal.\n"
msgid ""
" --download-all - download all needed packages before trying to install "
"them\n"
-msgstr " --download-all - download semua paket yang diperlukan sebelum mencoba menginstall\n"
+msgstr ""
+" --download-all - download semua paket yang diperlukan sebelum mencoba "
+"menginstall\n"
#: ../urpmi:113
#, c-format
msgid ""
" --downloader - program to use to retrieve distant files. \n"
" known programs: %s\n"
-msgstr " --downloader - program yang digunakan untuk mengambil file \n yang jauh. program yang diketahui: %s\n"
+msgstr ""
+" --downloader - program yang digunakan untuk mengambil file \n"
+" yang jauh. program yang diketahui: %s\n"
#: ../urpmi:116
#, c-format
@@ -2149,28 +2270,38 @@ msgstr " --limit-rate - batasi kecepatan download.\n"
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
" (--no-resume disables it, default is disabled).\n"
-msgstr " --resume - resume transfer file yang terdownload sebagian\n (--no-resume akan mematikannya, defaultnya mati).\n"
+msgstr ""
+" --resume - resume transfer file yang terdownload sebagian\n"
+" (--no-resume akan mematikannya, defaultnya mati).\n"
#: ../urpmi:124 ../urpmi.addmedia:62 ../urpmi.update:39 ../urpmq:74
#, 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 " --proxy - gunakan proxy HTTP yang ditentukan, nomor port diasumsikan\n 1080 sebagai default (formatnya adalah <proxyhost[:port]>).\n"
+msgstr ""
+" --proxy - gunakan proxy HTTP yang ditentukan, nomor port "
+"diasumsikan\n"
+" 1080 sebagai default (formatnya adalah <proxyhost[:"
+"port]>).\n"
#: ../urpmi:126 ../urpmi.addmedia:64 ../urpmi.update:41 ../urpmq:76
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
" authentication (format is <user:password>).\n"
-msgstr " --proxy-user - tentukan pengguna dan sandi yang digunakan untuk\n otentikasi proxy (formatnya adalah <user:password>).\n"
+msgstr ""
+" --proxy-user - tentukan pengguna dan sandi yang digunakan untuk\n"
+" otentikasi proxy (formatnya adalah <user:password>).\n"
#: ../urpmi:128
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
" next arg.\n"
-msgstr " --bug - tampilkan laporan bug dalam direktori yang\n diindikasikan dengan arg. berikutnya\n"
+msgstr ""
+" --bug - tampilkan laporan bug dalam direktori yang\n"
+" diindikasikan dengan arg. berikutnya\n"
#: ../urpmi:134
#, c-format
@@ -2190,7 +2321,9 @@ msgstr " --ignoresize - jangan verifikasi ruang disk sebelum instalasi.\n"
#: ../urpmi:137
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
-msgstr " --ignorearch - izinkan menginstall rpm untuk arsitektur yang tidak cocok.\n"
+msgstr ""
+" --ignorearch - izinkan menginstall rpm untuk arsitektur yang tidak "
+"cocok.\n"
#: ../urpmi:138
#, c-format
@@ -2217,7 +2350,9 @@ msgstr " --prefer - paket yang lebih disukai\n"
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
-msgstr " --more-choices - ketika beberapa paket ditemukan, usulkan lebih banyak\n pilihan daripada default.\n"
+msgstr ""
+" --more-choices - ketika beberapa paket ditemukan, usulkan lebih banyak\n"
+" pilihan daripada default.\n"
#: ../urpmi:144
#, c-format
@@ -2247,24 +2382,29 @@ msgstr " --debug - mode verbose .\n"
#: ../urpmi:152
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
-msgstr " nama atau file rpm yang diberikan pada baris perintah akan diinstall.\n"
+msgstr ""
+" nama atau file rpm yang diberikan pada baris perintah akan diinstall.\n"
#: ../urpmi:180
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
-msgstr "Error: tidak bisa menggunakan --auto-select bersama dengan daftar paket.\n"
+msgstr ""
+"Error: tidak bisa menggunakan --auto-select bersama dengan daftar paket.\n"
#: ../urpmi:187
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
-msgstr "Error: Untuk membuat laporan bug, tentukan argumen baris perntah umum\nbersama dengan --bug.\n"
+msgstr ""
+"Error: Untuk membuat laporan bug, tentukan argumen baris perntah umum\n"
+"bersama dengan --bug.\n"
#: ../urpmi:217
#, c-format
msgid "You can't install binary rpm files when using --install-src"
-msgstr "Anda tidak bisa menginstall file rpm binari ketika menggunakan --install-src"
+msgstr ""
+"Anda tidak bisa menginstall file rpm binari ketika menggunakan --install-src"
#: ../urpmi:218
#, c-format
@@ -2280,14 +2420,18 @@ msgstr "mengembalikan ke --buildrequires"
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "silakan gunakan --buildrequires atau --install-src, mengembalikan ke --buildrequires"
+msgstr ""
+"silakan gunakan --buildrequires atau --install-src, mengembalikan ke --"
+"buildrequires"
#: ../urpmi:250
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
-msgstr "Direktori [%s] sudah ada, silakan gunakan direktori lain untuk laporan bug atau menghapusnya"
+msgstr ""
+"Direktori [%s] sudah ada, silakan gunakan direktori lain untuk laporan bug "
+"atau menghapusnya"
#: ../urpmi:251
#, c-format
@@ -2299,7 +2443,9 @@ msgstr "Tidak bisa membuat direktori [%s] untuk laporan bug"
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
-msgstr "Error: %s tampaknya dimount hanya-baca.\nGunakan --allow-force untuk memaksakan operasi."
+msgstr ""
+"Error: %s tampaknya dimount hanya-baca.\n"
+"Gunakan --allow-force untuk memaksakan operasi."
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
#: ../urpmi:426
@@ -2343,7 +2489,10 @@ msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgstr "Paket berikut tidak bisa diinstall karena bergantung pada paket yang lebih\nlama dari yang terinstall:\n%s"
+msgstr ""
+"Paket berikut tidak bisa diinstall karena bergantung pada paket yang lebih\n"
+"lama dari yang terinstall:\n"
+"%s"
#: ../urpmi:487
#, c-format
@@ -2351,14 +2500,19 @@ msgid ""
"The following packages can't be installed because they depend on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgstr "Paket berikut tidak bisa diinstall karena bergantung pada paket yang lebih\nlama dari yang terinstall:\n%s"
+msgstr ""
+"Paket berikut tidak bisa diinstall karena bergantung pada paket yang lebih\n"
+"lama dari yang terinstall:\n"
+"%s"
#: ../urpmi:493 ../urpmi:511
#, c-format
msgid ""
"\n"
"Continue installation anyway?"
-msgstr "\nLanjutkan saja instalasi?"
+msgstr ""
+"\n"
+"Lanjutkan saja instalasi?"
#: ../urpmi:494 ../urpmi:512 ../urpmi:627 ../urpmi.addmedia:136
#, c-format
@@ -2370,7 +2524,9 @@ msgstr " (Y/t) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgstr "Paket yang diminta tidak bisa diinstall:\n%s"
+msgstr ""
+"Paket yang diminta tidak bisa diinstall:\n"
+"%s"
#: ../urpmi:526
#, c-format
@@ -2383,7 +2539,10 @@ msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgstr "Instalasi tidak bisa dilanjutkan karena paket berikut harus\ndihapus agar yang lain bisa diupgrade:\n%s\n"
+msgstr ""
+"Instalasi tidak bisa dilanjutkan karena paket berikut harus\n"
+"dihapus agar yang lain bisa diupgrade:\n"
+"%s\n"
#: ../urpmi:536
#, c-format
@@ -2391,7 +2550,10 @@ msgid ""
"The installation cannot continue because the following packages\n"
"have to be removed for others to be upgraded:\n"
"%s\n"
-msgstr "Instalasi tidak bisa dilanjutkan karena paket berikut harus\ndihapus agar yang lain bisa diupgrade:\n%s\n"
+msgstr ""
+"Instalasi tidak bisa dilanjutkan karena paket berikut harus\n"
+"dihapus agar yang lain bisa diupgrade:\n"
+"%s\n"
#: ../urpmi:544
#, c-format
@@ -2401,9 +2563,13 @@ msgstr "(hanya tes, penghapusan tidak akan dilakukan)"
#: ../urpmi:563
#, c-format
msgid ""
-"You must first call urpmi with --buildrequires to install the following dependencies:\n"
+"You must first call urpmi with --buildrequires to install the following "
+"dependencies:\n"
+"%s\n"
+msgstr ""
+"Anda harus menggunakan urpmi dengan --buildrequires terlebih dahulu untuk "
+"menginstall dependensi berikut:\n"
"%s\n"
-msgstr "Anda harus menggunakan urpmi dengan --buildrequires terlebih dahulu untuk menginstall dependensi berikut:\n%s\n"
#: ../urpmi:573
#, c-format
@@ -2414,7 +2580,8 @@ msgstr[0] "Paket-paket yang sudah tidak diperlukan berikut akan dihapus."
#: ../urpmi:597
#, c-format
msgid "WARNING: %s option is in use. Some strange problems may happen"
-msgstr "PERINGATAN: opsi %s sedang digunakan. Beberapa masalah aneh mungkin terjadi"
+msgstr ""
+"PERINGATAN: opsi %s sedang digunakan. Beberapa masalah aneh mungkin terjadi"
#: ../urpmi:609
#, c-format
@@ -2426,10 +2593,8 @@ msgstr "(hanya tes, instalasi tidak akan dilakukan)"
msgid "Press Enter when mounted..."
msgstr "Tekan Enter ketika termount..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not
-#. be translated!
-#. -PO: neither the ``with''. Only what is between <brackets> can be
-#. translated.
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
+#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, c-format
msgid ""
@@ -2452,7 +2617,26 @@ msgid ""
"\n"
"\n"
"and [options] are from\n"
-msgstr "penggunaan: urpmi.addmedia [opsi] <name> <url>\ndi mana <url> adalah satu dari\n [file:/]/<path>\n ftp://<login>:<password>@<host>/<path>\n ftp://<host>/<path>\n http://<host>/<path>\n cdrom://<path>\n\npenggunaan: urpmi.addmedia [opsi] --distrib --mirrorlist <url>\npenggunaan: urpmi.addmedia [opsi] --mirrorlist <url> <name> <relative path>\n\ncontoh:\n\n urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST'\n urpmi.addmedia --mirrorlist '$MIRRORLIST' backports media/main/backports\n urpmi.addmedia --distrib --zeroconf\n\n\ndan [opsi] adalah dari\n"
+msgstr ""
+"penggunaan: urpmi.addmedia [opsi] <name> <url>\n"
+"di mana <url> adalah satu dari\n"
+" [file:/]/<path>\n"
+" ftp://<login>:<password>@<host>/<path>\n"
+" ftp://<host>/<path>\n"
+" http://<host>/<path>\n"
+" cdrom://<path>\n"
+"\n"
+"penggunaan: urpmi.addmedia [opsi] --distrib --mirrorlist <url>\n"
+"penggunaan: urpmi.addmedia [opsi] --mirrorlist <url> <name> <relative path>\n"
+"\n"
+"contoh:\n"
+"\n"
+" urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST'\n"
+" urpmi.addmedia --mirrorlist '$MIRRORLIST' backports media/main/backports\n"
+" urpmi.addmedia --distrib --zeroconf\n"
+"\n"
+"\n"
+"dan [opsi] adalah dari\n"
#: ../urpmi.addmedia:56 ../urpmi.update:33 ../urpmq:71
#, c-format
@@ -2479,14 +2663,22 @@ msgstr " --aria2 - gunakan aria2 untuk mengambil file yang jauh.\n"
msgid ""
" --update - create an update medium, \n"
" or discard non-update media (when used with --distrib)\n"
-msgstr " --update - buat sebuah media update, \n atau buang media non-update (ketika digunakan dengan --distrib)\n"
+msgstr ""
+" --update - buat sebuah media update, \n"
+" atau buang media non-update (ketika digunakan dengan --"
+"distrib)\n"
#: ../urpmi.addmedia:68
#, c-format
msgid ""
" --xml-info - use the specific policy for downloading xml info files\n"
-" one of: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
-msgstr " --xml-info - gunakan kebijakan spesifik untuk mendownload file info xml\n satu dari: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+" one of: never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
+msgstr ""
+" --xml-info - gunakan kebijakan spesifik untuk mendownload file info "
+"xml\n"
+" satu dari: never, on-demand, update-only, always. cf "
+"urpmi.cfg(5)\n"
#: ../urpmi.addmedia:70
#, c-format
@@ -2508,17 +2700,21 @@ msgstr " --no-probe - jangan coba untuk menemukan file synthesis.\n"
msgid ""
" --distrib - automatically create all media from an installation\n"
" medium.\n"
-msgstr " --distrib - secara otomatis membuat semua media dari media\n instalasi.\n"
+msgstr ""
+" --distrib - secara otomatis membuat semua media dari media\n"
+" instalasi.\n"
#: ../urpmi.addmedia:76
#, c-format
msgid " --interactive - with --distrib, ask confirmation for each media\n"
-msgstr " --interactive - dengan --distrib, tanyakan konfirmasi untuk setiap media\n"
+msgstr ""
+" --interactive - dengan --distrib, tanyakan konfirmasi untuk setiap media\n"
#: ../urpmi.addmedia:77
#, c-format
msgid " --all-media - with --distrib, add every listed media\n"
-msgstr " --all-media - dengan --distrib, tambahkan setiap media terdaftar\n"
+msgstr ""
+" --all-media - dengan --distrib, tambahkan setiap media terdaftar\n"
#: ../urpmi.addmedia:78
#, c-format
@@ -2538,7 +2734,9 @@ msgstr " --nopubkey - jangan impor pubkey dari media yang ditambahkan\n"
#: ../urpmi.addmedia:81
#, c-format
msgid " --raw - add the media in config, but don't update it.\n"
-msgstr " --raw - tambahkan media ke dalam konfigurasi, tapi jangan update.\n"
+msgstr ""
+" --raw - tambahkan media ke dalam konfigurasi, tapi jangan "
+"update.\n"
#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
#, c-format
@@ -2590,7 +2788,9 @@ msgstr "tidak perlu memberikan <relative path of synthesis> dengan --distrib"
msgid ""
"\n"
"Do you want to add media '%s'?"
-msgstr "\nApakah Anda ingin menambah media '%s'?"
+msgstr ""
+"\n"
+"Apakah Anda ingin menambah media '%s'?"
#: ../urpmi.addmedia:156 ../urpmi.addmedia:181
#, c-format
@@ -2612,7 +2812,9 @@ msgstr "Tidak bisa menggunakan %s dengan media remote"
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
-msgstr "penggunaan: urpmi.removemedia (-a | <name> ...)\ndi mana <name> adalah nama media yang akan dihapus.\n"
+msgstr ""
+"penggunaan: urpmi.removemedia (-a | <name> ...)\n"
+"di mana <name> adalah nama media yang akan dihapus.\n"
#: ../urpmi.removemedia:41
#, c-format
@@ -2639,14 +2841,18 @@ msgstr "tidak ada yang dihapus (gunakan urpmi.addmedia untuk menambah media)\n"
msgid ""
"the entry to remove is missing\n"
"(one of %s)\n"
-msgstr "entri untuk dihapus tidak ada\n(satu dari %s)\n"
+msgstr ""
+"entri untuk dihapus tidak ada\n"
+"(satu dari %s)\n"
#: ../urpmi.update:30
#, c-format
msgid ""
"usage: urpmi.update [options] <name> ...\n"
"where <name> is a medium name to update.\n"
-msgstr "penggunaan: urpmi.update [opsi] <name> ...\ndi mana <name> adalah nama media yang diupdate.\n"
+msgstr ""
+"penggunaan: urpmi.update [opsi] <name> ...\n"
+"di mana <name> adalah nama media yang diupdate.\n"
#: ../urpmi.update:43
#, c-format
@@ -2671,7 +2877,9 @@ msgstr " --no-ignore - jangan update, tandai media sebagai dihidupkan.\n"
#: ../urpmi.update:49
#, c-format
msgid " --probe-rpms - do not use synthesis, use rpm files directly\n"
-msgstr " --probe-rpms - jangan gunakan synthesis, gunakan file rpm secara langsung\n"
+msgstr ""
+" --probe-rpms - jangan gunakan synthesis, gunakan file rpm secara "
+"langsung\n"
#: ../urpmi.update:50
#, c-format
@@ -2696,14 +2904,17 @@ msgstr "Hanya superuser yang diizinkan mengupdate media"
#: ../urpmi.update:86
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "tidak ada yang diupdate (gunakan urpmi.addmedia untuk menambah media)\n"
+msgstr ""
+"tidak ada yang diupdate (gunakan urpmi.addmedia untuk menambah media)\n"
#: ../urpmi.update:87
#, c-format
msgid ""
"the entry to update is missing\n"
"(one of %s)\n"
-msgstr "entri untuk diupdate tidak ada\n(satu dari %s)\n"
+msgstr ""
+"entri untuk diupdate tidak ada\n"
+"(satu dari %s)\n"
#: ../urpmi.update:98
#, c-format
@@ -2723,9 +2934,11 @@ msgstr "menghidupkan media %s"
#: ../urpmq:44
#, c-format
msgid ""
-" --searchmedia - use only the given media to search requested (or updated)"
-" packages.\n"
-msgstr " --searchmedia - hanya gunakan media yang diberikan untuk mencari paket yang diminta (atau diupdate).\n"
+" --searchmedia - use only the given media to search requested (or updated) "
+"packages.\n"
+msgstr ""
+" --searchmedia - hanya gunakan media yang diberikan untuk mencari paket "
+"yang diminta (atau diupdate).\n"
#: ../urpmq:49
#, c-format
@@ -2737,7 +2950,9 @@ msgstr " --auto-orphans - daftar orphan\n"
msgid ""
" --not-available\n"
" - list installed packages not available on any media.\n"
-msgstr " --not-available\n - daftar paket terinstall yang tidak tersedia pada media.\n"
+msgstr ""
+" --not-available\n"
+" - daftar paket terinstall yang tidak tersedia pada media.\n"
#: ../urpmq:53
#, c-format
@@ -2762,7 +2977,8 @@ msgstr " --list-url - daftar media yang tersedia beserta url-nya.\n"
#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
-msgstr " --list-nodes - daftar node yang tersedia ketika menggunakan --parallel.\n"
+msgstr ""
+" --list-nodes - daftar node yang tersedia ketika menggunakan --parallel.\n"
#: ../urpmq:60
#, c-format
@@ -2771,13 +2987,16 @@ msgstr " --list-aliases - daftar alias paralel yang tersedia.\n"
#: ../urpmq:61
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
-msgstr " --dump-config - dump konfigurasi dalam bentuk argumen urpmi.addmedia.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+" --dump-config - dump konfigurasi dalam bentuk argumen urpmi.addmedia.\n"
#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
-msgstr " --src - paket berikutnya adalah paket sumber (sama dengan -s).\n"
+msgstr ""
+" --src - paket berikutnya adalah paket sumber (sama dengan -s).\n"
#: ../urpmq:63
#, c-format
@@ -2787,14 +3006,17 @@ msgstr " --sources - tampilkan URL sumber dari paket yang dipilih\n"
#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
-msgstr " --ignorearch - izinkan query rpm untuk arsitektur yang tidak cocok.\n"
+msgstr ""
+" --ignorearch - izinkan query rpm untuk arsitektur yang tidak cocok.\n"
#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
-msgstr " --use-distrib - konfigurasi urpmi langsung dari pohon distrib.\n Ini mengizinkan query distro.\n"
+msgstr ""
+" --use-distrib - konfigurasi urpmi langsung dari pohon distrib.\n"
+" Ini mengizinkan query distro.\n"
#: ../urpmq:79
#, c-format
@@ -2822,9 +3044,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - tampilkan yang diperlukan.\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - tampilkan yang disarankan.\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - tampilkan yang diperlukan.\n"
#: ../urpmq:85
#, c-format
@@ -2841,7 +3063,9 @@ msgstr " --summary, -S - tampilkan ringkasan.\n"
msgid ""
" --requires-recursive, -d\n"
" - query package dependencies.\n"
-msgstr " --requires-recursive, -d\n - query dependensi paket.\n"
+msgstr ""
+" --requires-recursive, -d\n"
+" - query dependensi paket.\n"
#: ../urpmq:90
#, c-format
@@ -2853,14 +3077,19 @@ msgstr " --whatrequires - pencarian terbalik apa yang membutuhkan paket.\n"
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
-msgstr " --whatrequires-recursive\n - pencarian terbalik yang diperluas (termasuk paket virtual).\n"
+msgstr ""
+" --whatrequires-recursive\n"
+" - pencarian terbalik yang diperluas (termasuk paket "
+"virtual).\n"
#: ../urpmq:93
#, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
-msgstr " --whatprovides, -p\n - cari di yang disediakan untuk menemukan paket.\n"
+msgstr ""
+" --whatprovides, -p\n"
+" - cari di yang disediakan untuk menemukan paket.\n"
#: ../urpmq:96
#, c-format
@@ -2875,7 +3104,9 @@ msgstr " -g - tampilkan grup dengan nama juga.\n"
#: ../urpmq:99
#, c-format
msgid " -i - print useful information in human readable form.\n"
-msgstr " -i - tampilkan informasi yang berguna dalam bentuk yang mudah dibaca.\n"
+msgstr ""
+" -i - tampilkan informasi yang berguna dalam bentuk yang mudah "
+"dibaca.\n"
#: ../urpmq:100
#, c-format
@@ -2895,14 +3126,17 @@ msgstr " -r - tampilkan versi dan rilis dengan nama juga.\n"
#: ../urpmq:103
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
-msgstr " -s - paket berikutnya adalah paket sumber (sama dengan --src).\n"
+msgstr ""
+" -s - paket berikutnya adalah paket sumber (sama dengan --"
+"src).\n"
#: ../urpmq:104
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
-msgstr " -u - hapus paket jika versi paling baru sudah terinstall.\n"
+msgstr ""
+" -u - hapus paket jika versi paling baru sudah terinstall.\n"
#: ../urpmq:105
#, c-format
@@ -2912,12 +3146,15 @@ msgstr " -y - lakukan pencarian fuzzy (sama dengan --fuzzy).\n"
#: ../urpmq:106
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
-msgstr " -Y - seperti -y, tapi paksa untuk mencocokkan case-insensitively.\n"
+msgstr ""
+" -Y - seperti -y, tapi paksa untuk mencocokkan case-"
+"insensitively.\n"
#: ../urpmq:107
#, c-format
msgid " names or rpm files given on command line are queried.\n"
-msgstr " nama atau file rpm yang diberikan pada baris perintah yang diquery.\n"
+msgstr ""
+" nama atau file rpm yang diberikan pada baris perintah yang diquery.\n"
#: ../urpmq:154
#, c-format
@@ -2937,22 +3174,30 @@ msgstr "gunakan -l untuk mendaftar file"
#: ../urpmq:415
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
-msgstr "tidak ada info xml untuk media \"%s\", hanya sebagian hasil untuk paket %s"
+msgstr ""
+"tidak ada info xml untuk media \"%s\", hanya sebagian hasil untuk paket %s"
#: ../urpmq:416
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
-msgstr "tidak ada info xml untuk media \"%s\", hanya sebagian hasil untuk paket %s"
+msgstr ""
+"tidak ada info xml untuk media \"%s\", hanya sebagian hasil untuk paket %s"
#: ../urpmq:419
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "tidak ada info xml untuk media \"%s\", tidak bisa mengembalikan hasil apapun untuk paket %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
+msgstr ""
+"tidak ada info xml untuk media \"%s\", tidak bisa mengembalikan hasil apapun "
+"untuk paket %s"
#: ../urpmq:420
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
-msgstr "tidak ada info xml untuk media \"%s\", tidak bisa mengembalikan hasil apapun untuk paket %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"tidak ada info xml untuk media \"%s\", tidak bisa mengembalikan hasil apapun "
+"untuk paket %s"
#: ../urpmq:487
#, c-format
@@ -2974,3 +3219,12 @@ msgstr "Jalankan Installer Paket Mageia"
#: ../polkit/org.mageia.gurpmi2.policy.in.h:2
msgid "Authentication is required to run Mageia Package Installer"
msgstr "Otentikasi diperlukan untuk menjalankan Installer Paket Mageia"
+
+#~ msgid "(suggested)"
+#~ msgstr "(disarankan)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - tag yang disarankan\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - tampilkan yang disarankan.\n"
diff --git a/po/is.po b/po/is.po
index 71987e22..8bc1f7d8 100644
--- a/po/is.po
+++ b/po/is.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2009-03-30 17:08+0000\n"
"Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
"Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -59,7 +59,7 @@ msgstr "Set inn pakka `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Sæki pakka `%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Hætta við"
@@ -71,22 +71,22 @@ msgstr "Hætta við"
msgid "...retrieving failed: %s"
msgstr "...mistókst að sækja: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "RPM innsetning"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Villa: finn ekki skrá %s, mun stöðva aðgerð"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "Í _lagi"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -107,7 +107,7 @@ msgstr ""
"\n"
"Hvað vilt þú gera?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -123,7 +123,7 @@ msgstr ""
"\n"
"Halda áfram?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -138,26 +138,31 @@ msgstr ""
"\n"
"Þú vilt kannski frekar aðeins vista pakkana. Hvað velur þú?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "Setja _upp"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "Vi_sta"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "Hætta _við"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Veldu stað til að vista skrá"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Í lagi"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -242,17 +247,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Engir pakkar tilgreindir"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Verður að vera root"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Undirbý innsetningu pakka..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -261,7 +266,7 @@ msgstr ""
"Ekki er hægt að setja inn suma umbeðna pakka:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -272,42 +277,37 @@ msgstr ""
"%s\n"
"Halda samt áfram með uppsetningu?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Aðvörun"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Í lagi"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (til að uppfæra)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (til að setja inn)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Pakkaval"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Krefst einnig eins af af eftirtöldum pökkum:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Hætta við"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -318,61 +318,61 @@ msgstr ""
"%s\n"
"Halda samt áfram með uppsetningu?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "diskpláss minnkar um %s."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "diskpláss eykst um %s."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s af gögnum verður sótt."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Halda áfram með uppsetningu á einum pakka?"
msgstr[1] "Halda áfram með uppsetningu á %d pökkum?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Til að viðhalda samræmi, verður eftirfarandi pakki settur inn:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Til að viðhalda samræmi, verða eftirtaldir pakkar settir inn:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "Get ekki sótt frumpakka, hætti við"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Settu inn miðil \"%s\""
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Lokið"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -381,27 +381,27 @@ msgstr ""
"Innsetning brást, sumar skrár vantar:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Þú gætir þurft að uppfæra urpmi gagnagrunninn."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Innsetning brást:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Allt er nú þegar komið inn"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Innsetningu lokið"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "endurræsi urpmi"
@@ -475,7 +475,7 @@ msgstr "Get ekki sótt pakka í möppu %s"
msgid "Environment directory %s does not exist"
msgstr "Umhverfismappa %s er ekki til"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "nota tilgreint umhverfi á %s\n"
@@ -530,64 +530,64 @@ msgstr "villa við að skrá staðbundna pakka"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Þessi aðgerð er bönnuð þegar keyrt er í vernduðum ham"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "röng staðgengils-skilgreining á skipanalínu\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: get ekki lesið rpm skrá \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "óvænt segð %s"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "Vantar segð á undan %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "óvænt segð %s (tillaga: notið -a eða -o ?)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "engin segð sem ætti að loka"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"sjálfgefið væntir urpmf reglulegrar segðar (regexp) þú ættir að nota valkost "
"\"--literal\""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot mappa er ekki til"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "Get ekki notað %s án %s"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "Get ekki notað %s með %s"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "Of mörg viðföng\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -603,7 +603,7 @@ msgstr ""
"\n"
"notkun:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Höfundaréttur (C) %s %s"
@@ -652,7 +652,7 @@ msgstr "get ekki lesið uppsetningarskrá [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "miðill `%s' er tilgreindur tvisvar, hætti"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "get ekki skrifað í uppsetningarskrá [%s]"
@@ -1340,8 +1340,8 @@ msgstr "Vélb"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(tillaga)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -2010,9 +2010,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - frum-rpm-skrá.\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - tillögur (tög)\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - þarfnast (tög)\n"
#: ../urpmf:76
#, c-format
@@ -2040,27 +2040,27 @@ msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - prenta útgáfu, undirnúmer og vélartegund með nafni.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "ólokuð segð (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Ógilt snið: þú mátt aðeins nota eitt fjölgildis-tag"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "engin hdlist skrá er til fyrir miðil \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "engin samantektarskrá er til fyrir miðil \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "engin XML-info skrá er til fyrir miðil \"%s\""
@@ -2086,8 +2086,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - fjarlægja munaðarleysingja án þess að spyrja\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --no-suggests - ekki velja sjálfkrafa \"tillagða\" pakka.\n"
#: ../urpmi:81
@@ -2188,8 +2188,8 @@ msgstr ""
" tengda pakka eða staðfesta uppruna.\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --allow-suggests - velja sjálfkrafa \"tillagða\" pakka.\n"
#: ../urpmi:109
@@ -3019,9 +3019,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - prenta hvers er þörf.\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - prenta tillögur.\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - prenta hvers er þörf.\n"
#: ../urpmq:85
#, c-format
@@ -3189,6 +3189,15 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#~ msgid "(suggested)"
+#~ msgstr "(tillaga)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - tillögur (tög)\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - prenta tillögur.\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d pakki, %d MB)"
diff --git a/po/it.po b/po/it.po
index b34d823b..e8cc2849 100644
--- a/po/it.po
+++ b/po/it.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2013-03-29 23:44+0100\n"
"Last-Translator: Matteo Pasotti <matteo.pasotti@gmail.com>\n"
"Language-Team: Italian <mageia-i18n@mageia.org>\n"
@@ -55,7 +55,7 @@ msgstr "Sto installando il pacchetto `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Recupero del pacchetto `%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Annulla"
@@ -67,22 +67,22 @@ msgstr "Annulla"
msgid "...retrieving failed: %s"
msgstr "...recupero fallito: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "Installazione RPM"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Errore: impossibile trovare %s, annullo l'operazione"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Ok"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -103,7 +103,7 @@ msgstr ""
"\n"
"Cosa vuoi fare?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -118,7 +118,7 @@ msgstr ""
"\n"
"Vuoi continuare?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -133,26 +133,31 @@ msgstr ""
"\n"
"Potresti preferire salvarlo. Qual è la tua scelta?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Installa"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Salva"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Annulla"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Scegli dove salvare il file"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -248,17 +253,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Nessun pacchetto specificato"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Devi essere root"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Preparazione dei pacchetti per l'installazione..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -267,7 +272,7 @@ msgstr ""
"Alcuni dei pacchetti richiesti non possono essere installati:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -278,42 +283,37 @@ msgstr ""
"%s\n"
"Continuare comunque?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Attenzione"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr "(da aggiornare)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (da installare)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Scelta dei pacchetti"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "È richiesto uno dei seguenti pacchetti:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Interrompi"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -324,61 +324,61 @@ msgstr ""
"%s\n"
"Continuare l'installazione comunque?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Altri %s di spazio disco saranno utilizzati."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "%s di spazio disco saranno liberati."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "verranno scaricati %s di pacchetti."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Procedo con l'installazione di un pacchetto?"
msgstr[1] "Procedo con l'installazione di %d pacchetti?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Per soddisfare le dipendenze, sarà installato il seguente pacchetto:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Per soddisfare le dipendenze, saranno installati i seguenti pacchetti:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "impossibile recuperare i pacchetti dalla fonte, interrompo"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Bisogna inserire il supporto denominato \"%s\""
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Fatto"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -387,27 +387,27 @@ msgstr ""
"Installazione fallita, mancano alcuni file:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Sarebbe utile aggiornare il database urpmi."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Installazione fallita:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "È già tutto installato"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Installazione completata"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "Riavvio di urpmi"
@@ -484,7 +484,7 @@ msgstr "Impossibile recuperare i pacchetti in %s"
msgid "Environment directory %s does not exist"
msgstr "La directory %s, specificata nelle variabili d'ambiente, non esiste"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "uso le variabili d'ambiente su %s\n"
@@ -539,62 +539,62 @@ msgstr "errore durante la registrazione dei pacchetti locali"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Quest'operazione non è consentita in modalità \"restricted\""
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "errata dichiarazione di proxy usando la linea di comando\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: impossibile leggere il file rpm \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "espressione inattesa %s"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "manca un'espressione prima di %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "espressione inattesa %s (forse dovresti usare -a o -o)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "nessuna espressione da chiudere"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr "urpmf si aspetta una regexp, se non usi l'opzione « --literal »."
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "La directory chroot non esiste"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "Impossibile utilizzare %s senza %s"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "Impossibile utilizzare %s con %s"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "Troppi argomenti\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -611,7 +611,7 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Copyright (C) %s di %s"
@@ -660,7 +660,7 @@ msgstr "impossibile leggere il file di configurazione [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "il supporto %s è stato definito due volte. Interrompo"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "impossibile scrivere il file di configurazione [%s]"
@@ -1358,8 +1358,8 @@ msgstr "Arch."
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(suggerito)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -2051,9 +2051,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - nome dei pacchetti rpm con i sorgenti.\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - lista dei pacchetti suggeriti\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - requisiti necessari per installare il pacchetto.\n"
#: ../urpmf:76
#, c-format
@@ -2081,27 +2081,27 @@ msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - stampa versione, release e architettura con il nome.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "espressione non completata (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "formato non corretto, puoi usare una sola etichetta multi-valore"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "manca il file hdlist per il supporto \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "manca il file di synthesis per il supporto \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "manca il file xml-info per il supporto \"%s\""
@@ -2128,8 +2128,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - rimuove orfani senza chiedere conferma\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr ""
" --no-suggests - non seleziona automaticamente i pacchetti \"suggeriti"
"\"\n"
@@ -2242,8 +2242,8 @@ msgstr ""
" dei pacchetti senza controllare dipendenze e integrità.\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr ""
" --allow-suggests - seleziona automaticamente i pacchetti \"suggeriti\"\n"
@@ -3095,9 +3095,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - elenca i prerequisiti (requires).\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - elenca \"suggeriti\"\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - elenca i prerequisiti (requires).\n"
#: ../urpmq:85
#, c-format
@@ -3271,6 +3271,15 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#~ msgid "(suggested)"
+#~ msgstr "(suggerito)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - lista dei pacchetti suggeriti\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - elenca \"suggeriti\"\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d pacchetto, %d MB)"
diff --git a/po/ja.po b/po/ja.po
index 54c2046a..67f0b31b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-ja\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2009-03-22 20:56+0900\n"
"Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
"Language-Team: Japanese <cooker-i18n@mandrivalinux.org>\n"
@@ -61,7 +61,7 @@ msgstr "パッケージ %s (%s/%s) をインストール..."
msgid "Downloading package `%s'..."
msgstr "パッケージ %s をダウンロード..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "キャンセル"
@@ -73,22 +73,22 @@ msgstr "キャンセル"
msgid "...retrieving failed: %s"
msgstr "...取得に失敗: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "RPM のインストール"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "エラー: ファイル %s が見つかりません。操作をキャンセルします。"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_OK"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -109,7 +109,7 @@ msgstr ""
"\n"
"どうしますか?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -124,7 +124,7 @@ msgstr ""
"\n"
"続けますか?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -139,26 +139,31 @@ msgstr ""
"\n"
"インストールせずに保存することもできます。どうしますか?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "インストール(_I)"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "保存(_S)"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "キャンセル(_C)"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "ファイルを保存する場所を選んでください"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "OK"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -237,17 +242,17 @@ msgstr ""
msgid "No packages specified"
msgstr "パッケージが指定されていません"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "root 権限が必要です"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "パッケージのインストールを準備..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -256,7 +261,7 @@ msgstr ""
"インストールできないパッケージがあります:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -267,42 +272,37 @@ msgstr ""
"%s\n"
"このままインストールを続けますか?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "警告"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "OK"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (アップグレードするため)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (インストールするため)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "パッケージの選択"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "以下のパッケージのいずれかが必要です:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "中止(_A)"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -313,60 +313,60 @@ msgstr ""
"%s\n"
"このままインストールを続けますか?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "ディスク容量を %s 使います。"
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "ディスク容量が %s 空きます。"
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s のパッケージを取得します。"
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "%d 個のパッケージのインストールを開始しますか?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "依存を満たすために以下のパッケージをインストールします:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "依存を満たすために以下のパッケージをインストールします:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ソースパッケージを取得できませんでした。中止します。"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "%s という名前のメディアを挿入してください"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "完了(_D)"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -375,27 +375,27 @@ msgstr ""
"インストール失敗。不正な RPM です:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "urpmi データベースを更新した方がよいでしょう。"
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "インストール失敗:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "パッケージは既にインストールされています"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "インストールが完了しました"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "urpmi を再スタートします"
@@ -469,7 +469,7 @@ msgstr "パッケージを %s にダウンロードできません"
msgid "Environment directory %s does not exist"
msgstr "環境ディレクトリ %s が存在しません"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "%s に特定の環境を使用\n"
@@ -524,63 +524,63 @@ msgstr "ローカルパッケージの登録中にエラーが発生"
msgid "This operation is forbidden while running in restricted mode"
msgstr "この操作は制限モードでは禁止されています"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "コマンドラインのプロキシ宣言が間違っています\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: RPM ファイル %s を読み込めません\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "予期しない表現: %s"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "%s の前に表現がありません"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "予期しない表現 %s (提案: -a または -o を使用)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "閉じる表現がありません"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"urpmf はデフォルトで正規表現を期待します。\"--literal\" を使ってください。"
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot ディレクトリが存在しません"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "%2$s なしで %1$s は使えません"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "%s は %s と一緒には使えません"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "引数が多すぎます\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -596,7 +596,7 @@ msgstr ""
"\n"
"使い方:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Copyright (C) %s by %s"
@@ -645,7 +645,7 @@ msgstr "設定ファイル [%s] を読めません"
msgid "medium `%s' is defined twice, aborting"
msgstr "メディア %s が二度定義されています。中止します。"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "設定ファイル [%s] を書き込めません"
@@ -1339,8 +1339,8 @@ msgstr "アーキテクチャ"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(提案)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -1993,9 +1993,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - ソース RPM の名前\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - suggest (提案) タグ\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - require (要求) タグ\n"
#: ../urpmf:76
#, c-format
@@ -2022,27 +2022,27 @@ msgstr " -m - パッケージのあるメディア\n"
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - バージョン, リリース番号, アーキテクチャを表示\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "終端のない表現 (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "不正な形式: 多値タグは一つしか使えません"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "メディア %s には hdlist がありません"
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "メディア %s には synthesis がありません"
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "メディア %s には XML 情報がありません"
@@ -2068,8 +2068,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - 確認せずにオーファンを削除\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --no-suggests - 提案されたパッケージを自動的に選択しない\n"
#: ../urpmi:81
@@ -2166,8 +2166,8 @@ msgstr ""
" --force でインストールするかどうか質問する\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --allow-suggests - 提案されたパッケージを自動的に選択\n"
#: ../urpmi:109
@@ -2992,9 +2992,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - require (要求) を表示\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - suggest (提案) タグを表示\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - require (要求) を表示\n"
#: ../urpmq:85
#, c-format
@@ -3158,6 +3158,15 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#~ msgid "(suggested)"
+#~ msgstr "(提案)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - suggest (提案) タグ\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - suggest (提案) タグを表示\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d 個のパッケージ, %d MB)"
diff --git a/po/ka.po b/po/ka.po
index 149df781..c0a9c59f 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2003-01-29 23:47+0400\n"
"Last-Translator: Aiet Kolkhi <aiet@gmx.net>\n"
"Language-Team: Georgian\n"
@@ -60,7 +60,7 @@ msgstr "პაკეტის ინსტალაცია: `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "პაკეტის ინსტალაცია: `%s' (%s/%s)..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "გამოქცევა"
@@ -72,22 +72,22 @@ msgstr "გამოქცევა"
msgid "...retrieving failed: %s"
msgstr "...გამოძახება ჩაიშალა: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, fuzzy, c-format
msgid "RPM installation"
msgstr "ინსტალაცია ჩაიშალა"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Ok"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -100,7 +100,7 @@ msgid ""
"What would you like to do?"
msgstr ""
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -110,7 +110,7 @@ msgid ""
"Proceed?"
msgstr ""
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -120,26 +120,31 @@ msgid ""
"You may prefer to just save it. What is your choice?"
msgstr ""
-#: ../gurpmi:112
+#: ../gurpmi:116
#, fuzzy, c-format
msgid "_Install"
msgstr "ინსტალირება"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_შენახვა"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_გაუქმება"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr ""
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "ო-ქეი"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -215,24 +220,24 @@ msgstr ""
msgid "No packages specified"
msgstr "ბრძანება არ იქნა მითითებული"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr ""
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, fuzzy, c-format
msgid "Preparing packages installation..."
msgstr "ინსტალაციისათვის საჭირო ramdisk იმიჯები"
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr "უკვე ყველაფერი ჩაწერილია"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -240,42 +245,37 @@ msgid ""
"Continue installation anyway?"
msgstr "უკვე ყველაფერი ჩაწერილია"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "გაფრთხილება"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "ო-ქეი"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr ""
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, fuzzy, c-format
msgid " (to install)"
msgstr "ავტომატური ინსტალირება"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, fuzzy, c-format
msgid "_Abort"
msgstr "შესახებ..."
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -283,87 +283,87 @@ msgid ""
"Continue installation anyway?"
msgstr "%s შედმეგ პაკეტებშია: %s\n"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, fuzzy, c-format
msgid "unable to get source packages, aborting"
msgstr "ვერ ვიყენებ პარალელურ პარამეტრს \"%s\""
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "გთხოვთ ჩადოთ: %s სახელით: %s"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, fuzzy, c-format
msgid "_Done"
msgstr "დასრულდა"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "ინსტალაცია ჩაიშალა"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr ""
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "ინსტალაცია ჩაიშალა"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "უკვე ყველაფერი ჩაწერილია"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, fuzzy, c-format
msgid "Installation finished"
msgstr "ინსტალაცია ჩაიშალა"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -437,7 +437,7 @@ msgstr "პაკეტის ინსტალაცია: `%s' (%s/%s)..."
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
@@ -492,62 +492,62 @@ msgstr ""
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, fuzzy, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "ვერ წავიკითხე მენიუს ფაილი:%s"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -564,7 +564,7 @@ msgstr ""
"\n"
"გამოყენება:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "საავტორო უფლებები (C) %s %s"
@@ -611,7 +611,7 @@ msgstr "ვერ ვწერ საკონფიგურაციო ფა
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
@@ -1298,7 +1298,7 @@ msgstr "მოძებნა:"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -1943,7 +1943,7 @@ msgstr ""
#: ../urpmf:75
#, fuzzy, c-format
-msgid " --suggests - suggests tags\n"
+msgid " --recommends - recommends tags\n"
msgstr " --update - განახლების კვანძები\n"
#: ../urpmf:76
@@ -1971,27 +1971,27 @@ msgstr " --help - აჩვენე ეს დამხმარე
msgid " -f - print version, release and arch with name.\n"
msgstr ""
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
@@ -2018,7 +2018,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --update - განახლების კვანძები\n"
#: ../urpmi:81
@@ -2107,7 +2107,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --update - განახლების კვანძები\n"
#: ../urpmi:109
@@ -2852,7 +2852,7 @@ msgstr " --update - განახლების კვანძებ
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
+msgid " --recommends - print recommends.\n"
msgstr " --update - განახლების კვანძები\n"
#: ../urpmq:85
@@ -3008,6 +3008,14 @@ msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
#, fuzzy
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --update - განახლების კვანძები\n"
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --update - განახლების კვანძები\n"
+
+#, fuzzy
#~ msgid " --repackage - Re-package the files before erasing\n"
#~ msgstr " --update - განახლების კვანძები\n"
diff --git a/po/ko.po b/po/ko.po
index 76ea202d..7c3a698d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2007-09-26 20:03+0200\n"
"Last-Translator: Jaegeum Choe <baedaron@hananet.net>\n"
"Language-Team: Korean <baedaron@hananet.net>\n"
@@ -59,7 +59,7 @@ msgstr "패키지 설치 중: [%s] (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "패키지 내려받는 중: [%s] (%s/%s)..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "취소"
@@ -71,22 +71,22 @@ msgstr "취소"
msgid "...retrieving failed: %s"
msgstr "FAT크기조정 실패: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, fuzzy, c-format
msgid "RPM installation"
msgstr "설치 준비중입니다"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Error: %s 파일을 찾을 수 없습니다. 작업을 취소합니다. "
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "확인 (_O)"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -106,7 +106,7 @@ msgstr ""
"\n"
"어떻하시겠습니까?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -121,7 +121,7 @@ msgstr ""
"\n"
"계속 진행하시겠습니까?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -136,26 +136,31 @@ msgstr ""
"\n"
"추후를 위해서 패키지를 저장할 것을 권장합니다. 선택하십시요."
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "설치(_I)"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "저장(_S)"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "취소 (_C)"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, fuzzy, c-format
msgid "Choose location to save file"
msgstr "파일 선택"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "확인"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -231,24 +236,24 @@ msgstr ""
msgid "No packages specified"
msgstr "선택된 패키지 목록 저장"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, fuzzy, c-format
msgid "Must be root"
msgstr "마우스 포트"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, fuzzy, c-format
msgid "Preparing packages installation..."
msgstr "패키지 설치 중..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr "일부 팩키지는 제거되어야 합니다."
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -259,42 +264,37 @@ msgstr ""
"%s\n"
"계속 진행하시겠습니까?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "경고"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "확인"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "업그레이드"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, fuzzy, c-format
msgid " (to install)"
msgstr "설치 종료"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "패키지 선택"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "다음 패키지들 중 하나가 필요합니다:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "중단(_A)"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -304,67 +304,67 @@ msgstr ""
"다음 패키지들이 제거될 것입니다.%s\n"
"계속 설치를 진행하시겠습니까?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "의존성 문제로 인하여, 다음 패키지가 설치되어야 합니다:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "의존성 문제로 인하여, 다음 패키지들이 설치되어야 합니다:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "소스 패키지를 구할 수 없습니다, 설치를 중단합니다."
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "장치 [%2$s]에 「%1$s」미디어를 넣으세요."
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, fuzzy, c-format
msgid "_Done"
msgstr "완료"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "설치 실패."
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, fuzzy, c-format
msgid "You may want to update your urpmi database."
msgstr ""
@@ -372,22 +372,22 @@ msgstr ""
"%s\n"
"urpmi 데이터베이스를 업데이트해야 할 수도 있습니다."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "설치 실패."
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "모든 것이 이미 설치되어 있습니다."
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "설치 완료"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -463,7 +463,7 @@ msgstr "패키지 내려받는 중: [%s] (%s/%s)..."
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
@@ -518,62 +518,62 @@ msgstr "패키지 등록 오류"
msgid "This operation is forbidden while running in restricted mode"
msgstr "이 작업은 제한모드에서 작동되는 동안 금지됩니다."
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "명령줄 내의 잘못된 선언\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: RPM 파일 「%s」을 읽을 수 없습니다.\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "서명이 없습니다.(%s)"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot 디렉토리가 존재하지 않습니다."
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "%s 없이 %s를 사용할 수 없습니다."
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "%s 와 함께 %s를 사용할 수 없습니다."
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "너무 많은 인수.\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -589,7 +589,7 @@ msgstr ""
"\n"
"사용법:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "저작권(C) %s %s."
@@ -636,7 +636,7 @@ msgstr "설정 파일 [%s]에 기록할 수 없습니다."
msgid "medium `%s' is defined twice, aborting"
msgstr "'%s'매체는 2번 정의되었습니다. 작업을 중단합니다."
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "설정 파일 [%s]에 기록할 수 없습니다."
@@ -1325,7 +1325,7 @@ msgstr "검색"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -1970,7 +1970,7 @@ msgstr ""
#: ../urpmf:75
#, c-format
-msgid " --suggests - suggests tags\n"
+msgid " --recommends - recommends tags\n"
msgstr ""
#: ../urpmf:76
@@ -1998,27 +1998,27 @@ msgstr " -v - 상세 정보 모드.\n"
msgid " -f - print version, release and arch with name.\n"
msgstr " -v - 상세 정보 모드.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "매체「%s」에 대한 목록 합성 파일 생성 완료."
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
@@ -2045,7 +2045,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --noscripts - 패키지 scriptlet(s)를 실행하지 않습니다.\n"
#: ../urpmi:81
@@ -2134,7 +2134,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --noscripts - 패키지 scriptlet(s)를 실행하지 않습니다.\n"
#: ../urpmi:109
@@ -2911,7 +2911,7 @@ msgstr " -v - 상세 정보 모드.\n"
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
+msgid " --recommends - print recommends.\n"
msgstr " -v - 상세 정보 모드.\n"
#: ../urpmq:85
@@ -3075,6 +3075,10 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " -v - 상세 정보 모드.\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d 패키지, %d MB)"
diff --git a/po/ky.po b/po/ky.po
index ed6fb969..aad519c3 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-ky\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2005-07-13 13:23+0000\n"
"Last-Translator: Timur Jamakeev <ztimur@mail..ru>\n"
"Language-Team: Kyrgyz\n"
@@ -58,7 +58,7 @@ msgstr "Пакет орнотулууда: `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "`%s' пакети жүктөлүүдө..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Калтыруу"
@@ -70,22 +70,22 @@ msgstr "Калтыруу"
msgid "...retrieving failed: %s"
msgstr "...кабыл алуу ийгиликсиз: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "RPM орнотуу"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Ok"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -106,7 +106,7 @@ msgstr ""
"\n"
"Эмнени кылууну каалайсыз?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -121,7 +121,7 @@ msgstr ""
"\n"
"Уланталыбы?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -136,26 +136,31 @@ msgstr ""
"\n"
"Сиз аны жөн гана сактап алсаңыз болот. Сиздин тандооңуз?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Орнотуу"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Сактоо"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Калтыруу"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Сактоо үчүн орун тандаңыз"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -240,17 +245,17 @@ msgstr ""
msgid "No packages specified"
msgstr "%s аттуу пакет жок"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "root укуктары талап кылынат"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Пакеттерди орнотуу үчүн даярдануу..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -259,7 +264,7 @@ msgstr ""
"Талап кылынган кээ бир пакеттерди орноттууга болбойт:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -270,42 +275,37 @@ msgstr ""
"%s\n"
"Уланталыбы?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Эскертүү"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (жаңылоо)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (орнотуу)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Пакет тандоо"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Төмөнкү пакеттердин бири талап кылынат:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Токтотуу"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -316,36 +316,36 @@ msgstr ""
"%s\n"
"Уланталыбы?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "дисктин %s кошумча бөлүгү колдонулат."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "дисктин %s бөлүгү бошотулат."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s пакеттери жүктөлөт."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"Көз карандылыктарды канаатандыруу үчүн, төмөнкү пакет орнотулат (%d Мб)"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -353,54 +353,54 @@ msgstr ""
"Көз карандылыктарды канаатандыруу үчүн, төмөнкү %d пакет орнотулат:\n"
"%s\n"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "баштапкы пакеттерди алууга болбоду, күтүлбөгөн аяктоо"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "\"%s\" атту булагын киргизиңиз"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Даяр"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "Орнотуу ишке ашпады"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Балким urpmi мааламаттар базасын жаңыртуу керек."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Орнотуу ишке ашпады"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Бардыгы алдагачан орнотулган"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Орнотуу аяктады"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "urpmi кайра ишке киргизилүүдө"
@@ -474,7 +474,7 @@ msgstr "`%s' пакети жүктөлүүдө..."
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "%s үчүн спецификалык чөйрө колдонулууда\n"
@@ -529,62 +529,62 @@ msgstr "локалдык пакеттерди каттоо катасы"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Чектелген режим учурунда бул операцияны аткарууга болбойт"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "командалык сапта туура эмес прокси көрсөтүлгөн\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: \"%s\" rpm файлын окууга болбоду\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Сигнатура жок (%s)"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -601,7 +601,7 @@ msgstr ""
"\n"
"колдонулушу:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Copyright (C) %s by %s"
@@ -648,7 +648,7 @@ msgstr "[%s] конфиг файлын жазуу мүмкүн эмес"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "[%s] конфиг файлын жазуу мүмкүн эмес"
@@ -1338,7 +1338,7 @@ msgstr "Архивдөө"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -2002,8 +2002,8 @@ msgstr " --sourcerpm - sourcerpm: баштапкы rpm тэгин чыгар
#: ../urpmf:75
#, fuzzy, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --obsoletes - obsoletes: бардык эскирген файлдар тэгин чыгаруу.\n"
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - requires: бардык көз карандылыктар тэгин чыгаруу.\n"
#: ../urpmf:76
#, fuzzy, c-format
@@ -2032,27 +2032,27 @@ msgstr ""
" -f - версиясын, релизин жана архитектурасын аттары менен кошо "
"чыгаруу.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "\"%s\" булагы үчүн hdlist файлы табылбады"
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "\"%s\" булагы үчүн hdlist synthesis файлы түзүлдү"
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "\"%s\" булагында xml-info табылган жок"
@@ -2081,7 +2081,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --obsoletes - obsoletes: бардык эскирген файлдар тэгин чыгаруу.\n"
#: ../urpmi:81
@@ -2184,7 +2184,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --obsoletes - obsoletes: бардык эскирген файлдар тэгин чыгаруу.\n"
#: ../urpmi:109
@@ -3003,8 +3003,8 @@ msgstr " --requires - requires: бардык көз карандылыкт
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --obsoletes - obsoletes: бардык эскирген файлдар тэгин чыгаруу.\n"
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - requires: бардык көз карандылыктар тэгин чыгаруу.\n"
#: ../urpmq:85
#, fuzzy, c-format
@@ -3178,6 +3178,16 @@ msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
#, fuzzy
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr ""
+#~ " --obsoletes - obsoletes: бардык эскирген файлдар тэгин чыгаруу.\n"
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr ""
+#~ " --obsoletes - obsoletes: бардык эскирген файлдар тэгин чыгаруу.\n"
+
+#, fuzzy
#~ msgid " --repackage - Re-package the files before erasing\n"
#~ msgstr " --packager - packager: пакеттөөчү тэгин чыгаруу.\n"
diff --git a/po/lt.po b/po/lt.po
index 52cbef11..77a359cf 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2005-08-18 23:34+0200\n"
"Last-Translator: Arvydas Svirka <arvydas@arvis.lt>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -61,7 +61,7 @@ msgstr "Įdiegiamas paketas `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Parsiunčiamas paketas `%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Atšaukti"
@@ -73,22 +73,22 @@ msgstr "Atšaukti"
msgid "...retrieving failed: %s"
msgstr "...atkūrimas nepavyko: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "RPM įdiegimas"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Gerai"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -109,7 +109,7 @@ msgstr ""
"\n"
"Ką jūs darysite?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -124,7 +124,7 @@ msgstr ""
"\n"
"Tęsti?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -139,26 +139,31 @@ msgstr ""
"\n"
"Jūs galite tiesiog jį išsaugoti. Koks jūsų pasirinkimas?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "Į_diegti"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "Iš_saugoti"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Atšaukti"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Pasirinkite vietą bylos išsaugojimui"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Gerai"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -242,17 +247,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Išsaugoti paketų pasirinkimą"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Turi būti pradinis"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, fuzzy, c-format
msgid "Preparing packages installation..."
msgstr "Paketų įdiegimas..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -261,7 +266,7 @@ msgstr ""
"Pareikalautas paketas negali būti įdiegtas:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -272,42 +277,37 @@ msgstr ""
"%s\n"
"Tęsti?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Dėmesio"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Gerai"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (atnaujinti)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (įdiegti)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Paketų pasirinkimas"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Vienas iš šių paketų yra reikalingas."
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Nutraukti"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -318,22 +318,22 @@ msgstr ""
"%s\n"
"Tęsti?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -341,46 +341,46 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Priklausomybių patenkinimui, bus įdiegtas šis paketas (%d MB)"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Priklausomybių patenkinimui, bus įdiegtas šis paketas (%d MB)"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "negaliu gauti pirminių paketų, nutraukiu"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Įdėkite laikmeną, pavadintą \"%s\", į įrenginį [%s]"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "Baigta"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "Įdiegimas nepavyko"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, fuzzy, c-format
msgid "You may want to update your urpmi database."
msgstr ""
@@ -388,22 +388,22 @@ msgstr ""
"%s\n"
"Jūs galite norėti atnaujinti urpmi duomenų bazę"
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Įdiegimas nepavyko"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Paketas(-ai) jau įdiegti"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Įdiegimas baigtas"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "iš naujo paleidžiama urpmi"
@@ -477,7 +477,7 @@ msgstr "Parsiunčiamas paketas `%s'..."
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "%s naudojama specifinė aplinka\n"
@@ -532,62 +532,62 @@ msgstr "vietinių paketų registravimo klaida"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Operacija yra draudžiama, kai dirbama apribotoje veiksenoje"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "blogas tarpinio serverio deklaravimas komandinėje eilutėje\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: negaliu perskaityti rpm bylos \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Nėra ženklo (%s)"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -604,7 +604,7 @@ msgstr ""
"\n"
"naudojimas:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr ""
@@ -651,7 +651,7 @@ msgstr "nagaliu įrašyti konfigūracijos bylos [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "nagaliu įrašyti konfigūracijos bylos [%s]"
@@ -1340,7 +1340,7 @@ msgstr "Ieškoti"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -2012,8 +2012,9 @@ msgstr " --sourcerpm - spausdinti žymens pirminį rpm: pirminis rpm.\n"
#: ../urpmf:75
#, fuzzy, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --obsoletes - spausdinti pasenusius žymenis: visi pasenę.\n"
+msgid " --recommends - recommends tags\n"
+msgstr ""
+" --requires - spausdinti žymenų pareikalavimus: visi pareikalavimai.\n"
#: ../urpmf:76
#, fuzzy, c-format
@@ -2042,27 +2043,27 @@ msgstr ""
" -f - spausdinimo versija, išleisti ir archyvuoti su "
"pavadinimu.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "laikmenai \"%s\" nerasta hdlist byla"
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "\"%s\" laikmenai sudaryta hdlist sintezės byla"
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "įrašoma laikmenos \"%s\" sąrašo byla"
@@ -2090,7 +2091,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --obsoletes - spausdinti pasenusius žymenis: visi pasenę.\n"
#: ../urpmi:81
@@ -2193,7 +2194,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --obsoletes - spausdinti pasenusius žymenis: visi pasenę.\n"
#: ../urpmi:109
@@ -3012,8 +3013,9 @@ msgstr ""
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --obsoletes - spausdinti pasenusius žymenis: visi pasenę.\n"
+msgid " --recommends - print recommends.\n"
+msgstr ""
+" --requires - spausdinti žymenų pareikalavimus: visi pareikalavimai.\n"
#: ../urpmq:85
#, fuzzy, c-format
@@ -3187,6 +3189,14 @@ msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
#, fuzzy
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --obsoletes - spausdinti pasenusius žymenis: visi pasenę.\n"
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --obsoletes - spausdinti pasenusius žymenis: visi pasenę.\n"
+
+#, fuzzy
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "%d paketų"
diff --git a/po/lv.po b/po/lv.po
index f9372dfe..897f8644 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2002-09-27 17:43+0200\n"
"Last-Translator: Raivo Saars <spaiks@inbox.lv>\n"
"Language-Team: ll10nt <ll10nt@listes.murds.lv>\n"
@@ -62,7 +62,7 @@ msgstr "Instalēju pakotnes..."
msgid "Downloading package `%s'..."
msgstr "Instalēju pakotnes..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Atcelt"
@@ -74,22 +74,22 @@ msgstr "Atcelt"
msgid "...retrieving failed: %s"
msgstr "...atgūšana neizdevās: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Sagatavoju instalēšanu"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Labi"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -102,7 +102,7 @@ msgid ""
"What would you like to do?"
msgstr ""
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, fuzzy, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -114,7 +114,7 @@ msgstr ""
"Jums jābūt root, lai instalētu sekojošas atkarības:\n"
"%s\n"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -124,26 +124,31 @@ msgid ""
"You may prefer to just save it. What is your choice?"
msgstr ""
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Uzstādīt"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Saglabāt"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "At_celt"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, fuzzy, c-format
msgid "Choose location to save file"
msgstr "Izvēlieties failu"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Labi"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -220,24 +225,24 @@ msgstr " --update - izveidot atjaunināšanas datu nesēju.\n"
msgid "No packages specified"
msgstr "Saglabāt pakotņu izvēli"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, fuzzy, c-format
msgid "Must be root"
msgstr "Peles ports"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, fuzzy, c-format
msgid "Preparing packages installation..."
msgstr "Sagatavoju instalēšanu"
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr "Dažas pakotnes nepieciešams noņemt"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -248,42 +253,37 @@ msgstr ""
"%s\n"
"vai piekrītat?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Uzmanību"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Labi"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Atjaunināt"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, fuzzy, c-format
msgid " (to install)"
msgstr "Instalēšanas beigas"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Ir nepieciešama viena no sekojošām pakotnēm:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Pārtraukt"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -291,22 +291,22 @@ msgid ""
"Continue installation anyway?"
msgstr "Tiks noņemtas sekojošas pakotnes"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -314,66 +314,66 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Lai apmierinātu atkarības, tiks noņemtas sekojošas pakotnes (%d MB)"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Lai apmierinātu atkarības, tiks noņemtas sekojošas pakotnes (%d MB)"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "nevar dabūt koda pakotnes, pārtraucu"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Lūdzu ielieciet datu nesēju \"%s\" ierīcē [%s]"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, fuzzy, c-format
msgid "_Done"
msgstr "Izdarīts"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "Instalēšana neizdevās"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr ""
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Instalēšana neizdevās"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "viss jau ir instalēts"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Instalēšana pabeigta"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -449,7 +449,7 @@ msgstr "Instalēju pakotnes..."
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
@@ -504,62 +504,62 @@ msgstr "kļūda reģistrējot lokālās pakotnes"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, fuzzy, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "nevar nolasīt izvēlnes failu:%s"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Neesoši ieraksti"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -575,7 +575,7 @@ msgstr ""
"\n"
"Pielietojums:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Autortiesības (C) %s %s."
@@ -622,7 +622,7 @@ msgstr "nevar saglabāt konfigurācijas failu [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "nevar saglabāt konfigurācijas failu [%s]"
@@ -1306,7 +1306,7 @@ msgstr "Meklēt"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -1966,8 +1966,8 @@ msgstr " --group - drukāt iezīmi: grupa."
#: ../urpmf:75
#, fuzzy, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --obsoletes - drukāt iezīmi: novecojušas (vairākas rindiņas)."
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - drukāt iezīmi: nepieciešamas (vairākas rindiņas)."
#: ../urpmf:76
#, fuzzy, c-format
@@ -1994,27 +1994,27 @@ msgstr " --list - izvadīt sarakstu ar pieejamām pakotnēm.\n"
msgid " -f - print version, release and arch with name.\n"
msgstr " -v - runīgais režīms.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "uzbūvēju hdlist synthesis failu priekš datu nesēja \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
@@ -2041,7 +2041,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --obsoletes - drukāt iezīmi: novecojušas (vairākas rindiņas)."
#: ../urpmi:81
@@ -2130,7 +2130,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --obsoletes - drukāt iezīmi: novecojušas (vairākas rindiņas)."
#: ../urpmi:109
@@ -2912,8 +2912,8 @@ msgstr " --requires - drukāt iezīmi: nepieciešamas (vairākas rindiņas
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --obsoletes - drukāt iezīmi: novecojušas (vairākas rindiņas)."
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - drukāt iezīmi: nepieciešamas (vairākas rindiņas)."
#: ../urpmq:85
#, fuzzy, c-format
@@ -3071,6 +3071,14 @@ msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
#, fuzzy
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --obsoletes - drukāt iezīmi: novecojušas (vairākas rindiņas)."
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --obsoletes - drukāt iezīmi: novecojušas (vairākas rindiņas)."
+
+#, fuzzy
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "%d pakotnes"
diff --git a/po/mk.po b/po/mk.po
index 46b2908a..c673c08e 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-mk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2005-07-18 01:58+0200\n"
"Last-Translator: Зоран Димовски <decata@mt.net.mk>\n"
"Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -60,7 +60,7 @@ msgstr "Инсталирам пакет `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Го преземам пакетот `%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Откажи"
@@ -72,22 +72,22 @@ msgstr "Откажи"
msgid "...retrieving failed: %s"
msgstr "...преземањето не успеа: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "RPM инсталација"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Во ред"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -109,7 +109,7 @@ msgstr ""
"\n"
"Што сакате да направите?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -124,7 +124,7 @@ msgstr ""
"\n"
"Да продолжам?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -139,26 +139,31 @@ msgstr ""
"\n"
"Можеби сакате само да го зачувате. Кој е вашиот избор?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Инсталирај"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Зачувај"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Откажи"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Изберете локација за зачувување на датотека"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Во ред"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -242,17 +247,17 @@ msgstr ""
msgid "No packages specified"
msgstr "нема пакет именуван како %s"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Мора да сте root"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Подготовка за инсталирање пакети..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -261,7 +266,7 @@ msgstr ""
"Некои од бараните пакети не можат да се инсталираат:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -272,42 +277,37 @@ msgstr ""
"%s\n"
"Да продолжам?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Предупредување"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Во ред"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (за надоградување)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (за инсталирање)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Избор на пакети"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Потребен е еден од следниве пакети:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Откажи"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -318,36 +318,36 @@ msgstr ""
"%s\n"
"Да продолжам?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"За да се задоволат зависностите, следниов пакет ќе биде инсталиран (%d MB)"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -355,34 +355,34 @@ msgstr ""
"За да се задоволат зависностите, ќе се инсталираат следниве %d пакети:\n"
"%s\n"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "не можам да ги добија изворните пакети, прекинувам"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Ве молиме внесете го медиумот именуван како \"%s\" во уредот [%s]"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Завршено"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "Инсталацијата не успеа"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, fuzzy, c-format
msgid "You may want to update your urpmi database."
msgstr ""
@@ -390,22 +390,22 @@ msgstr ""
"%s\n"
"Можеби сакате да ја ажурирате вашата urpmi база на податоци"
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Инсталацијата не успеа"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Се е веќе инсталирано"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Инсталирањето заврши"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "рестартирам urpmi"
@@ -479,7 +479,7 @@ msgstr "Го преземам пакетот `%s'..."
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "употребувам одредена околина на %s\n"
@@ -534,62 +534,62 @@ msgstr "грешка при регистрирање на локалните п
msgid "This operation is forbidden while running in restricted mode"
msgstr "Оваа акција не е дозволена додека работи во затворен режим"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "лоша декларација на прокси во командната линија\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: не можам да ја прочитам rpm датотеката \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Недостасува потпис (%s)"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -606,7 +606,7 @@ msgstr ""
"\n"
"употреба:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Авторски права (C) %s од „%s“"
@@ -653,7 +653,7 @@ msgstr "не можам да запишам конфигурациона дат
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "не можам да запишам конфигурациона датотека [%s]"
@@ -1348,7 +1348,7 @@ msgstr "Барај"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -2026,10 +2026,10 @@ msgstr " --sourcerpm - го испишува тагот на изворни
#: ../urpmf:75
#, fuzzy, c-format
-msgid " --suggests - suggests tags\n"
+msgid " --recommends - recommends tags\n"
msgstr ""
-" --obsoletes - го испишува тагот на пакетите кои ќе бидат отстранети или "
-"заменети: сите отстранети или заменети.\n"
+" --requires - го испишува тагот што всушност му е потребно на пакетот "
+"што ќе се инсталира: сите што се потребни.\n"
#: ../urpmf:76
#, fuzzy, c-format
@@ -2057,27 +2057,27 @@ msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - испишува верзија, објавување и архитектура со име.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "не е пронајдена hdlist датотека за медиумот \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "изградена е hdlist synthesis датотека за медиумот \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "запишувам датотека со листа за медиумот \"%s\""
@@ -2105,7 +2105,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr ""
" --obsoletes - го испишува тагот на пакетите кои ќе бидат отстранети или "
"заменети: сите отстранети или заменети.\n"
@@ -2213,7 +2213,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr ""
" --obsoletes - го испишува тагот на пакетите кои ќе бидат отстранети или "
"заменети: сите отстранети или заменети.\n"
@@ -3047,10 +3047,10 @@ msgstr ""
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
+msgid " --recommends - print recommends.\n"
msgstr ""
-" --obsoletes - го испишува тагот на пакетите кои ќе бидат отстранети или "
-"заменети: сите отстранети или заменети.\n"
+" --requires - го испишува тагот што всушност му е потребно на пакетот "
+"што ќе се инсталира: сите што се потребни.\n"
#: ../urpmq:85
#, fuzzy, c-format
@@ -3224,6 +3224,18 @@ msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
#, fuzzy
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr ""
+#~ " --obsoletes - го испишува тагот на пакетите кои ќе бидат отстранети "
+#~ "или заменети: сите отстранети или заменети.\n"
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr ""
+#~ " --obsoletes - го испишува тагот на пакетите кои ќе бидат отстранети "
+#~ "или заменети: сите отстранети или заменети.\n"
+
+#, fuzzy
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "%d пакети"
diff --git a/po/mn.po b/po/mn.po
index a6bd54ec..46f0108b 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2003-08-22 19:38+0200\n"
"Last-Translator: Khurelbaatar Lkhagvasuren <hujii247@yahoo.com>\n"
"Language-Team: Mongolian <openmn-core@lists.sourceforge.net>\n"
@@ -59,7 +59,7 @@ msgstr "`%s' (%s/%s) багцийг суулгаж байна..."
msgid "Downloading package `%s'..."
msgstr "`%s' багцыг татан авч байна..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Хүчингүй"
@@ -71,22 +71,22 @@ msgstr "Хүчингүй"
msgid "...retrieving failed: %s"
msgstr "...хүлээн авалт бүтэлгүйтлээ: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Суулгалтын бэлтгэл"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Ок"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -99,7 +99,7 @@ msgid ""
"What would you like to do?"
msgstr ""
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, fuzzy, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -109,7 +109,7 @@ msgid ""
"Proceed?"
msgstr "Та г с"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -119,26 +119,31 @@ msgid ""
"You may prefer to just save it. What is your choice?"
msgstr ""
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Суулгах"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Хадгалах"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Хүчингүй"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr ""
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Ок"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -216,24 +221,24 @@ msgstr ""
msgid "No packages specified"
msgstr "Тухайлсан тушаал алга"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr ""
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, fuzzy, c-format
msgid "Preparing packages installation..."
msgstr "Багц суулгалт..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr "Бүх зүйл хэдийн суусан байна"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -241,42 +246,37 @@ msgid ""
"Continue installation anyway?"
msgstr "г с вы?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Анхааруулга"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Ок"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr ""
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, fuzzy, c-format
msgid " (to install)"
msgstr "ямх"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Дараах багцуудын нэг нь шаардлагатай:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, fuzzy, c-format
msgid "_Abort"
msgstr "Таслах"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -284,68 +284,68 @@ msgid ""
"Continue installation anyway?"
msgstr "г с вы?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Дараах багцууд суулгагдах гэж байна"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Дараах багцууд суулгагдах гэж байна"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, fuzzy, c-format
msgid "unable to get source packages, aborting"
msgstr "%s багцийг устгаж болсонгүй"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "с с"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, fuzzy, c-format
msgid "_Done"
msgstr "Биелэгдэв"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "Суулгалтын асуудал"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, fuzzy, c-format
msgid "You may want to update your urpmi database."
msgstr ""
@@ -353,22 +353,22 @@ msgstr ""
"%s\n"
"Та магадгүй urpmi баазаа шинэчлэх хэрэгтэй байх"
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Суулгалтын асуудал"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Бүх зүйл хэдийн суусан байна"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, fuzzy, c-format
msgid "Installation finished"
msgstr "Суулгалт боломжтой"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -440,7 +440,7 @@ msgstr "`%s' багцыг татан авч байна..."
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, fuzzy, c-format
msgid "using specific environment on %s\n"
msgstr "с"
@@ -495,62 +495,62 @@ msgstr "локал"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "тушаалын мөрөнд буруу proxy зарлалт\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: rpm файлыг уншиж чадахгүй \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -567,7 +567,7 @@ msgstr ""
"\n"
"Ашиглалт: \n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr ""
@@ -614,7 +614,7 @@ msgstr "[%s] тохируулгын файлыг бичиж болсонгүй"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "[%s] тохируулгын файлыг бичиж болсонгүй"
@@ -1299,7 +1299,7 @@ msgstr "Тандах"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -1947,7 +1947,7 @@ msgstr ""
#: ../urpmf:75
#, c-format
-msgid " --suggests - suggests tags\n"
+msgid " --recommends - recommends tags\n"
msgstr ""
#: ../urpmf:76
@@ -1975,27 +1975,27 @@ msgstr " --list - боломжтой багцуудын жагсаал
msgid " -f - print version, release and arch with name.\n"
msgstr "нэр"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "[%s]-ээс ямар нэг rpm олдсонгүй"
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "с"
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "жигсаалт с"
@@ -2022,7 +2022,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr "Тодорхойлолт Тодорхойлолт Тодорхойлолт"
#: ../urpmi:81
@@ -2111,7 +2111,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr "Тодорхойлолт Тодорхойлолт Тодорхойлолт"
#: ../urpmi:109
@@ -2859,7 +2859,7 @@ msgstr " --all - бүх тагуудыг хэвлэх.\n"
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
+msgid " --recommends - print recommends.\n"
msgstr " --all - бүх тагуудыг хэвлэх.\n"
#: ../urpmq:85
@@ -3017,6 +3017,10 @@ msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --all - бүх тагуудыг хэвлэх.\n"
+
+#, fuzzy
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "Тааруухан багц"
diff --git a/po/ms.po b/po/ms.po
index e0c80418..0a980f89 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2008-08-21 23:48+0800\n"
"Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
"Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -56,7 +56,7 @@ msgstr "Install pakej `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Memuatturun pakej `%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Batal"
@@ -68,22 +68,22 @@ msgstr "Batal"
msgid "...retrieving failed: %s"
msgstr "...gagal terambil: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "Pemasangan RPM"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Ok"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -96,7 +96,7 @@ msgid ""
"What would you like to do?"
msgstr ""
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -111,7 +111,7 @@ msgstr ""
"\n"
"Teruskan?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -121,26 +121,31 @@ msgid ""
"You may prefer to just save it. What is your choice?"
msgstr ""
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Pasang"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Simpan"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Batal"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Pilih lokasi untuk menyimpan fail"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
#: ../gurpmi.pm:56
#, fuzzy, c-format
msgid "Options:"
@@ -216,24 +221,24 @@ msgstr " --update - guna hanya kemaskini media.\n"
msgid "No packages specified"
msgstr "Tiada pakej dinyatakan"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Mesti menjadi root"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, fuzzy, c-format
msgid "Preparing packages installation..."
msgstr "Pemasangan pakej..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr "semua telah diinstal"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -241,42 +246,37 @@ msgid ""
"Continue installation anyway?"
msgstr "semua telah diinstal"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Amaran"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (untuk naiktaraf)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (untuk memasang)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Pilihan pakej"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Salah satu pakej berikut diperlukan:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Batal"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -287,35 +287,35 @@ msgstr ""
"%s\n"
"Teruskan?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, fuzzy, c-format
msgid "%s of packages will be retrieved."
msgstr "%s mestilah nombor"
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Pakej berikut akan dihapus agar syarat kebergantungan dipenuhi (%d MB)"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -323,54 +323,54 @@ msgstr ""
"Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
"%s\n"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "tidak dapat mengambil pakej asal, batal"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Sila tunggu, mengeluarkan medium..."
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Selesai"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "Instalasi gagal"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr ""
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Instalasi gagal"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "semua telah diinstal"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Pemasangan selesai"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, fuzzy, c-format
msgid "restarting urpmi"
msgstr "Tambah media urpmi"
@@ -443,7 +443,7 @@ msgstr "Memuatturun pakej `%s'..."
msgid "Environment directory %s does not exist"
msgstr "Direktori didalam nama path yang diberi tidak wujud."
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, fuzzy, c-format
msgid "using specific environment on %s\n"
msgstr "Mencipta swap dienkrip pada %s using %s:"
@@ -498,62 +498,62 @@ msgstr "ralat pendaftaran pakej setempat"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: tidak dapat membaca fail rpm \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, fuzzy, c-format
msgid "unexpected expression %s"
msgstr "hujah tidak dijangka"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "12 pt sebelum"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, fuzzy, c-format
msgid "no expression to close"
msgstr "Ungkapan corak:\n"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, fuzzy, c-format
msgid "Can't use %s without %s"
msgstr "Tutup Tanpa Simpan"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, fuzzy, c-format
msgid "Can't use %s with %s"
msgstr "hidupkan penggunaan TLS dengan LDAP"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, fuzzy, c-format
msgid "Too many arguments\n"
msgstr "%s: terlalu banyak hujah\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -569,7 +569,7 @@ msgstr ""
"\n"
"penggunaan:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Hakcipta (C) %s %s"
@@ -616,7 +616,7 @@ msgstr "gagal tulis fail konfigurasi [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "gagal tulis fail konfigurasi [%s]"
@@ -1300,9 +1300,9 @@ msgid "Arch"
msgstr "Cari"
#: ../urpm/msg.pm:170
-#, fuzzy, c-format
-msgid "(suggested)"
-msgstr " Penyelesaian dicadangkan:\n"
+#, c-format
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, fuzzy, c-format
@@ -1957,7 +1957,7 @@ msgstr "nama fail rpm [%s] tidak sah"
#: ../urpmf:75
#, fuzzy, c-format
-msgid " --suggests - suggests tags\n"
+msgid " --recommends - recommends tags\n"
msgstr "Senarai tag:\n"
#: ../urpmf:76
@@ -1985,27 +1985,27 @@ msgstr "Cache Fail Pakej Jauh"
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - cetak versi, keluaran dan arch dgn nama.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, fuzzy, c-format
msgid "unterminated expression (%s)"
msgstr "Penyunting Ungkapan Nalar (regexp)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "Tiada status tersedia utk pakej ini\n"
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "Tiada status tersedia utk pakej ini\n"
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "menulis senarai fail untuk media \"%s\""
@@ -2032,7 +2032,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr "Senarai tag:\n"
#: ../urpmi:81
@@ -2121,7 +2121,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr "Senarai tag:\n"
#: ../urpmi:109
@@ -2890,9 +2890,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - papar diperlukan.\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - papar cadangan.\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - papar diperlukan.\n"
#: ../urpmq:85
#, c-format
@@ -3059,6 +3059,17 @@ msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
#, fuzzy
+#~ msgid "(suggested)"
+#~ msgstr " Penyelesaian dicadangkan:\n"
+
+#, fuzzy
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr "Senarai tag:\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - papar cadangan.\n"
+
+#, fuzzy
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "_Saiz (MB):"
diff --git a/po/mt.po b/po/mt.po
index 9ca69428..f53ea909 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2004-09-07 05:59+0200\n"
"Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
"Language-Team: Maltese <mt@li.org>\n"
@@ -62,7 +62,7 @@ msgstr "Qed jiġi nstallat \"%s\" (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Qed jitniżżel il-pakkett \"%s\"..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Ikkanċella"
@@ -74,22 +74,22 @@ msgstr "Ikkanċella"
msgid "...retrieving failed: %s"
msgstr "...qari falla: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Installazzjoni tas-sistema"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Ok"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, fuzzy, c-format
msgid ""
"You have selected a source package:\n"
@@ -110,7 +110,7 @@ msgstr ""
"\n"
"X'tixtieq tagħmel?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, fuzzy, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -125,7 +125,7 @@ msgstr ""
"\n"
"Inkella tista' sempliċiment tikteb il-fajls. X'tippreferi?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -140,26 +140,31 @@ msgstr ""
"\n"
"Inkella tista' sempliċiment tikteb il-fajls. X'tippreferi?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, fuzzy, c-format
msgid "_Install"
msgstr "Installa"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, fuzzy, c-format
msgid "_Save"
msgstr "Ikteb"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "I_kkanċella"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Agħżel fejn tikteb il-fajl"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -240,17 +245,17 @@ msgstr " --media - uża biss is-sorsi llistjati b'virgoli.\n"
msgid "No packages specified"
msgstr "Ebda kmand speċifikat"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, fuzzy, c-format
msgid "Must be root"
msgstr "Port tal-maws"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Qed jiġu ppreparati l-pakketti għall-installazzjoni..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -259,7 +264,7 @@ msgstr ""
"Xi pakketti mitluba ma jistgħux jiġu nstallati:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -269,42 +274,37 @@ msgstr ""
"Xi pakketti mitluba ma jistgħux jiġu nstallati:\n"
"%s"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Twissija"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Aġġornament"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, fuzzy, c-format
msgid " (to install)"
msgstr "Oħroġ mill-installazzjoni"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Wieħed minn dawn il-pakketti huwa meħtieġ:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, fuzzy, c-format
msgid "_Abort"
msgstr "Waqqaf"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -314,29 +314,29 @@ msgstr ""
"Dawn il-pakketti jridu jitneħħew qabel oħrajn jiġu aġġornati:\n"
"%s"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
@@ -344,41 +344,41 @@ msgstr ""
"Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jiġu nstallati wkoll "
"(%d MB)"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
"Biex nissodisfa d-dipendenzi, %d pakkett/i jridu jiġu nstallati wkoll (%d MB)"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ma nistax inġib il-pakketti tas-sors, se noħroġ"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Jekk jogħġbok daħħal id-diska mmarkata \"%s\" fl-apparat [%s]"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, fuzzy, c-format
msgid "_Done"
msgstr "Lest"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "installazzjoni falliet"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, fuzzy, c-format
msgid "You may want to update your urpmi database."
msgstr ""
@@ -387,22 +387,22 @@ msgstr ""
"%s\n"
"Forsi trid taġġorna d-database urpmi"
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "installazzjoni falliet"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "kollox diġà installat"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Installazzjoni lesta"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "qed jiġi ristartjat urpmi"
@@ -476,7 +476,7 @@ msgstr "Qed jitniżżel il-pakkett \"%s\"..."
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "qed jintuża ambjent speċifiku fuq %s\n"
@@ -531,62 +531,62 @@ msgstr "problema fir-reġistrazzjoni ta' pakketti lokali"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "dikjarazzjoni ta' \"proxy\" ħażina fil-linja ta' kmand\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: ma nistax naqra l-fajl rpm \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Firma nieqsa (%s)"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -603,7 +603,7 @@ msgstr ""
"\n"
"użu:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr ""
@@ -650,7 +650,7 @@ msgstr "ma setax jinkiteb il-fajl ta' konfigurazzjoni [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "ma setax jinkiteb il-fajl ta' konfigurazzjoni [%s]"
@@ -1340,7 +1340,7 @@ msgstr "Fittex"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -2000,8 +2000,8 @@ msgstr " --sourcerpm - print tag \"sourcerpm\": rpm tas-sors.\n"
#: ../urpmf:75
#, fuzzy, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --obsoletes - ipprintja l-kontenut ta' \"obsoletes\"\n"
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - uri \"requires\": kull ma jeħtieġ\n"
#: ../urpmf:76
#, fuzzy, c-format
@@ -2029,27 +2029,27 @@ msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - uri verżjoni, ħarġa u arkitettura flimkien ma' l-isem.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "ma nstabx fajl hdlists għas-sors \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "ibni l-fajl ta' sintesi tal-hdlist għas-sors \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "qed jinkiteb il-fajl b'lista għas-sors \"%s\""
@@ -2077,7 +2077,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --obsoletes - ipprintja l-kontenut ta' \"obsoletes\"\n"
#: ../urpmi:81
@@ -2181,7 +2181,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --obsoletes - ipprintja l-kontenut ta' \"obsoletes\"\n"
#: ../urpmi:109
@@ -2988,8 +2988,8 @@ msgstr " --requires - uri \"requires\": kull ma jeħtieġ\n"
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --obsoletes - ipprintja l-kontenut ta' \"obsoletes\"\n"
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - uri \"requires\": kull ma jeħtieġ\n"
#: ../urpmq:85
#, fuzzy, c-format
@@ -3163,6 +3163,14 @@ msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
#, fuzzy
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --obsoletes - ipprintja l-kontenut ta' \"obsoletes\"\n"
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --obsoletes - ipprintja l-kontenut ta' \"obsoletes\"\n"
+
+#, fuzzy
#~ msgid " --repackage - Re-package the files before erasing\n"
#~ msgstr " --packager - uri t-tag \"packager\": pakkeġġjatur.\n"
diff --git a/po/nb.po b/po/nb.po
index 4b4eb9d5..e898eca5 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nb\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2010-04-02 02:40+0200\n"
"Last-Translator: Olav Dahlum <odahlum@gmail.com>\n"
"Language-Team: Norwegian Bokmål <cooker-i18n@mandrivalinux.org>\n"
@@ -67,7 +67,7 @@ msgstr "Installerer pakke «%s» (%s/%s) …"
msgid "Downloading package `%s'..."
msgstr "Laster ned «%s» …"
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Avbryt"
@@ -79,22 +79,22 @@ msgstr "Avbryt"
msgid "...retrieving failed: %s"
msgstr "… mottak mislyktes: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "RPM-installasjon"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Feil: klarte ikke å finne fila %s, vil avbryte operasjon."
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_OK"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -115,7 +115,7 @@ msgstr ""
"\n"
"Hva ønsker du å gjøre?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -130,7 +130,7 @@ msgstr ""
"\n"
"Fortsett?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -145,26 +145,31 @@ msgstr ""
"\n"
"Det kan hende at du bare vil lagre dem. Hva vil du gjøre?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Installer"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Lagre"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Avbryt"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Velg hvor fila skal lagres."
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "OK"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -249,17 +254,17 @@ msgstr " --searchmedia – bare se etter pakker i dette mediet.\n"
msgid "No packages specified"
msgstr "Ingen pakker angitt"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Må være root"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Forbereder pakkeinstallasjon …"
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -268,7 +273,7 @@ msgstr ""
"Noen av de forespurte pakkene kan ikke installeres:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -279,42 +284,37 @@ msgstr ""
"%s\n"
"Fortsette installasjonen?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Advarsel"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "OK"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (å oppgradere)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (å installere)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Pakkevalg"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "En av de følgende pakkene er nødvendige:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Avbryt"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -325,61 +325,61 @@ msgstr ""
"%s\n"
"Fortsette installasjonen?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "%s med ytterligere diskplass vil bli brukt."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "%s med diskplass vil bli ledig."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s med pakker vil bli hentet."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Fortsette med installeringen av en pakke?"
msgstr[1] "Fortsette med installeringen av de %d pakkene?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Denne pakken vil bli installert for å oppfylle avhengigheter:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Disse pakkene vil bli installert for å oppfylle avhengigheter:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "kunne ikke få tak i kildepakker, avbryter"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Sett inn mediet «%s»"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Ferdig"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -388,27 +388,27 @@ msgstr ""
"Installasjon mislyktes, noen filer mangler:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Du vil kanskje oppdatere urpmi-databasen din."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Installasjon mislyktes:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Pakken(e) er allerede installert"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Installasjon ferdig"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "starter urpmi på nytt"
@@ -482,7 +482,7 @@ msgstr "Kan ikke laste ned pakkene til %s"
msgid "Environment directory %s does not exist"
msgstr "Miljømappen %s finnes ikke"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "Bruker selvvalgt miljø på %s\n"
@@ -537,63 +537,63 @@ msgstr "feil ved registrering av lokale pakker."
msgid "This operation is forbidden while running in restricted mode"
msgstr "Du kan ikke kjøre denne i begrenset modus."
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "ugyldig deklarasjon for mellomlager på kommandolinja.\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: Klarer ikke lese fila «%s»\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "uventet uttrykk %s"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "manglende uttrykk før %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "uventet uttrykk %s (forslag: bruk -a or -o ?"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "ingen uttrykk å lukke"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"som standard forventer urpmf et regulært uttrykk. Du kan bruke «--literal»"
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot-mappa finnes ikke"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "Kan ikke bruke %s uten «%s»."
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "Kan ikke bruke «%s» med «%s»."
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "For mange argumenter\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -609,7 +609,7 @@ msgstr ""
"\n"
"bruk:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Copyright © %s %s"
@@ -658,7 +658,7 @@ msgstr "klarte ikke lese oppsettfila [%s]."
msgid "medium `%s' is defined twice, aborting"
msgstr "mediet «%s» er spesifisert to ganger, avbryter"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "klarer ikke å skrive oppsettfila [%s]."
@@ -1352,8 +1352,8 @@ msgstr "Arkitektur"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(forslag)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -2026,9 +2026,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm – navn på kilde-rpm\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests – forslagstagger\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires – avhengighetstagger\n"
#: ../urpmf:76
#, c-format
@@ -2055,27 +2055,27 @@ msgstr " -m – mediet som pakka ble funnet i\n"
msgid " -f - print version, release and arch with name.\n"
msgstr " -f – vis versjon, utgivelse og arkitektur med navn.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "uavbrutt uttrykk (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Ugyldig format: du kan bare bruke én flerverditagg"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "fant ingen hdlist for mediet «%s»"
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "fant ingen synthesis for mediet «%s»"
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "ingen xml-info tilgjengelig for mediet «%s»"
@@ -2101,8 +2101,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans – fjern foreldreløse pakker uten å spørre\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --no-suggests – ikke autovelg «foreslåtte» pakker.\n"
#: ../urpmi:81
@@ -2204,8 +2204,8 @@ msgstr ""
" sjekking av avhengigheter og integritet.\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --allow-suggests – autovelg «foreslåtte» pakker.\n"
#: ../urpmi:109
@@ -3037,9 +3037,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires – vis avhengigheter.\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests – vis forslag.\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires – vis avhengigheter.\n"
#: ../urpmq:85
#, c-format
@@ -3198,6 +3198,15 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#~ msgid "(suggested)"
+#~ msgstr "(forslag)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests – forslagstagger\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests – vis forslag.\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d pakke – %d MB)"
diff --git a/po/nl.po b/po/nl.po
index 8ace0bac..baff1d17 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-nl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2013-12-03 18:43+0100\n"
"Last-Translator: Marja van Waes <marja@mageia.org>\n"
"Language-Team: Nederlands <vertaling@vrijschrift.org>\n"
@@ -66,7 +66,7 @@ msgstr "Bezig met installeren van pakket `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Downloaden van pakket `%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Annuleren"
@@ -78,22 +78,22 @@ msgstr "Annuleren"
msgid "...retrieving failed: %s"
msgstr "...ontvangst mislukt: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "RPM-installatie"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Fout opgetreden: kan bestand %s niet vinden, operatie wordt afgebroken"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Ok"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -114,7 +114,7 @@ msgstr ""
"\n"
"Wat wilt u doen?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -130,7 +130,7 @@ msgstr ""
"\n"
"Doorgaan?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -147,26 +147,31 @@ msgstr ""
"Mogelijk geeft u er de voorkeur aan het bestand slechts op te slaan. Wat is "
"uw keuze?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Installeren"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Opslaan"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Annuleren"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Kies locatie om bestand in op te slaan"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -258,17 +263,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Geen pakketten gespecificeerd"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Dient 'root' te zijn"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Voorbereiden van pakketinstallatie…"
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -277,7 +282,7 @@ msgstr ""
"Enkele gevraagde pakketten kunnen niet worden geïnstalleerd:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -288,42 +293,37 @@ msgstr ""
"%s\n"
"Toch verdergaan met installatie?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Waarschuwing"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (op te waarderen)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr "(te installeren)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Pakketkeuze"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Eén van de volgende pakketten is benodigd:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Afbreken"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -335,29 +335,29 @@ msgstr ""
"%s\n"
"Toch verdergaan met installatie?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "%s aan extra schijfruimte zal worden gebruikt."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "%s aan schijfruimte zal vrijkomen."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s aan pakketten zal worden opgehaald."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Verdergaan met de installatie van 1 pakket?"
msgstr[1] "Verdergaan met de installatie van de %d pakketten?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
@@ -365,7 +365,7 @@ msgstr ""
"Om aan afhankelijkheden te voldoen, wordt het volgende pakket geïnstalleerd:"
# Should use ngettext plural forms :-/
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -373,27 +373,27 @@ msgstr ""
"Om aan de afhankelijkheden te voldoen worden de volgende pakketten "
"geïnstalleerd:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "kan bronpakketten niet ontvangen, bezig met afbreken"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Gelieve het medium genaamd \"%s\" te plaatsen"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Klaar"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -402,27 +402,27 @@ msgstr ""
"Installatie mislukt, sommige bestanden ontbreken:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "U kunt proberen de urpmi-database bij te werken."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Installatie mislukt:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "De pakketten zijn reeds geïnstalleerd"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Installatie voltooid"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "urpmi herstarten"
@@ -499,7 +499,7 @@ msgstr "kan pakketten niet naar %s downloaden"
msgid "Environment directory %s does not exist"
msgstr "Omgevingsmap %s bestaat niet"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "maakt gebruik van aangegeven omgeving op %s\n"
@@ -554,64 +554,64 @@ msgstr "registreren van lokale pakketten is mislukt"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Deze operatie is verboden tijdens het uitvoeren in beperkte modus"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "ongeldige proxy-aanduiding op opdrachtregel\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: kon rpm bestand \"%s\" niet lezen\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "onverwachte uitdrukking %s"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "uitdrukking vóór %s ontbreekt"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "onverwachte uitdrukking %s (suggestie: gebruik -a of -o)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "geen afsluitbare uitdrukking"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"standaard verwacht urpmf een regexp, u dient de optie \"--literal\" te "
"gebruiken"
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot-map bestaat niet"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "Kan %s niet gebruiken zonder %s"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "Kan %s niet gebruiken samen met %s"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "Te veel argumenten\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -628,7 +628,7 @@ msgstr ""
"\n"
"gebruik:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Copyright © %s door %s"
@@ -677,7 +677,7 @@ msgstr "kan configuratiebestand [%s] niet lezen"
msgid "medium `%s' is defined twice, aborting"
msgstr "medium \"%s\" is twee keer gedefinieerd, afbreken"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "kon configuratiebestand [%s] niet wegschrijven"
@@ -1370,8 +1370,8 @@ msgstr "Arch"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(aangeraden)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -2065,9 +2065,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - naam van de broncode-rpm.\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - geeft tag-suggesties\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - requires ('vereisten')-tags\n"
#: ../urpmf:76
#, c-format
@@ -2094,27 +2094,27 @@ msgstr " -m - de media waarin het pakket gevonden is\n"
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - geeft de versie, uitgave en arch met naam.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "niet-afgesloten uitdrukking (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Onjuist formaat: u mag maar één tag gebruiken met meerdere waarden"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "geen hdlist-bestand beschikbaar voor medium \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "geen synthesis beschikbaar voor medium \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "geen xml-info beschikbaar voor medium \"%s\""
@@ -2141,8 +2141,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - wezen verwijderen zonder bevestiging\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --no-suggests - \"suggested\"-pakketten niet auto-selecteren.\n"
#: ../urpmi:81
@@ -2249,8 +2249,8 @@ msgstr ""
" integriteitscontrole.\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --allow-suggests - \"suggested\"-pakketten autoselecteren.\n"
#: ../urpmi:109
@@ -3109,9 +3109,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - requires ('vereisten') afdrukken.\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - suggests ('suggereert') afdrukken.\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - requires ('vereisten') afdrukken.\n"
#: ../urpmq:85
#, c-format
@@ -3281,6 +3281,15 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#~ msgid "(suggested)"
+#~ msgstr "(aangeraden)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - geeft tag-suggesties\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - suggests ('suggereert') afdrukken.\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d pakket, %d MB)"
diff --git a/po/nn.po b/po/nn.po
index 0b0f2b8b..69a47de0 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2010-02-07 16:49+0100\n"
"Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -56,7 +56,7 @@ msgstr "Installerer pakken «%s» (%s/%s) ..."
msgid "Downloading package `%s'..."
msgstr "Lastar ned pakken «%s» ..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Avbryt"
@@ -68,22 +68,22 @@ msgstr "Avbryt"
msgid "...retrieving failed: %s"
msgstr "... Feil ved nedlasting: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "RPM-installering"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Feil: Fann ikkje fila «%s». Operasjonen vert avbroten."
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_OK"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -104,7 +104,7 @@ msgstr ""
"\n"
"Er du sikker på at du vil installera pakken?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -119,7 +119,7 @@ msgstr ""
"\n"
"Vil du halda fram?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -134,26 +134,31 @@ msgstr ""
"\n"
"Du kan òg velja å berre lagra han. Kva vil du gjera?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Installer"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Lagra"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Avbryt"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Vel plassering av lagra fil."
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "OK"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -235,17 +240,17 @@ msgstr " --searchmedia – Berre sjå etter pakkar i dette mediet.\n"
msgid "No packages specified"
msgstr "Ingen pakkar valde"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Må vera root"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Førebur pakkeinstallering ..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -254,7 +259,7 @@ msgstr ""
"Nokre av pakkane kan ikkje installerast:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -265,42 +270,37 @@ msgstr ""
"%s\n"
"Vil du likevel halda fram?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Åtvaring"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "OK"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (oppgradering)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (installering)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Pakkeval"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Du treng éin av desse pakkane:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Avbryt"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -311,61 +311,61 @@ msgstr ""
"%s\n"
"Vil du likevel halda fram?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Det vert brukt %s meir diskplass."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "Det vert frigjort %s diskplass."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s pakkar vert henta ned."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Vil du halda fram med installeringa av pakken?"
msgstr[1] "Vil du halda fram med installeringa av dei %d pakkane?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Grunna avhengnader vert denne pakken installert:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Grunna avhengnader vert desse pakkane installerte:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "Fann ikkje kjeldepakke. Avbryt."
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Set inn mediet «%s»"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Ferdig"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -374,27 +374,27 @@ msgstr ""
"Feil ved installering. Nokre filer manglar:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Du bør oppdatera urpmi-databasen."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Feil ved installering:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Alt er allereie installert."
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Installeringa er fullført"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "Startar urpmi på nytt."
@@ -468,7 +468,7 @@ msgstr "Klarte ikkje lasta ned pakkar til %s"
msgid "Environment directory %s does not exist"
msgstr "Miljømappa «%s» finst ikkje."
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "Brukar tilpassa miljø på «%s»\n"
@@ -523,64 +523,64 @@ msgstr "Klarte ikkje registrera lokale pakkar."
msgid "This operation is forbidden while running in restricted mode"
msgstr "Du kan ikkje køyra denne operasjonen i avgrensa modus."
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "Ugyldig mellomtenardeklarasjon på kommandolinja.\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: Klarer ikkje lesa rpm-fila «%s».\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "Uventa uttrykk: %s"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "Manglar uttrykk før «%s»."
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "Uventa uttrykk: %s (forslag: bruk «-a» eller «-o»)."
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "Ingen uttrykk å lukka."
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"Som standard ventar urpmf eit regulært uttrykk. Du bør bruka valet «--"
"literal»."
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "«chroot»-mappa finst ikkje."
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "Kan ikkje bruka «%s» utan «%s»."
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "Kan ikkje bruka «%s» med «%s»."
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "For mange argument.\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -597,7 +597,7 @@ msgstr ""
"\n"
"Bruk:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Copyright © %s %s"
@@ -646,7 +646,7 @@ msgstr "Klarte ikkje lesa oppsettfila [%s]."
msgid "medium `%s' is defined twice, aborting"
msgstr "Mediet «%s» er definert to gonger. Avbryt."
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "Klarte ikkje skriva oppsettfila [%s]."
@@ -1340,8 +1340,8 @@ msgstr "Arkitektur"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(forslag)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -2013,9 +2013,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm – Namn på kjelde-RPM.\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests – Føreslått-merkelappar.\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires – Krev-merkelappar.\n"
#: ../urpmf:76
#, c-format
@@ -2042,27 +2042,27 @@ msgstr " -m – Mediet som pakken vart funnen i.\n"
msgid " -f - print version, release and arch with name.\n"
msgstr " -f – Vis versjon-, utgåve og arkitekturinformasjon.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "Uavslutta uttrykk: %s"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Ugyldig format: Du kan berre bruka éin fleirverdi-merkelapp."
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "Fann inga «hdlist» for mediet «%s»."
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "Fann inga syntesefil for mediet «%s»."
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "Fann ingen xml-info for mediet «%s»."
@@ -2088,8 +2088,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans – Fjern foreldrelause pakkar utan å spørja først.\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --no-suggests – Vel ikkje automatisk føreslåtte pakkar.\n"
#: ../urpmi:81
@@ -2192,8 +2192,8 @@ msgstr ""
" utan sjekking av avhengnader og integritet.\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --allow-suggests – Vel automatisk føreslåtte pakkar.\n"
#: ../urpmi:109
@@ -3025,9 +3025,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires – Vis kravinformasjon.\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests – Vis føreslåtte.\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires – Vis kravinformasjon.\n"
#: ../urpmq:85
#, c-format
@@ -3194,6 +3194,15 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#~ msgid "(suggested)"
+#~ msgstr "(forslag)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests – Føreslått-merkelappar.\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests – Vis føreslåtte.\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d pakke – %d MB)"
diff --git a/po/pa_IN.po b/po/pa_IN.po
index c6dbd0b0..0cb28565 100644
--- a/po/pa_IN.po
+++ b/po/pa_IN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2005-03-23 21:55+0530\n"
"Last-Translator: Kanwaljeet Singh Brar <kanwaljeetbrar@yahoo.co.in>\n"
"Language-Team: Panjabi <fedora-trans-pa@redhat.com>\n"
@@ -58,7 +58,7 @@ msgstr "`%s' (%s/%s) ਪੈਕੇਜ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰ
msgid "Downloading package `%s'..."
msgstr "`%s' ਪੈਕੇਜ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "ਰੱਦ ਕਰੋ"
@@ -70,22 +70,22 @@ msgstr "ਰੱਦ ਕਰੋ"
msgid "...retrieving failed: %s"
msgstr "...ਪ੍ਰਾਪਤੀ ਅਸਫਲ: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "RPM ਇੰਸਟਾਲੇਸ਼ਨ"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "ਠੀਕ ਹੈ(_O)"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -106,7 +106,7 @@ msgstr ""
"\n"
"ਤੁਸੀਂ ਕੀ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -121,7 +121,7 @@ msgstr ""
"\n"
"ਜਾਰੀ ਰੱਖਣਾ ਹੈ?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -136,26 +136,31 @@ msgstr ""
"\n"
"ਤੁਸੀਂ ਇਸ ਨੂੰ ਸਿਰਫ਼ ਸੰਭਾਲ ਵੀ ਸਕਦੇ ਹੋ। ਤੁਹਾਡੀ ਚੋਣ ਕੀ ਹੈ?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "ਇੰਸਟਾਲ(_I)"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "ਸੰਭਾਲੋ(_S)"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "ਰੱਦ(_C)"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "ਫਾਇਲ਼ ਸੰਭਾਲਣ ਲਈ ਟਿਕਾਣਾ ਦਿਓ"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "ਠੀਕ ਹੈ"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -238,17 +243,17 @@ msgstr ""
msgid "No packages specified"
msgstr "ਕੋਈ ਪੈਕੇਜ %s ਨਾਂ ਨਾਲ ਨਹੀਂ"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "ਪ੍ਰਬੰਧਕ (root) ਬਣਨਾ ਪਵੇਗਾ"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "ਪੈਕੇਜ ਇੰਸਟਾਲੇਸ਼ਨ ਲਈ ਤਿਆਰੀ ਜਾਰੀ..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -257,7 +262,7 @@ msgstr ""
"ਮੰਗੇ ਕੁਝ ਪੈਕੇਜ ਇੰਸਟਾਲ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ ਹਨ:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -268,42 +273,37 @@ msgstr ""
"%s\n"
"ਜਾਰੀ ਰੱਖਣਾ ਹੈ?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "ਚੇਤਾਵਨੀ"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "ਠੀਕ ਹੈ"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (ਨਵੀਨੀਕਰਨ ਕਰਨ ਲਈ)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (ਇੰਸਟਾਲ ਕਰਨ ਲਈ)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਦੀ ਲੋੜ ਹੈ:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "ਛੱਡੋ(_A)"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -314,35 +314,35 @@ msgstr ""
"%s\n"
"ਕੀ ਜਾਰੀ ਰੱਖਣਾ ਹੈ?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "ਨਿਰਭਰਤਾ ਹੱਲ ਕਰਨ ਲਈ, ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜ ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ (%d ਮੈਬਾ)"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -350,34 +350,34 @@ msgstr ""
"ਨਿਰਭਰਤਾ ਸਮਾਪਤ ਕਰਨ ਲਈ, %d ਪੈਕੇਜ ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ:\n"
"%s\n"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ਸਰੋਤ ਪੈਕੇਜ ਪ੍ਰਾਪਤ ਕਰਨ ਤੋਂ ਅਸਫਲ, ਅਧੂਰਾ ਛੱਡਿਆ ਜਾਦਾ ਹੈ"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "ਕਿਪਾ ਕਰਕੇ \"%s\" ਨਾਂ ਮਾਧਿਅਮ [%s] ਜੰਤਰ ਵਿੱਚ ਪਾਓ"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "ਸਮਾਪਤ(_D)"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ ਹੋਈ"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, fuzzy, c-format
msgid "You may want to update your urpmi database."
msgstr ""
@@ -385,22 +385,22 @@ msgstr ""
"%s\n"
"ਤੁਸੀਂ ਆਪਣੇ urpmi ਡਾਟਾਬੇਸ ਦਾ ਨਵੀਨੀਕਰਨ ਕਰ ਸਕਦੇ ਹੋ"
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ ਹੋਈ"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "ਇੰਸਟਾਲੇਸ਼ ਸਮਾਪਤ"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "urpmi ਮੁੜ ਚਾਲੂ"
@@ -474,7 +474,7 @@ msgstr "`%s' ਪੈਕੇਜ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹ
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "%s ਤੇ ਖਾਸ ਵਾਤਾਵਰਣ ਦੀ ਵਰਤੋਂ ਕਰਕੇ\n"
@@ -529,62 +529,62 @@ msgstr "ਸਥਾਨਕ ਪੈਕੇਜ ਰਜਿਸਟਰ ਕਰਨ ਦੌਰ
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "ਕਮਾਂਡ ਸਤਰ ਤੇ ਗਲਤ ਪਰਾਕਸੀ ਪ੍ਰਗਟਾ\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: rpm ਫਾਇਲ \"%s\" ਪੜੀ ਨਹੀਂ ਜਾ ਸਕਦੀ\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "ਦਸਤਖਤ (%s) ਗੁੰਮ ਹਨ"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -600,7 +600,7 @@ msgstr ""
"\n"
"ਵਰਤੋਂ:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr ""
@@ -647,7 +647,7 @@ msgstr "ਸੰਰਚਨਾ ਫਾਇਲ [%s] ਲਿਖਣ ਤੋਂ ਅਸਫਲ
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "ਸੰਰਚਨਾ ਫਾਇਲ [%s] ਲਿਖਣ ਤੋਂ ਅਸਫਲ"
@@ -1334,7 +1334,7 @@ msgstr "ਖੋਜ"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -1993,8 +1993,8 @@ msgstr " --sourcerpm - print tag sourcerpm: source rpm.\n"
#: ../urpmf:75
#, fuzzy, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --obsoletes - print tag obsoletes: all obsoletes.\n"
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - print tag requires: all requires.\n"
#: ../urpmf:76
#, fuzzy, c-format
@@ -2021,27 +2021,27 @@ msgstr " -l - list files in package.\n"
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - print version, release and arch with name.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ hdlist ਫਾਇਲ ਨਹੀਂ ਮਿਲੀ"
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ hdlist ਸੰਸਲੇਸ਼ਕ ਫਾਇਲ ਬਣਾਈ"
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "\"%s\" ਮਾਧਿਅਮ ਲਈ list ਫਾਇਲ ਲਿਖੀ ਜਾ ਰਹੀ ਹੈ"
@@ -2069,7 +2069,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --obsoletes - print tag obsoletes: all obsoletes.\n"
#: ../urpmi:81
@@ -2169,7 +2169,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --obsoletes - print tag obsoletes: all obsoletes.\n"
#: ../urpmi:109
@@ -2975,8 +2975,8 @@ msgstr " --requires - print tag requires: all requires.\n"
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --obsoletes - print tag obsoletes: all obsoletes.\n"
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - print tag requires: all requires.\n"
#: ../urpmq:85
#, fuzzy, c-format
@@ -3140,6 +3140,14 @@ msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
#, fuzzy
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --obsoletes - print tag obsoletes: all obsoletes.\n"
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --obsoletes - print tag obsoletes: all obsoletes.\n"
+
+#, fuzzy
#~ msgid " --repackage - Re-package the files before erasing\n"
#~ msgstr " --packager - print tag packager: packager.\n"
diff --git a/po/pl.po b/po/pl.po
index 98b026cc..2ab6869c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2013-11-04 12:33+0100\n"
"Last-Translator: Daniel Napora <napcok@gmail.com>\n"
"Language-Team: Polish <kde-i18n-doc@kde.org>\n"
@@ -73,7 +73,7 @@ msgstr "Instalowanie pakietu \"%s\" (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Pobieranie pakietu \"%s\"..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Anuluj"
@@ -85,23 +85,23 @@ msgstr "Anuluj"
msgid "...retrieving failed: %s"
msgstr "...pobieranie nie powiodło się: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "Instalacja pakietów RPM"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
"Błąd: odnalezienie pliku %s było niemożliwe, operacja zostanie anulowana"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Ok"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -122,7 +122,7 @@ msgstr ""
"\n"
"Co chcesz zrobić?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -137,7 +137,7 @@ msgstr ""
"\n"
"Kontynuować?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -152,26 +152,31 @@ msgstr ""
"\n"
"Być może będziesz mieć ochotę go zapisać. Jaki jest twój wybór?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Instaluj"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Zapisz"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Anuluj"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Wybierz miejsce zapisania pliku"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -262,17 +267,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Nie wybrano pakietów"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Tylko root ma prawo do tego działania"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Przygotowywanie instalacji pakietów..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -281,7 +286,7 @@ msgstr ""
"Niektóre z wybranych pakietów nie mogą zostać zainstalowane:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -292,42 +297,37 @@ msgstr ""
"%s\n"
"Czy kontynuować mimo to?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Ostrzeżenie"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (do aktualizacji)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (do zainstalowania)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Wybór pakietów"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Wymagany jest jeden z następujących pakietów:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Przerwij"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -338,22 +338,22 @@ msgstr ""
"%s\n"
"Czy kontynuować mimo to?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Zostanie wykorzystany dodatkowy obszar na dysku: %s"
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "Zostanie zwolniony obszar na dysku: %s."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "Zostanie pobranych %s pakietów."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -361,41 +361,41 @@ msgstr[0] "Rozpocząć instalację jednego pakietu? "
msgstr[1] "Rozpocząć instalację %d pakietów?"
msgstr[2] "Rozpocząć instalację 1 pakietu? (%d MB)"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"W celu spełnienia zależności zostanie zainstalowany następujący pakiet:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
"W celu spełnienia zależności zostaną zainstalowane następujące pakiety:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "nie można pobrać pakietów źródłowych, zaniechanie"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Włóż nośnik o nazwie \"%s\" "
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "Gotowe"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -404,27 +404,27 @@ msgstr ""
"Instalacja nie powiodła się. Brak niektórych plików:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Być może konieczna jest aktualizacja bazy urpmi."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Instalacja nie powiodła się:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Wszystko zostało już zainstalowane"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Instalacja zakończona"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "ponownie uruchamianie urpmi"
@@ -499,7 +499,7 @@ msgstr "Pobranie pakietów do %s było niemożliwe"
msgid "Environment directory %s does not exist"
msgstr "Katalog %s nie istnieje"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "używając określonego środowiska na %s\n"
@@ -554,62 +554,62 @@ msgstr "błąd w trakcie rejestrowania pakietów lokalnych"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Operacja niedozwolona podczas pracy w trybie restrykcyjnym"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "niepoprawna deklaracja serwera pośredniczącego w wierszu poleceń\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: nie można odczytać pliku rpm \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "niespodziewane wyrażenie %s"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "brakujące wyrażenie przed %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "niespodziewane wyrażenie %s (sugestia: użyj -a lub -o ?)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "brak wyrażenia do zamknięcia"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr "w domyślnym ustawieniu urpmf oczekuje regexp. Użyj opcji \"--literal\""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "Katalog chroot nie istnieje"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "Nie można użyć %s bez %s"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "Nie można użyć %s z %s"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "Zbyt wiele argumentów\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -626,7 +626,7 @@ msgstr ""
"\n"
"użycie:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Copyright (C) %s by %s"
@@ -675,7 +675,7 @@ msgstr "odczytanie pliku konfiguracyjnego było niemożliwe [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "nośnik %s jest dwukrotnie zdefiniowany, przerywanie"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "nie można zapisać pliku konfiguracyjnego [%s]"
@@ -1376,8 +1376,8 @@ msgstr "Architektura"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(sugerowany)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -2084,9 +2084,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - nazwa pakietu rpm ze źródłami\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - znaczniki z sugestiami\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - wszystkie zależności.\n"
#: ../urpmf:76
#, c-format
@@ -2113,27 +2113,27 @@ msgstr " -m - nośnik na którym znajduje się pakiet\n"
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - wyświetla wersję, wydanie oraz archiwum z nazwą.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "niezakończone wyrażenie (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Nieprawidłowy format: możesz używać tylko znaczniki wielowartościowe"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "nie znaleziono pliku hdlist dla nośnika \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "brak pliku syntezy dla nośnika \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "brak informacji xml dla nośnika \"%s\""
@@ -2160,8 +2160,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - usuń osierocone pakiety bez pytania\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr ""
" --no-suggests - nie wybieraj automatycznie pakietów oznaczonych jako "
"\"sugerowane\" .\n"
@@ -2269,8 +2269,8 @@ msgstr ""
" i spójności.\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --allow-suggests - automatyczny wybór \"sugerowanych\" pakietów.\n"
#: ../urpmi:109
@@ -3122,9 +3122,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - wyświetla zależne pakiety.\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - wyświetla sugestie\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - wyświetla zależne pakiety.\n"
#: ../urpmq:85
#, c-format
@@ -3298,6 +3298,15 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#~ msgid "(suggested)"
+#~ msgstr "(sugerowany)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - znaczniki z sugestiami\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - wyświetla sugestie\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d pakiet, %d MB)"
diff --git a/po/pt.po b/po/pt.po
index bf3709c2..ae19bba8 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2012-05-22 21:58+0100\n"
"Last-Translator: Pedro <simplew8@gmail.com>\n"
"Language-Team: Portuguese <>\n"
@@ -70,7 +70,7 @@ msgstr "A instalar o pacote `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "A transferir o pacote `%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Cancelar"
@@ -82,22 +82,22 @@ msgstr "Cancelar"
msgid "...retrieving failed: %s"
msgstr "...transferência falhada: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "Instalação RPM"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Erro: não é possível encontrar o ficheiro %s, cancelar a operação"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Ok"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -118,7 +118,7 @@ msgstr ""
"\n"
"O que deseja fazer?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -133,7 +133,7 @@ msgstr ""
"\n"
"Deseja continuar?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -148,26 +148,31 @@ msgstr ""
"\n"
"Pode preferir apenas gravá-lo. O que deseja?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Instalar"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Gravar"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Cancelar"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Escolha onde deseja gravar o ficheiro"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -260,17 +265,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Nenhum pacote escolhido"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Tem que ser administrador"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "A preparar a instalação dos pacotes..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -279,7 +284,7 @@ msgstr ""
"Alguns pacotes pedidos não podem ser instalados:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -290,42 +295,37 @@ msgstr ""
"%s\n"
"Deseja continuar a instalação?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Aviso"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (para actualizar)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (para instalar)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Escolha de pacotes"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "É necessário um dos seguintes pacotes:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Abortar"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -337,62 +337,62 @@ msgstr ""
"%s\n"
"Continuar a instalação?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "%s adicionais do espaço do disco irão ser usados."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "%s do espaço do disco irão ser libertados"
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s dos pacotes serão transferidos."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Prosseguir com a instalação do pacote?"
msgstr[1] "Prosseguir com a instalação dos %d pacotes?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Para satisfazer as dependências, o seguinte pacote irá ser instalado:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
"Para satisfazer as dependências, os seguintes pacotes irão ser instalados:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "não é possível obter os pacotes fonte, a abortar"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Por favor insira a média chamada \"%s\""
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Terminado"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -401,27 +401,27 @@ msgstr ""
"Instalação falhada, faltam alguns ficheiros:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Pode querer actualizar a sua base de dados urpmi."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Instalação falhada:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "O(s) pacote(s) já está(ão) instalado(s)"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Instalação finalizada"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "a reiniciar urpmi"
@@ -496,7 +496,7 @@ msgstr "Não é possível transferir os pacotes para %s"
msgid "Environment directory %s does not exist"
msgstr "O directório de ambiente %s não existe"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "a usar um ambiente específico em %s\n"
@@ -551,64 +551,64 @@ msgstr "erro ao registar os pacotes locais"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Esta operação é proibida enquanto correr em modo restrito"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "declaração 'proxy' inválida na linha de comando\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: não consegue ler o ficheiro rpm \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "expressão inesperada %s"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "falta uma expressão antes de %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "expressão inesperada %s (sugestão: use -a ou -o ?)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "nenhuma expressão para fechar"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"por predefinição o urpmf espera uma expressão regular. Deve usar a opção \"--"
"literal\""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "o directório chroot não existe"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "Não pode usar %s sem %s"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "Não pode usar %s com %s"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "Demasiados argumentos\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -624,7 +624,7 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Direitos de Autor (C) %s pela %s"
@@ -673,7 +673,7 @@ msgstr "não é possível ler o ficheiro de configuração [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "a média `%s' está definida duas vezes, abortar"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "não é possível gravar o ficheiro de configuração [%s]"
@@ -1370,8 +1370,8 @@ msgstr "Arquitectura"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(sugerido)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -2065,9 +2065,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - nome do rpm de código fonte\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - marcas sugeridas\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - marcas de requerimentos (requires).\n"
#: ../urpmf:76
#, c-format
@@ -2095,27 +2095,27 @@ 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"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "expressão não terminada (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Formato incorrecto: pode apenas usar uma marca multi-avaliada"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "nenhum ficheiro hdlist disponível para a média \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "nenhum ficheiro synthesis disponível para a média \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "nenhuma informação xml disponível para a média \"%s\""
@@ -2141,8 +2141,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - remove os órfãos sem perguntar\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr ""
" --no-suggests - não selecciona automaticamente os pacotes \"sugeridos\".\n"
@@ -2247,8 +2247,8 @@ msgstr ""
" os pacotes sem verificar as dependências e integridade.\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr ""
" --allow-suggests - selecciona automaticamente os pacotes \"sugeridos\".\n"
@@ -3104,9 +3104,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - mostra os requerimentos.\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - mostra as sugestões.\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - mostra os requerimentos.\n"
#: ../urpmq:85
#, c-format
@@ -3279,6 +3279,15 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#~ msgid "(suggested)"
+#~ msgstr "(sugerido)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - marcas sugeridas\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - mostra as sugestões.\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d pacote, %d MB)"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5ab8196a..f61572e5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2013-02-24 19:07+0100\n"
"Last-Translator: Rémi Verschelde <remi@verschelde.fr>\n"
"Language-Team: Brazilian Portuguese <cooker-i18n@mandrivalinux.org>\n"
@@ -70,7 +70,7 @@ msgstr "Instalando pacote `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Baixando o pacote `%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Cancelar"
@@ -82,22 +82,22 @@ msgstr "Cancelar"
msgid "...retrieving failed: %s"
msgstr "...a busca falhou: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "Instalação de RPM"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Erro: não foi possível encontrar arquivo %s, cancelando operação"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Ok"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -119,7 +119,7 @@ msgstr ""
"\n"
"O que você deseja fazer?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -135,7 +135,7 @@ msgstr ""
"\n"
"Confirma instalação?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -151,26 +151,31 @@ msgstr ""
"\n"
"Você pode apenas salvá-lo(s). Qual a sua escolha?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Instalar"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Salvar"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Cancelar"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Escolha o local para salvar o arquivo"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -257,17 +262,17 @@ msgstr " --searchmedia - usa apenas a mídia fornecida para buscar pacotes.\n"
msgid "No packages specified"
msgstr "Nenhum pacote especificado"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Tem que ser root"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Preparando programas para instalação..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -276,7 +281,7 @@ msgstr ""
"Alguns pacotes não puderam ser instalados:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -287,42 +292,37 @@ msgstr ""
"%s\n"
"Prosseguir com a instalação mesmo assim?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Aviso"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (para atualizar)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (para instalar)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Escolha de Programas"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Um seguintes programas é necessário:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Abortar"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -333,62 +333,62 @@ msgstr ""
"%s\n"
"Prosseguir com a instalação mesmo assim?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "%s de espaço adicional em disco será usado."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "%s de espaço em disco serão liberados."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s de pacotes serão baixados."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Proceder a instalação de um pacote?"
msgstr[1] "Proceder a instalação de %d pacotes?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Para satisfazer as dependências, o seguinte pacote será instalado:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
"Para satisfazer as dependências, os seguintes programas serão instalados:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "incapaz de obter pacotes fonte, abortando"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Por favor insira a mídia chamada \"%s\""
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Pronto"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -397,27 +397,27 @@ msgstr ""
"A instalação falhou, alguns arquivos faltam:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Você precisa atualizar a sua base de dados urpmi."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "A Instalação falhou:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Tudo já está instalado"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Instalação concluída"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "reiniciando urpmi"
@@ -491,7 +491,7 @@ msgstr "Não foi possível fazer o download dos programas em %s"
msgid "Environment directory %s does not exist"
msgstr "Diretório de ambiente %s não existe"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "usando o ambiente específico em %s\n"
@@ -546,63 +546,63 @@ msgstr "erro ao registrar pacotes locais"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Esta operação não é permitida no modo restrito"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "declaração de proxy errada na linha de comando\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: não pode ler o arquivo rpm \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "expressão inesperada %s"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "expressão faltando antes %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "expressão inesperada %s (sugestão: usar -a ou -o ?)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "sem expressão para fechar"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"por padrão urpmf espera uma regexp. você pode usar a opção \"--literal\""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "diretório chroot não existe"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "Não é possível usar %s sem %s"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "Não é possível usar %s com %s"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "Muitos parâmetros\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -619,7 +619,7 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Copyright (C) %s por %s"
@@ -669,7 +669,7 @@ msgstr "incapaz de ler o arquivo de configuração [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "mídia `%s' está definida duas vezes, abortando"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "incapaz de gravar o arquivo de configuração [%s]"
@@ -1362,8 +1362,8 @@ msgstr "Arch"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(sugerido)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -2042,9 +2042,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - nome da fonte do rpm\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - lista sugestões\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - lista dos que requerem o pacote\n"
#: ../urpmf:76
#, c-format
@@ -2072,28 +2072,28 @@ msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - imprime versão, 'release' e arquitetura, com nome.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "expressão indeterminada (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
"Formato incorreto: você deve utilizar somente uma opção com múltiplos valores"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "nenhum hdlist disponível para a mídia \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "synthesis não disponível para a mídia \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "xml-info não disponível para a mídia \"%s\""
@@ -2119,8 +2119,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - remove pacotes órfãos sem confirmação do usuário\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --no-suggests - não seleciona automaticamente pacotes sugeridos.\n"
#: ../urpmi:81
@@ -2222,8 +2222,8 @@ msgstr ""
" dependências e integridade.\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --allow-suggests - seleciona automaticamente pacotes sugeridos.\n"
#: ../urpmi:109
@@ -3061,9 +3061,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - lista requires.\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - exibir sugestões\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - lista requires.\n"
#: ../urpmq:85
#, c-format
@@ -3229,6 +3229,15 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#~ msgid "(suggested)"
+#~ msgstr "(sugerido)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - lista sugestões\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - exibir sugestões\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d pacote, %d MB)"
diff --git a/po/ro.po b/po/ro.po
index 4870daee..01e12710 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2013-04-05 10:36+0000\n"
"Last-Translator: Florin Cătălin RUSSEN <cfrussen@yahoo.co.uk>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/mageia/language/"
@@ -58,7 +58,7 @@ msgstr "Se instalează pachetul „%s” (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Se descarcă pachetul „%s”..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Anulează"
@@ -70,22 +70,22 @@ msgstr "Anulează"
msgid "...retrieving failed: %s"
msgstr "...preluare eșuată: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "Instalare RPM"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Eroare: nu s-a găsit fișierul %s, se anulează operația"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_OK"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -106,7 +106,7 @@ msgstr ""
"\n"
"Ce doriți să faceți?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -121,7 +121,7 @@ msgstr ""
"\n"
"Continuați?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -136,26 +136,31 @@ msgstr ""
"\n"
"Poate preferați doar să-l salvați. Ce alegeți?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Instalează"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Salvează"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Anulează"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Alegeți locația unde se salvează fișierul"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "OK"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -247,17 +252,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Nu a fost specificat nici un pachet"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Trebuie să fiți root"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Se pregătesc pachetele pentru instalare..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -266,7 +271,7 @@ msgstr ""
"Cîteva pachete cerute nu pot fi instalate:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -277,42 +282,37 @@ msgstr ""
"%s\n"
"Continuați totuși instalarea?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Avertisment"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "OK"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (pentru actualizare majoră)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (pentru instalare)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Alegerea pachetor"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Unul din următoarele pachete este necesar:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Abandonează"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -324,22 +324,22 @@ msgstr ""
"%s\n"
"Continuați totuși instalarea?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Vor fi utilizați %s adiționali din spațiul de pe disc."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "Vor fi eliberați %s din spațiul de pe disc."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s de pachete vor fi preluați."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -347,40 +347,40 @@ msgstr[0] "Continuați cu instalarea pachetului?"
msgstr[1] "Continuați cu instalarea celor %d pachete?"
msgstr[2] "Continuați cu instalarea celor %d de pachete?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Pentru satisfacerea dependențelor, următorul pachet va fi instalat:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
"Pentru satisfacerea dependențelor, următoarele pachete vor fi instalate:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "nu se pot prelua pachetele sursă, se abandonează"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Inserați mediul numit „%s”"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Gata"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -389,27 +389,27 @@ msgstr ""
"Instalare eșuată, lipsesc cîteva fișiere:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Ați putea actualiza baza de date urpmi."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Instalare eșuată:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Totul este deja instalat"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Instalare terminată"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "se repornește urpmi"
@@ -483,7 +483,7 @@ msgstr "Nu se pot descărca pachetele în %s"
msgid "Environment directory %s does not exist"
msgstr "Directorul %s nu există"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "utilizînd mediul specific pe %s\n"
@@ -538,64 +538,64 @@ msgstr "eroare la înregistrarea pachetelor locale"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Această operație este interzisă cînd rulați în modul restricționat"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "declarație greșită de proxy în linia de comandă\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: nu se poate citi fișierul rpm „%s”\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "expresie neprevăzută %s"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "lipsește expresia înaintea lui %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "expresie neprevăzută %s (sugestie: utilizați -a sau -o ?)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "nici o expresie pentru închidere"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"urpmf așteaptă implicit un regexp. ar trebui să utilizați opțiunea „--"
"literal”"
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "directorul chroot nu există"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "Nu se poate utiliza %s fără %s"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "Nu se poate utiliza %s cu %s"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "Prea multe argumente\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -612,7 +612,7 @@ msgstr ""
"\n"
"utilizare:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Drepturi de autor (C) %s de către %s"
@@ -661,7 +661,7 @@ msgstr "nu se poate citi fișierul de configurare [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "mediul „%s” este definit de două ori, se abandonează"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "nu se poate scrie în fișierul de configurare [%s]"
@@ -1355,8 +1355,8 @@ msgstr "Arhit"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(sugerat)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -2061,9 +2061,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - numele pachetului sursă\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - lista de sugestii\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - lista pachetelor necesare\n"
#: ../urpmf:76
#, c-format
@@ -2091,28 +2091,28 @@ msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - afișează versiunea, ediția și arhitectura cu nume.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "expresie nedeterminată (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
"Format incorect: puteți utiliza numai o singură etichetă cu valori multiple"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "nu este disponibil un hdlist pentru mediul „%s”"
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "nu este disponibil un synthesis pentru mediul „%s”"
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "nu sînt disponibile informațiile XML pentru mediul „%s”"
@@ -2138,8 +2138,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - înlătură pachetele orfane fără confirmare\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --no-suggests - nu se selectează automat pachetele „sugerate”.\n"
#: ../urpmi:81
@@ -2244,8 +2244,8 @@ msgstr ""
"integrității.\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --allow-suggests - selectare automată a pachetelor „sugerate”.\n"
#: ../urpmi:109
@@ -3113,9 +3113,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - afișează pachetele necesare.\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - afișează pachetele sugerate.\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - afișează pachetele necesare.\n"
#: ../urpmq:85
#, c-format
@@ -3289,3 +3289,12 @@ msgstr ""
#: ../polkit/org.mageia.gurpmi2.policy.in.h:2
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+
+#~ msgid "(suggested)"
+#~ msgstr "(sugerat)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - lista de sugestii\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - afișează pachetele sugerate.\n"
diff --git a/po/ru.po b/po/ru.po
index 340ff969..a4c7ced4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2014-06-25 17:42+0300\n"
"Last-Translator: AlexL <loginov.alex.valer@gmail.com>\n"
"Language-Team: Russian <gnu@mx.ru>\n"
@@ -45,8 +45,7 @@ msgstr "Подождите, пожалуйста..."
msgid "Verifying package signatures..."
msgstr "Проверяются подписи пакетов..."
-#: ../gurpm/RPMProgressDialog.pm:309
-#: ../urpm/install.pm:107
+#: ../gurpm/RPMProgressDialog.pm:309 ../urpm/install.pm:107
#, c-format
msgid "Preparing..."
msgstr "Подготовка..."
@@ -66,47 +65,42 @@ msgstr "Устанавливается пакет «%s» (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Загружается пакет «%s»..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Отмена"
-#: ../gurpm/RPMProgressDialog.pm:359
-#: ../urpm.pm:453
-#: ../urpm/download.pm:857
-#: ../urpm/get_pkgs.pm:278
-#: ../urpm/media.pm:1126
-#: ../urpm/media.pm:1647
+#: ../gurpm/RPMProgressDialog.pm:359 ../urpm.pm:453 ../urpm/download.pm:857
+#: ../urpm/get_pkgs.pm:278 ../urpm/media.pm:1126 ../urpm/media.pm:1647
#: ../urpm/media.pm:1798
#, c-format
msgid "...retrieving failed: %s"
msgstr "...извлечение не удалось: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "Установка RPM"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Ошибка: не удаётся найти файл %s, операция отменяется"
-#: ../gurpmi:60
-#: ../gurpmi2:169
-#: ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_ОК"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
"\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 ""
@@ -119,8 +113,7 @@ msgstr ""
"\n"
"Что нужно сделать?"
-#: ../gurpmi:88
-#: ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -135,7 +128,7 @@ msgstr ""
"\n"
"Продолжить?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -150,69 +143,67 @@ msgstr ""
"\n"
"Пакет можно просто сохранить. Что нужно сделать?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Установить"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Сохранить"
-#: ../gurpmi:114
-#: ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Отмена"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Укажите местоположение для сохранения файла"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "ОК"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
msgstr "Параметры:"
-#: ../gurpmi.pm:57
-#: ../urpme:42
-#: ../urpmf:30
-#: ../urpmi:67
-#: ../urpmi.addmedia:55
-#: ../urpmi.removemedia:40
-#: ../urpmi.update:32
-#: ../urpmq:41
+#: ../gurpmi.pm:57 ../urpme:42 ../urpmf:30 ../urpmi:67 ../urpmi.addmedia:55
+#: ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:41
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - показать эту справку\n"
-#: ../gurpmi.pm:58
-#: ../urpmi:74
+#: ../gurpmi.pm:58 ../urpmi:74
#, c-format
-msgid " --auto - non-interactive mode, assume default answers to questions.\n"
-msgstr " --auto - неинтерактивный режим; на вопросы даются ответы по умолчанию\n"
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions.\n"
+msgstr ""
+" --auto - неинтерактивный режим; на вопросы даются ответы по "
+"умолчанию\n"
-#: ../gurpmi.pm:59
-#: ../urpmi:75
-#: ../urpmq:48
+#: ../gurpmi.pm:59 ../urpmi:75 ../urpmq:48
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - автоматически выбрать пакеты для обновления системы\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - автоматически выбрать пакеты для обновления системы\n"
-#: ../gurpmi.pm:60
-#: ../urpme:46
-#: ../urpmi:100
-#: ../urpmq:64
+#: ../gurpmi.pm:60 ../urpme:46 ../urpmi:100 ../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 - принудительно выполнить, даже если некоторые пакеты\n"
" не существуют\n"
-#: ../gurpmi.pm:61
-#: ../urpmi:131
+#: ../gurpmi.pm:61 ../urpmi:131
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -221,45 +212,40 @@ msgstr ""
" --verify-rpm - проверять подписи rpm перед установкой\n"
" (--no-verify-rpm отключает её; по умолчанию включена)\n"
-#: ../gurpmi.pm:63
-#: ../urpmf:36
-#: ../urpmi:68
-#: ../urpmq:43
+#: ../gurpmi.pm:63 ../urpmf:36 ../urpmi:68 ../urpmq:43
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - использовать только указанные источники,\n"
" перечисленные через запятую\n"
-#: ../gurpmi.pm:64
-#: ../urpmi:147
+#: ../gurpmi.pm:64 ../urpmi:147
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - разрешить искать пакеты в provides\n"
-#: ../gurpmi.pm:65
-#: ../urpmi:148
+#: ../gurpmi.pm:65 ../urpmi:148
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - не искать пакеты в provides\n"
-#: ../gurpmi.pm:66
-#: ../urpmi:107
-#: ../urpmq:67
+#: ../gurpmi.pm:66 ../urpmi:107 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - использовать другой корень для установки rpm-файла\n"
+msgstr ""
+" --root - использовать другой корень для установки rpm-файла\n"
-#: ../gurpmi.pm:67
-#: ../urpmi:133
+#: ../gurpmi.pm:67 ../urpmi:133
#, c-format
-msgid " --test - only verify if the installation can be achieved correctly.\n"
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
msgstr " --test - проверить возможность корректной установки\n"
-#: ../gurpmi.pm:68
-#: ../urpmi:71
+#: ../gurpmi.pm:68 ../urpmi:71
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --searchmedia - использование только указанных источников для поиска\n"
" запрошенных пакетов\n"
@@ -269,18 +255,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Пакеты не указаны"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Необходимы права пользователя «root»"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Подготовка к установке пакетов..."
-#: ../gurpmi2:87
-#: ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -289,7 +274,7 @@ msgstr ""
"Не удаётся установить некоторые из запрошенных пакетов:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -300,42 +285,37 @@ msgstr ""
"%s\n"
"Продолжить установку?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Внимание"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "ОК"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (обновить)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (установить)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Выбор пакета"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Нужен один из следующих пакетов:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Прервать"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -346,68 +326,61 @@ msgstr ""
"%s\n"
"Всё равно продолжить установку?"
-#: ../gurpmi2:246
-#: ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Будет использовано %s дополнительного дискового пространства."
-#: ../gurpmi2:247
-#: ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "Будет освобождено %s дискового пространства."
-#: ../gurpmi2:248
-#: ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "Будет загружено %s пакетов."
-#: ../gurpmi2:249
-#: ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Установить один пакет?"
msgstr[1] "Установить %d пакетов?"
-#: ../gurpmi2:255
-#: ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
msgstr "Для удовлетворения зависимостей будет установлен следующий пакет:"
-#: ../gurpmi2:256
-#: ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Для удовлетворения зависимостей будут установлены следующие пакеты:"
-#: ../gurpmi2:266
-#: ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "не удаётся получить пакеты с исходными кодами, аварийное завершение"
-#: ../gurpmi2:283
-#: ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Вставьте носитель под названием «%s»"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr "Произошла ошибка:"
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Готово"
-#: ../gurpmi2:332
-#: ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -416,30 +389,27 @@ msgstr ""
"Установка не удалась, отсутствуют некоторые файлы:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Возможно, нужно обновить базу данных urpmi."
-#: ../gurpmi2:339
-#: ../urpm/main_loop.pm:288
-#: ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Установка не удалась:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Всё уже установлено"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Установка завершена"
-#: ../gurpmi2:359
-#: ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "urpmi перезапускается"
@@ -478,8 +448,7 @@ msgstr " по умолчанию %s\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - показать полное название rpm (NVRA)\n"
-#: ../rurpmi:11
-#: ../urpmi:266
+#: ../rurpmi:11 ../urpmi:266
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Только суперпользователю разрешается устанавливать пакеты"
@@ -514,9 +483,7 @@ msgstr "Не удаётся загрузить пакеты в %s"
msgid "Environment directory %s does not exist"
msgstr "Каталог окружения %s не существует"
-#: ../urpm.pm:255
-#: ../urpmf:243
-#: ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "используется специфическое окружение для %s\n"
@@ -536,8 +503,7 @@ msgstr "недопустимое название rpm-файла [%s]"
msgid "retrieving rpm file [%s] ..."
msgstr "извлекается rpm-файл [%s] ..."
-#: ../urpm.pm:450
-#: ../urpm/get_pkgs.pm:276
+#: ../urpm.pm:450 ../urpm/get_pkgs.pm:276
#, c-format
msgid "...retrieving done"
msgstr "...извлечение выполнено"
@@ -572,102 +538,106 @@ msgstr "ошибка регистрации локальных пакетов"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Эта операция запрещена при работе в ограниченном режиме"
-#: ../urpm/args.pm:150
-#: ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "неверное объявление proxy в командной строке\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: не удаётся прочитать rpm-файл «%s»\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "неожиданное выражение %s"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "перед %s отсутствует выражение"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
-msgstr "неожиданное выражение %s (рекомендация: используйте параметр -a или -o)"
+msgstr ""
+"неожиданное выражение %s (рекомендация: используйте параметр -a или -o)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "отсутствует выражения для закрытия"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
-msgstr "по умолчанию urpmf ожидает регулярное выражение. Используйте параметр «--literal»"
+msgstr ""
+"по умолчанию urpmf ожидает регулярное выражение. Используйте параметр «--"
+"literal»"
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "Каталог chroot не существует"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "%s нельзя использовать без %s"
-#: ../urpm/args.pm:498
-#: ../urpm/args.pm:501
-#: ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "%s нельзя использовать без %s"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "Слишком много аргументов\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
"%s\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 ""
"%s версия %s\n"
"%s\n"
-"Это свободное программное обеспечение и может распространяться согласно условиям GNU GPL.\n"
+"Это свободное программное обеспечение и может распространяться согласно "
+"условиям GNU GPL.\n"
"\n"
"использование:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Copyright (C) %s %s"
-#: ../urpm/bug_report.pm:67
-#: ../urpmi:256
+#: ../urpm/bug_report.pm:67 ../urpmi:256
#, c-format
msgid "Copying failed"
msgstr "Копирование не удалось"
#: ../urpm/cdrom.pm:80
#, c-format
-msgid "You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done automatically)"
-msgstr "CD-ROM необходимо смонтировать вручную (или установите perl-Hal-Cdroms, чтобы это выполнялось автоматически)"
+msgid ""
+"You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+"CD-ROM необходимо смонтировать вручную (или установите perl-Hal-Cdroms, "
+"чтобы это выполнялось автоматически)"
#: ../urpm/cdrom.pm:82
#, c-format
msgid "Udisks daemon (udisks-daemon) is not running or not ready"
msgstr "Udisks-демон (udisks-daemon) не запущен или не готов к работе"
-#: ../urpm/cdrom.pm:174
-#: ../urpm/cdrom.pm:179
+#: ../urpm/cdrom.pm:174 ../urpm/cdrom.pm:179
#, c-format
msgid "medium \"%s\" is not available"
msgstr "источник «%s» недоступен"
@@ -692,8 +662,7 @@ msgstr "не удаётся прочитать конфигурационный
msgid "medium `%s' is defined twice, aborting"
msgstr "источник «%s» определён дважды; останов"
-#: ../urpm/cfg.pm:245
-#: ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "не удаётся записать конфигурационный файл [%s]"
@@ -706,7 +675,9 @@ msgstr "%s недоступен, выполняется откат до %s"
#: ../urpm/download.pm:169
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
-msgstr "не удаётся прочитать параметры прокси-сервера (недостаточно прав, чтобы прочитать %s)"
+msgstr ""
+"не удаётся прочитать параметры прокси-сервера (недостаточно прав, чтобы "
+"прочитать %s)"
#: ../urpm/download.pm:199
#, c-format
@@ -838,8 +809,7 @@ msgstr "пакет %s не найден."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "загружаются rpm-файлы из источника «%s»..."
-#: ../urpm/install.pm:115
-#: ../urpme:164
+#: ../urpm/install.pm:115 ../urpme:164
#, c-format
msgid "removing %s"
msgstr "удаляется %s"
@@ -859,8 +829,7 @@ msgstr "не удаётся установить пакет %s"
msgid "removing bad rpm (%s) from %s"
msgstr "удаляются неверные rpm-файлы (%s) из %s"
-#: ../urpm/install.pm:246
-#: ../urpm/install.pm:374
+#: ../urpm/install.pm:246 ../urpm/install.pm:374
#, c-format
msgid "removing %s failed: %s"
msgstr "не удалось удалить %s: %s"
@@ -872,8 +841,10 @@ msgstr "удаляется пакет %s"
#: ../urpm/install.pm:341
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "создана транзакция для установки на %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"создана транзакция для установки на %s (remove=%d, install=%d, upgrade=%d)"
#: ../urpm/install.pm:344
#, c-format
@@ -910,8 +881,7 @@ msgstr "Сервер не определён; отсутствует URI или
msgid "No base defined"
msgstr "База не определена"
-#: ../urpm/ldap.pm:188
-#: ../urpm/ldap.pm:191
+#: ../urpm/ldap.pm:188 ../urpm/ldap.pm:191
#, c-format
msgid "Cannot connect to ldap uri:"
msgstr "Не удаётся подключиться к ldap по URI:"
@@ -958,10 +928,12 @@ msgstr ""
#: ../urpm/main_loop.pm:108
#, c-format
msgid ""
-"There is not enough space on your filesystem to download all packages (%s needed, %s available).\n"
+"There is not enough space on your filesystem to download all packages (%s "
+"needed, %s available).\n"
"Are you sure you want to continue?"
msgstr ""
-"У вас недостаточно места для загрузки всех пакетов (%s необходимо, %s имеется).\n"
+"У вас недостаточно места для загрузки всех пакетов (%s необходимо, %s "
+"имеется).\n"
"Вы уверены, что хотите продолжить?"
#: ../urpm/main_loop.pm:138
@@ -979,9 +951,7 @@ msgstr "Следующие пакеты имеют неверные подпис
msgid "Do you want to continue installation ?"
msgstr "Продолжить установку?"
-#: ../urpm/main_loop.pm:155
-#: ../urpm/main_loop.pm:184
-#: ../urpm/main_loop.pm:290
+#: ../urpm/main_loop.pm:155 ../urpm/main_loop.pm:184 ../urpm/main_loop.pm:290
#: ../urpm/main_loop.pm:298
#, c-format
msgid "Installation failed"
@@ -1027,8 +997,7 @@ msgstr "Попробовать принудительную установку (
msgid "Packages are up to date"
msgstr "Пакеты находятся в актуальном состоянии"
-#: ../urpm/main_loop.pm:601
-#: ../urpm/parallel.pm:299
+#: ../urpm/main_loop.pm:601 ../urpm/parallel.pm:299
#, c-format
msgid "Installation is possible"
msgstr "Установка возможна."
@@ -1041,7 +1010,9 @@ msgstr "предупреждение: в файле MD5SUM нет md5-суммы
#: ../urpm/media.pm:268
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "виртуальный источник «%s» должен содержать пустой url; источник проигнорирован"
+msgstr ""
+"виртуальный источник «%s» должен содержать пустой url; источник "
+"проигнорирован"
#: ../urpm/media.pm:270
#, c-format
@@ -1061,7 +1032,8 @@ msgstr "попытка переопределить существующий и
#: ../urpm/media.pm:515
#, c-format
msgid "failed to migrate removable device, ignoring media"
-msgstr "не удалось выполнить миграцию съёмного устройства; источник игнорируется"
+msgstr ""
+"не удалось выполнить миграцию съёмного устройства; источник игнорируется"
#: ../urpm/media.pm:558
#, c-format
@@ -1080,8 +1052,12 @@ msgstr "используется связанный источник для ре
#: ../urpm/media.pm:673
#, c-format
-msgid "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --update, --use-distrib or --parallel"
-msgstr "параметр --synthesis нельзя использовать с --media, --excludemedia, --sortmedia, --update или --parallel"
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update, --use-distrib or --parallel"
+msgstr ""
+"параметр --synthesis нельзя использовать с --media, --excludemedia, --"
+"sortmedia, --update или --parallel"
#: ../urpm/media.pm:786
#, c-format
@@ -1091,12 +1067,16 @@ msgstr "игнорируется non-free источник «%s»"
#: ../urpm/media.pm:795
#, c-format
msgid "un-ignoring non-free medium `%s' b/c nonfree packages are installed"
-msgstr "отмена игнорирования non-free источника пакетов `%s', так как установлены несвободные пакеты"
+msgstr ""
+"отмена игнорирования non-free источника пакетов `%s', так как установлены "
+"несвободные пакеты"
#: ../urpm/media.pm:799
#, c-format
msgid "un-ignoring tainted medium `%s' b/c tainted packages are installed"
-msgstr "отмена игнорирования tainted источника `%s', так как установлены пакеты с сомнительными условиями лицензирования"
+msgstr ""
+"отмена игнорирования tainted источника `%s', так как установлены пакеты с "
+"сомнительными условиями лицензирования"
#: ../urpm/media.pm:827
#, c-format
@@ -1218,15 +1198,12 @@ msgstr "изучается файл synthesis [%s]"
msgid "problem reading synthesis file of medium \"%s\""
msgstr "проблема чтения файла synthesis источника «%s»"
-#: ../urpm/media.pm:1524
-#: ../urpm/media.pm:1619
+#: ../urpm/media.pm:1524 ../urpm/media.pm:1619
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "копируется [%s] для источника «%s»..."
-#: ../urpm/media.pm:1526
-#: ../urpm/media.pm:1596
-#: ../urpm/media.pm:1849
+#: ../urpm/media.pm:1526 ../urpm/media.pm:1596 ../urpm/media.pm:1849
#, c-format
msgid "...copying failed"
msgstr "...копирование не удалось"
@@ -1236,8 +1213,7 @@ msgstr "...копирование не удалось"
msgid "copying description file of \"%s\"..."
msgstr "копируется файл описания для «%s»..."
-#: ../urpm/media.pm:1594
-#: ../urpm/media.pm:1623
+#: ../urpm/media.pm:1594 ../urpm/media.pm:1623
#, c-format
msgid "...copying done"
msgstr "...копирование выполнено"
@@ -1252,8 +1228,7 @@ msgstr "копирование [%s] не удалось (файл подозри
msgid "computing md5sum of retrieved source synthesis"
msgstr "вычисляется md5-сумма для загруженного synthesis-файла источника"
-#: ../urpm/media.pm:1675
-#: ../urpm/media.pm:2158
+#: ../urpm/media.pm:1675 ../urpm/media.pm:2158
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "копирование [%s] не удалось (md5-суммы не совпадают)"
@@ -1323,8 +1298,7 @@ msgstr "обновлён источник «%s»"
msgid "retrieval of [%s] failed"
msgstr "не удалось загрузить [%s]"
-#: ../urpm/mirrors.pm:34
-#: ../urpm/mirrors.pm:60
+#: ../urpm/mirrors.pm:34 ../urpm/mirrors.pm:60
#, c-format
msgid "trying again with mirror %s"
msgstr "повторная попытка с зеркала %s"
@@ -1344,25 +1318,18 @@ msgstr "найдено географическое расположение %s
msgid "getting mirror list from %s"
msgstr "загружается список зеркал из %s"
-#: ../urpm/msg.pm:75
-#: ../urpmi:492
-#: ../urpmi:510
-#: ../urpmi:626
+#: ../urpm/msg.pm:75 ../urpmi:492 ../urpmi:510 ../urpmi:626
#, c-format
msgid "Nn"
msgstr "NnНн"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:76
-#: ../urpme:38
-#: ../urpmi.addmedia:133
+#: ../urpm/msg.pm:76 ../urpme:38 ../urpmi.addmedia:133
#, c-format
msgid "Yy"
msgstr "YyДд"
-#: ../urpm/msg.pm:101
-#: ../urpme:158
-#: ../urpmi.addmedia:136
+#: ../urpm/msg.pm:101 ../urpme:158 ../urpmi.addmedia:136
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
@@ -1394,8 +1361,8 @@ msgstr "Платформа"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(рекомендуется)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -1427,8 +1394,7 @@ msgstr "МБ"
msgid "GB"
msgstr "ГБ"
-#: ../urpm/msg.pm:199
-#: ../urpm/msg.pm:208
+#: ../urpm/msg.pm:199 ../urpm/msg.pm:208
#, c-format
msgid "TB"
msgstr "ТБ"
@@ -1436,7 +1402,9 @@ msgstr "ТБ"
#: ../urpm/orphans.pm:79
#, c-format
msgid "Marking %s as manually installed, it won't be auto-orphaned"
-msgstr "%s помечается как установленный вручную; он не будет учитываться при определении пакетов-сирот"
+msgstr ""
+"%s помечается как установленный вручную; он не будет учитываться при "
+"определении пакетов-сирот"
#: ../urpm/orphans.pm:527
#, c-format
@@ -1469,19 +1437,23 @@ msgstr[1] "Вы можете их удалить."
msgid ""
"The following package:\n"
"%s\n"
-"is now orphaned, if you wish to remove it, you can use \"urpme --auto-orphans\""
+"is now orphaned, if you wish to remove it, you can use \"urpme --auto-orphans"
+"\""
msgid_plural ""
"The following packages:\n"
"%s\n"
-"are now orphaned, if you wish to remove them, you can use \"urpme --auto-orphans\""
+"are now orphaned, if you wish to remove them, you can use \"urpme --auto-"
+"orphans\""
msgstr[0] ""
"Следующий пакет:\n"
"%s\n"
-"теперь является осиротевшим. Для его удаления используйте команду «urpme --auto-orphans»"
+"теперь является осиротевшим. Для его удаления используйте команду «urpme --"
+"auto-orphans»"
msgstr[1] ""
"Следующие пакеты:\n"
"%s\n"
-"теперь являются осиротевшими. Для их удаления используйте команду «urpme --auto-orphans»"
+"теперь являются осиротевшими. Для их удаления используйте команду «urpme --"
+"auto-orphans»"
#: ../urpm/parallel.pm:15
#, c-format
@@ -1535,16 +1507,19 @@ msgstr "сбой cp на хосте %s (%d)"
#: ../urpm/parallel_ssh.pm:84
#, c-format
-msgid "%s failed on host %s (maybe it does not have a good version of urpmi?) (exit code: %d)"
-msgstr "Сбой %s на хосте %s (возможно он имеет неверную версию urpmi?) (код выхода: %d)"
+msgid ""
+"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
+"code: %d)"
+msgstr ""
+"Сбой %s на хосте %s (возможно он имеет неверную версию urpmi?) (код выхода: "
+"%d)"
#: ../urpm/removable.pm:46
#, c-format
msgid "unable to access medium \"%s\"."
msgstr "нет доступа к источнику «%s»."
-#: ../urpm/removable.pm:86
-#: ../urpm/removable.pm:101
+#: ../urpm/removable.pm:86 ../urpm/removable.pm:101
#, c-format
msgid "mounting %s"
msgstr "монтируется %s"
@@ -1561,16 +1536,17 @@ msgstr "urpmi был перезапущен; список приоритетов
#: ../urpm/select.pm:47
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "urpmi был перезапущен; список приоритетов пакетов изменился: %s против %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"urpmi был перезапущен; список приоритетов пакетов изменился: %s против %s"
#: ../urpm/select.pm:220
#, c-format
msgid "No package named %s"
msgstr "Нет пакета с названием %s"
-#: ../urpm/select.pm:222
-#: ../urpme:112
+#: ../urpm/select.pm:222 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Следующие пакеты содержат %s: %s"
@@ -1595,14 +1571,12 @@ msgstr "Пакет %s уже установлен"
msgid "Packages %s are already installed"
msgstr "Пакеты %s уже установлен"
-#: ../urpm/select.pm:625
-#: ../urpm/select.pm:712
+#: ../urpm/select.pm:625 ../urpm/select.pm:712
#, c-format
msgid "due to conflicts with %s"
msgstr "из-за конфликтов с %s"
-#: ../urpm/select.pm:626
-#: ../urpm/select.pm:706
+#: ../urpm/select.pm:626 ../urpm/select.pm:706
#, c-format
msgid "due to unsatisfied %s"
msgstr "из-за неудовлетворённости %s"
@@ -1730,36 +1704,31 @@ msgstr " --auto-orphans - удалить сирот\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - проверить возможность корректного удаления\n"
-#: ../urpme:47
-#: ../urpmi:106
-#: ../urpmq:66
+#: ../urpme:47 ../urpmi:106 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
-msgstr " --parallel - распределённое выполнение urpmi через машины алиаса\n"
+msgstr ""
+" --parallel - распределённое выполнение urpmi через машины алиаса\n"
#: ../urpme:48
#, c-format
msgid " --root - use another root for rpm removal.\n"
-msgstr " --root - использовать другой корень для удаления rpm-файлов\n"
+msgstr ""
+" --root - использовать другой корень для удаления rpm-файлов\n"
-#: ../urpme:49
-#: ../urpmf:35
-#: ../urpmi:108
-#: ../urpmi.addmedia:73
-#: ../urpmi.removemedia:45
-#: ../urpmi.update:48
-#: ../urpmq:68
+#: ../urpme:49 ../urpmf:35 ../urpmi:108 ../urpmi.addmedia:73
+#: ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
" --root-root - использовать другой корень для базы данных urpmi\n"
" и установки пакетов\n"
-#: ../urpme:50
-#: ../urpmi:96
+#: ../urpme:50 ../urpmi:96
#, c-format
msgid " --justdb - update only the rpm db, not the filesystem.\n"
-msgstr " --justdb - обновить базу данных, но не изменять файловую систему\n"
+msgstr ""
+" --justdb - обновить базу данных, но не изменять файловую систему\n"
#: ../urpme:51
#, c-format
@@ -1775,9 +1744,7 @@ msgstr ""
" --use-distrib - настроить urpme на лету из дерева distrib; полезно\n"
" для установки/удаления в/из chroot с параметром --root\n"
-#: ../urpme:54
-#: ../urpmi:150
-#: ../urpmq:87
+#: ../urpme:54 ../urpmi:150 ../urpmq:87
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - подробный режим\n"
@@ -1806,8 +1773,10 @@ msgstr "неизвестный пакет"
#, c-format
msgid "Removing the following package will break your system:"
msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "после удаления следующего пакета будет нарушена работа всей системы:"
-msgstr[1] "после удаления следующих пакетов будет нарушена работа всей системы:"
+msgstr[0] ""
+"после удаления следующего пакета будет нарушена работа всей системы:"
+msgstr[1] ""
+"после удаления следующих пакетов будет нарушена работа всей системы:"
#: ../urpme:123
#, c-format
@@ -1822,7 +1791,8 @@ msgstr "Нет осиротевших пакетов для удаления"
#: ../urpme:146
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
msgstr[0] "Для удовлетворения зависимостей будет удалён следующий пакет"
msgstr[1] "Для удовлетворения зависимостей будут удалены следующие %d пакетов"
@@ -1860,18 +1830,14 @@ msgstr "Удаление возможно"
msgid " --version - print this tool's version number.\n"
msgstr " --version - показать номер версии программы\n"
-#: ../urpmf:32
-#: ../urpmi:130
-#: ../urpmq:78
+#: ../urpmf:32 ../urpmi:130 ../urpmq:78
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - использовать особое окружение (обычно отчёт\n"
" об ошибке)\n"
-#: ../urpmf:33
-#: ../urpmi:69
-#: ../urpmq:45
+#: ../urpmf:33 ../urpmi:69 ../urpmq:45
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1880,16 +1846,16 @@ msgstr ""
#: ../urpmf:34
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
" --literal, -l - не искать соответствия шаблону, использовать аргумент\n"
" как буквенную строку\n"
-#: ../urpmf:37
-#: ../urpmi:72
-#: ../urpmq:46
+#: ../urpmf:37 ../urpmi:72 ../urpmq:46
#, 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 - сортировать источники по подстрокам, перечисленным\n"
" через запятую.\n"
@@ -1899,9 +1865,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr " --use-distrib - использовать указанный путь к источнику\n"
-#: ../urpmf:39
-#: ../urpmi:73
-#: ../urpmq:47
+#: ../urpmf:39 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - использовать указанный synthesis вместо БД urpmi\n"
@@ -1911,9 +1875,7 @@ msgstr " --synthesis - использовать указанный synthesis
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - не выводить идентичные строки\n"
-#: ../urpmf:41
-#: ../urpmi:70
-#: ../urpmq:42
+#: ../urpmf:41 ../urpmi:70 ../urpmq:42
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - использовать только источник обновления\n"
@@ -2086,9 +2048,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - rpm с исходными кодами\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - теги suggests (рекомендуются)\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - теги requires (требуются)\n"
#: ../urpmf:76
#, c-format
@@ -2110,33 +2072,33 @@ msgstr " --vendor - поставщик\n"
msgid " -m - the media in which the package was found\n"
msgstr " -m - источник, в котором был найден пакет\n"
-#: ../urpmf:80
-#: ../urpmq:97
+#: ../urpmf:80 ../urpmq:97
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - показать версию, релиз и архитектуру с названием\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "незавершённое выражение (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Неверный формат: можно использовать только один тег с несколькими значениями"
+msgstr ""
+"Неверный формат: можно использовать только один тег с несколькими значениями"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "для источника «%s» не найден файл hdlist"
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "для источника «%s» не найден файл synthesis"
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "для источника «%s» не найден файл xml-info"
@@ -2161,31 +2123,33 @@ msgstr " --force-key - принудительно обновить gpg-к
msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - удалить сирот без вывода запроса\n"
-#: ../urpmi:80
-#: ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#: ../urpmi:80 ../urpmq:52
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --no-suggests - не выбирать автоматически рекомендованные пакеты\n"
#: ../urpmi:81
#, c-format
-msgid " --no-uninstall - never ask to uninstall a package, abort the installation.\n"
-msgstr " --no-uninstall - никогда не предлагать удалять пакет, прерывать установку\n"
+msgid ""
+" --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+" --no-uninstall - никогда не предлагать удалять пакет, прерывать установку\n"
#: ../urpmi:82
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - не устанавливать пакеты (только загрузить)\n"
-#: ../urpmi:83
-#: ../urpmq:54
+#: ../urpmi:83 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
msgstr ""
" --keep - по возможности сохранять существующие пакеты,\n"
-" отклонять запрошенные пакеты, которые приводят к удалению\n"
+" отклонять запрошенные пакеты, которые приводят к "
+"удалению\n"
#: ../urpmi:85
#, c-format
@@ -2241,7 +2205,8 @@ msgstr ""
#: ../urpmi:99
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
msgstr " --replacepkgs - принудительно установить уже установленные пакеты\n"
#: ../urpmi:101
@@ -2263,8 +2228,8 @@ msgstr ""
" и целостности после запроса у пользователя\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --allow-suggests - автоматически выбирать рекомендованные пакеты\n"
#: ../urpmi:109
@@ -2276,17 +2241,19 @@ msgstr ""
" --use-distrib - настроить urpmi на лету из дерева distrib; полезно\n"
" для установки в chroot с параметром --root\n"
-#: ../urpmi:111
-#: ../urpmi.addmedia:60
-#: ../urpmi.update:37
+#: ../urpmi:111 ../urpmi.addmedia:60 ../urpmi.update:37
#, c-format
msgid " --metalink - generate and use a local metalink.\n"
msgstr " --metalink - сгенерировать и использовать локальные метассылки\n"
#: ../urpmi:112
#, c-format
-msgid " --download-all - download all needed packages before trying to install them\n"
-msgstr " --download-all - скачать все необходимые пакеты перед попыткой их установки\n"
+msgid ""
+" --download-all - download all needed packages before trying to install "
+"them\n"
+msgstr ""
+" --download-all - скачать все необходимые пакеты перед попыткой их "
+"установки\n"
#: ../urpmi:113
#, c-format
@@ -2300,31 +2267,35 @@ msgstr ""
#: ../urpmi:116
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
-msgstr " --curl-options - дополнительные параметры, передаваемые в программу curl\n"
+msgstr ""
+" --curl-options - дополнительные параметры, передаваемые в программу curl\n"
#: ../urpmi:117
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
-msgstr " --rsync-options- дополнительные параметры, передаваемые в программу rsync\n"
+msgstr ""
+" --rsync-options- дополнительные параметры, передаваемые в программу rsync\n"
#: ../urpmi:118
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
-msgstr " --wget-options - дополнительные параметры, передаваемые в программу wget\n"
+msgstr ""
+" --wget-options - дополнительные параметры, передаваемые в программу wget\n"
#: ../urpmi:119
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
-msgstr " --prozilla-options - дополнительные параметры, передаваемые в программу prozilla\n"
+msgstr ""
+" --prozilla-options - дополнительные параметры, передаваемые в программу "
+"prozilla\n"
#: ../urpmi:120
#, c-format
msgid " --aria2-options - additional options to pass to aria2\n"
-msgstr " --aria2-options- дополнительные параметры, передаваемые в программу aria2\n"
+msgstr ""
+" --aria2-options- дополнительные параметры, передаваемые в программу aria2\n"
-#: ../urpmi:121
-#: ../urpmi.addmedia:61
-#: ../urpmi.update:38
+#: ../urpmi:121 ../urpmi.addmedia:61 ../urpmi.update:38
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - ограничить скорость загрузки\n"
@@ -2338,10 +2309,7 @@ msgstr ""
" --resume - возобновить загрузку частично загруженных файлов\n"
" (--no-resume отключает её; по умолчанию отключена)\n"
-#: ../urpmi:124
-#: ../urpmi.addmedia:62
-#: ../urpmi.update:39
-#: ../urpmq:74
+#: ../urpmi:124 ../urpmi.addmedia:62 ../urpmi.update:39 ../urpmq:74
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -2350,10 +2318,7 @@ msgstr ""
" --proxy - использовать указанный HTTP-прокси; по умолчанию\n"
" используется порт 1080 (формат - <хост_прокси[:порт]>)\n"
-#: ../urpmi:126
-#: ../urpmi.addmedia:64
-#: ../urpmi.update:41
-#: ../urpmq:76
+#: ../urpmi:126 ../urpmi.addmedia:64 ../urpmi.update:41 ../urpmq:76
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -2384,7 +2349,8 @@ msgstr " --excludedocs - исключить файлы документаци
#: ../urpmi:136
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
-msgstr " --ignoresize - не проверять дисковое пространство перед установкой\n"
+msgstr ""
+" --ignoresize - не проверять дисковое пространство перед установкой\n"
#: ../urpmi:137
#, c-format
@@ -2432,8 +2398,7 @@ msgstr " --nolock - не блокировать базу данных rpm
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - обновить пакеты только с такой же архитектурой\n"
-#: ../urpmi:146
-#: ../urpmq:95
+#: ../urpmi:146 ../urpmq:95
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - выбрать все совпадения из командной строки\n"
@@ -2451,12 +2416,15 @@ msgstr " --debug - очень подробный режим\n"
#: ../urpmi:152
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
-msgstr " будут установлены имена или rpm-файлы, указанные в командной строке\n"
+msgstr ""
+" будут установлены имена или rpm-файлы, указанные в командной строке\n"
#: ../urpmi:180
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
-msgstr "Ошибка: параметр --auto-select нельзя использовать вместе со списком пакетов.\n"
+msgstr ""
+"Ошибка: параметр --auto-select нельзя использовать вместе со списком "
+"пакетов.\n"
#: ../urpmi:187
#, c-format
@@ -2470,7 +2438,9 @@ msgstr ""
#: ../urpmi:217
#, c-format
msgid "You can't install binary rpm files when using --install-src"
-msgstr "При использовании параметра --install-src нельзя устанавливать бинарные rpm-файлы"
+msgstr ""
+"При использовании параметра --install-src нельзя устанавливать бинарные rpm-"
+"файлы"
#: ../urpmi:218
#, c-format
@@ -2484,13 +2454,20 @@ msgstr "умолчания для --buildrequires"
#: ../urpmi:230
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "используйте параметр --buildrequires или --install-src (по умолчанию используется --buildrequires)"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+"используйте параметр --buildrequires или --install-src (по умолчанию "
+"используется --buildrequires)"
#: ../urpmi:250
#, c-format
-msgid "Directory [%s] already exists, please use another directory for bug report or delete it"
-msgstr "Каталог [%s] уже существует, используйте другой каталог для отчёта об ошибке или удалите его"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Каталог [%s] уже существует, используйте другой каталог для отчёта об ошибке "
+"или удалите его"
#: ../urpmi:251
#, c-format
@@ -2532,7 +2509,9 @@ msgstr "%s (для установки)"
#: ../urpmi:440
#, c-format
-msgid "In order to satisfy the '%s' dependency, one of the following packages is needed:"
+msgid ""
+"In order to satisfy the '%s' dependency, one of the following packages is "
+"needed:"
msgstr "Для удовлетворения зависимости «%s» нужен один из следующих пакетов:"
#: ../urpmi:443
@@ -2562,8 +2541,7 @@ msgstr ""
"более старых, чем установленные:\n"
"%s"
-#: ../urpmi:493
-#: ../urpmi:511
+#: ../urpmi:493 ../urpmi:511
#, c-format
msgid ""
"\n"
@@ -2572,10 +2550,7 @@ msgstr ""
"\n"
"Продолжить установку?"
-#: ../urpmi:494
-#: ../urpmi:512
-#: ../urpmi:627
-#: ../urpmi.addmedia:136
+#: ../urpmi:494 ../urpmi:512 ../urpmi:627 ../urpmi.addmedia:136
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
@@ -2624,10 +2599,12 @@ msgstr "(только проверка; ничего удалено не буд
#: ../urpmi:563
#, c-format
msgid ""
-"You must first call urpmi with --buildrequires to install the following dependencies:\n"
+"You must first call urpmi with --buildrequires to install the following "
+"dependencies:\n"
"%s\n"
msgstr ""
-"Сначала нужно запустить urpmi с параметром --buildrequires, чтобы установить следующие зависимости:\n"
+"Сначала нужно запустить urpmi с параметром --buildrequires, чтобы установить "
+"следующие зависимости:\n"
"%s\n"
#: ../urpmi:573
@@ -2640,7 +2617,8 @@ msgstr[1] "Будут удалены следующие осиротевшие
#: ../urpmi:597
#, c-format
msgid "WARNING: %s option is in use. Some strange problems may happen"
-msgstr "ВНИМАНИЕ: использован параметр %s. Могут возникнуть неожиданные проблемы."
+msgstr ""
+"ВНИМАНИЕ: использован параметр %s. Могут возникнуть неожиданные проблемы."
#: ../urpmi:609
#, c-format
@@ -2686,7 +2664,8 @@ msgstr ""
" cdrom://<путь>\n"
"\n"
"Использование: urpmi.addmedia [параметры] --distrib --mirrorlist <url>\n"
-"Использование: urpmi.addmedia [параметры] --mirrorlist <url> <название> <относительный путь>\n"
+"Использование: urpmi.addmedia [параметры] --mirrorlist <url> <название> "
+"<относительный путь>\n"
"\n"
"Примеры:\n"
"\n"
@@ -2697,29 +2676,23 @@ msgstr ""
"\n"
"а [параметры] могут быть следующими\n"
-#: ../urpmi.addmedia:56
-#: ../urpmi.update:33
-#: ../urpmq:71
+#: ../urpmi.addmedia:56 ../urpmi.update:33 ../urpmq:71
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - использовать wget для загрузки удалённых файлов\n"
-#: ../urpmi.addmedia:57
-#: ../urpmi.update:34
-#: ../urpmq:72
+#: ../urpmi.addmedia:57 ../urpmi.update:34 ../urpmq:72
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - использовать curl для загрузки удалённых файлов\n"
-#: ../urpmi.addmedia:58
-#: ../urpmi.update:35
-#: ../urpmq:73
+#: ../urpmi.addmedia:58 ../urpmi.update:35 ../urpmq:73
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
-msgstr " --prozilla - использовать prozilla для загрузки удалённых файлов\n"
+msgstr ""
+" --prozilla - использовать prozilla для загрузки удалённых файлов\n"
-#: ../urpmi.addmedia:59
-#: ../urpmi.update:36
+#: ../urpmi.addmedia:59 ../urpmi.update:36
#, c-format
msgid " --aria2 - use aria2 to retrieve distant files.\n"
msgstr " --aria2 - использовать aria2 для загрузки удалённых файлов\n"
@@ -2737,10 +2710,12 @@ msgstr ""
#, c-format
msgid ""
" --xml-info - use the specific policy for downloading xml info files\n"
-" one of: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+" one of: never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
msgstr ""
" --xml-info - использовать особую политику для загрузки xml-файлов\n"
-" варианты: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+" варианты: never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
#: ../urpmi.addmedia:70
#, c-format
@@ -2787,8 +2762,7 @@ msgstr ""
" --virtual - создать виртуальный источник, который всегда\n"
" является самым актульным\n"
-#: ../urpmi.addmedia:79
-#: ../urpmi.update:44
+#: ../urpmi.addmedia:79 ../urpmi.update:44
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - отключить проверку файла MD5SUM\n"
@@ -2796,23 +2770,21 @@ msgstr " --no-md5sum - отключить проверку файла MD5SUM
#: ../urpmi.addmedia:80
#, c-format
msgid " --nopubkey - don't import pubkey of added media\n"
-msgstr " --nopubkey - не импортировать публичный ключ из добавленного источника\n"
+msgstr ""
+" --nopubkey - не импортировать публичный ключ из добавленного "
+"источника\n"
#: ../urpmi.addmedia:81
#, c-format
msgid " --raw - add the media in config, but don't update it.\n"
msgstr " --raw - добавить источник в config, но не обновлять его\n"
-#: ../urpmi.addmedia:82
-#: ../urpmi.removemedia:43
-#: ../urpmi.update:53
+#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - тихий режим (quiet)\n"
-#: ../urpmi.addmedia:83
-#: ../urpmi.removemedia:44
-#: ../urpmi.update:54
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - подробный режим\n"
@@ -2850,7 +2822,9 @@ msgstr "Не удаётся создать конфигурационный фа
#: ../urpmi.addmedia:128
#, c-format
msgid "no need to give <relative path of synthesis> with --distrib"
-msgstr "с параметром --distrib <относительный путь к файлу synthesis> указывать не нужно"
+msgstr ""
+"с параметром --distrib <относительный путь к файлу synthesis> указывать не "
+"нужно"
#: ../urpmi.addmedia:136
#, c-format
@@ -2861,8 +2835,7 @@ msgstr ""
"\n"
"Добавить источник «%s»?"
-#: ../urpmi.addmedia:156
-#: ../urpmi.addmedia:181
+#: ../urpmi.addmedia:156 ../urpmi.addmedia:181
#, c-format
msgid "unable to add medium"
msgstr "не удаётся добавить источник"
@@ -2947,7 +2920,9 @@ msgstr " --no-ignore - не обновлять, пометить источ
#: ../urpmi.update:49
#, c-format
msgid " --probe-rpms - do not use synthesis, use rpm files directly\n"
-msgstr " --probe-rpms - не использовать файл synthesis; использовать непосредственно rpm-файлы\n"
+msgstr ""
+" --probe-rpms - не использовать файл synthesis; использовать "
+"непосредственно rpm-файлы\n"
#: ../urpmi.update:50
#, c-format
@@ -3000,7 +2975,9 @@ msgstr "включается источник %s"
#: ../urpmq:44
#, 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 ""
" --searchmedia - использовать только указанные источники для поиска\n"
" запрошенных (или обновляемых) пакетов\n"
@@ -3017,7 +2994,8 @@ msgid ""
" - list installed packages not available on any media.\n"
msgstr ""
" --not-available\n"
-" - выводит список установленных пакетов, не доступных ни в одном источнике.\n"
+" - выводит список установленных пакетов, не доступных ни в "
+"одном источнике.\n"
#: ../urpmq:53
#, c-format
@@ -3042,7 +3020,9 @@ msgstr " --list-url - показать список доступных ис
#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
-msgstr " --list-nodes - показать список доступных узлов при использовании --parallel\n"
+msgstr ""
+" --list-nodes - показать список доступных узлов при использовании --"
+"parallel\n"
#: ../urpmq:60
#, c-format
@@ -3051,13 +3031,17 @@ msgstr " --list-aliases - показать список доступных ал
#: ../urpmq:61
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
-msgstr " --dump-config - показать конфигурацию в виде аргумента для urpmi.addmedia\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+" --dump-config - показать конфигурацию в виде аргумента для urpmi."
+"addmedia\n"
#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
-msgstr " --src - следующий пакет содержит исходные коды (эквивалент -s)\n"
+msgstr ""
+" --src - следующий пакет содержит исходные коды (эквивалент -s)\n"
#: ../urpmq:63
#, c-format
@@ -3067,7 +3051,9 @@ msgstr " --sourcerpm - вывести адреса исходников вы
#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
-msgstr " --ignorearch - разрешить запрашивать rpm-файлы для несоответствующих архитектур\n"
+msgstr ""
+" --ignorearch - разрешить запрашивать rpm-файлы для несоответствующих "
+"архитектур\n"
#: ../urpmq:69
#, c-format
@@ -3104,9 +3090,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - показать требуемые файлы\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - показать рекомендуемые файлы\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - показать требуемые файлы\n"
#: ../urpmq:85
#, c-format
@@ -3139,7 +3125,8 @@ msgid ""
" - extended reverse search (includes virtual packages).\n"
msgstr ""
" --whatrequires-recursive\n"
-" - расширенный реверсивный поиск (включая виртуальные пакеты)\n"
+" - расширенный реверсивный поиск (включая виртуальные "
+"пакеты)\n"
#: ../urpmq:93
#, c-format
@@ -3183,12 +3170,17 @@ msgstr " -r - показать версию и релиз с наз
#: ../urpmq:103
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
-msgstr " -s - следующий пакет содержит исходные коды (эквивалент --src)\n"
+msgstr ""
+" -s - следующий пакет содержит исходные коды (эквивалент --"
+"src)\n"
#: ../urpmq:104
#, c-format
-msgid " -u - remove package if a more recent version is already installed.\n"
-msgstr " -u - удалить пакет, если уже установлена более новая версия\n"
+msgid ""
+" -u - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+" -u - удалить пакет, если уже установлена более новая версия\n"
#: ../urpmq:105
#, c-format
@@ -3225,22 +3217,32 @@ msgstr "используйте -l для вывода списка файлов
#: ../urpmq:415
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
-msgstr "для источника «%s» отсутствует xml-info; только частичный результат для пакета %s"
+msgstr ""
+"для источника «%s» отсутствует xml-info; только частичный результат для "
+"пакета %s"
#: ../urpmq:416
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
-msgstr "для источника «%s» отсутствует xml-info; только частичный результат для пакетов %s"
+msgstr ""
+"для источника «%s» отсутствует xml-info; только частичный результат для "
+"пакетов %s"
#: ../urpmq:419
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "для источника «%s» отсутствует xml-info; невозможно возвратить результат для пакета %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
+msgstr ""
+"для источника «%s» отсутствует xml-info; невозможно возвратить результат для "
+"пакета %s"
#: ../urpmq:420
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
-msgstr "для источника «%s» отсутствует xml-info; невозможно возвратить результат для пакетов %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"для источника «%s» отсутствует xml-info; невозможно возвратить результат для "
+"пакетов %s"
#: ../urpmq:487
#, c-format
@@ -3261,10 +3263,19 @@ msgstr "Запуск программы установки пакетов Mageia
#: ../polkit/org.mageia.gurpmi2.policy.in.h:2
msgid "Authentication is required to run Mageia Package Installer"
-msgstr "Требуется аутентификация для запуска программы установки пакетов Mageia"
+msgstr ""
+"Требуется аутентификация для запуска программы установки пакетов Mageia"
-#~ msgid "(%d package, %d MB)"
+#~ msgid "(suggested)"
+#~ msgstr "(рекомендуется)"
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - теги suggests (рекомендуются)\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - показать рекомендуемые файлы\n"
+
+#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d пакет, %d МБ)"
#~ msgstr[1] "(%d пакетов, %d МБ)"
diff --git a/po/sc.po b/po/sc.po
index d2a25d2f..f6786540 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: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2005-09-07 15:57+0100\n"
"Last-Translator: Antoni Pistis <antonio.pistis@virgilio.it>\n"
"Language-Team: Sardu\n"
@@ -60,7 +60,7 @@ msgstr "Aposentu su pakitu `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Scarrigamentu de su pakitu `%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Annudda"
@@ -72,22 +72,22 @@ msgstr "Annudda"
msgid "...retrieving failed: %s"
msgstr "...no agataus: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "Aposentadura RPM"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Ok"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -108,7 +108,7 @@ msgstr ""
"\n"
"Ita bolis fai?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -123,7 +123,7 @@ msgstr ""
"\n"
"Sigu?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -138,26 +138,31 @@ msgstr ""
"\n"
"Forsis preferis feti a du sarvai. Ita sçoberas?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Aposenta"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Sarva"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "A_nnudda"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Sçobera anca sarvai su file"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Andat"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -242,17 +247,17 @@ msgstr ""
msgid "No packages specified"
msgstr "nisçunu pakitu nominau %s"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Depis essi root"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Apariçu s'aposentadura de is pakitus..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -261,7 +266,7 @@ msgstr ""
"Cancu pakitu bòfiu no fait a d'aposentai:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -272,42 +277,37 @@ msgstr ""
"%s\n"
"Sigu?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Atentu"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Andat"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (de ajorronai)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (de aposentai)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Sçoberu de is pakitus"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Dui bolit unu de is pakitus ki sighint:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "L_assa"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -318,36 +318,36 @@ msgstr ""
"%s\n"
"Sigu?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, 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)!"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"Po satisfai is dependèntzias, megu a aposentai su pakitu ki sighit (%d MB)"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -355,34 +355,34 @@ msgstr ""
"Po satisfai is dependèntzias, megu a aposentai is %d pakitus ki sighint:\n"
"%s\n"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "no potzu lompi a is pakitus mitza, bessu"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Intra su mèdiu nominau \"%s\" in su trastu [%s]"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Fatu"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "Aposentadura faddia"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, fuzzy, c-format
msgid "You may want to update your urpmi database."
msgstr ""
@@ -390,22 +390,22 @@ msgstr ""
"%s\n"
"Forsis bolis ajorronai su database de urpmi"
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Aposentadura faddia"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Pakitu(s) jai aposentau(s)"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Aposentadura acabada"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "torru a aberri urpmi"
@@ -479,7 +479,7 @@ msgstr "Scarrigamentu de su pakitu `%s'..."
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "impreu unu ambienti indidau in %s\n"
@@ -534,62 +534,62 @@ msgstr "faddina assentendi is pakitus localis"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Custa cosa no fait a da fai candu ses in modalidadi strinta"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "decrarada de proxy mala in arraya de cumandu\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: no fait a ligi su file rpm \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Amancat sa firma (%s)"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -606,7 +606,7 @@ msgstr ""
"\n"
"impreu:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr ""
@@ -653,7 +653,7 @@ msgstr "no potzu scriri su file de assètiu [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "no potzu scriri su file de assètiu [%s]"
@@ -1342,7 +1342,7 @@ msgstr "Circa"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -2013,8 +2013,8 @@ msgstr " --sourcerpm - amosta su tag sourcerpm: rpm mitza.\n"
#: ../urpmf:75
#, fuzzy, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --obsoletes - amosta su tag obsoletes: totu is ki imbeçat.\n"
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - amosta su tag requires: totu su ki bolit.\n"
#: ../urpmf:76
#, fuzzy, c-format
@@ -2043,27 +2043,27 @@ msgstr ""
" -f - amosta sa versioni, arrelasçu e arkidetura cun su "
"nòmini.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "no apu agatau hdlist po su mèdiu \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "apu fraigau sa hdlist synthesis po su mèdiu \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "scriu sa llist po su mèdiu \"%s\""
@@ -2092,7 +2092,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --obsoletes - amosta su tag obsoletes: totu is ki imbeçat.\n"
#: ../urpmi:81
@@ -2192,7 +2192,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --obsoletes - amosta su tag obsoletes: totu is ki imbeçat.\n"
#: ../urpmi:109
@@ -3007,8 +3007,8 @@ msgstr " --requires - amosta su tag requires: totu su ki bolit.\n"
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --obsoletes - amosta su tag obsoletes: totu is ki imbeçat.\n"
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - amosta su tag requires: totu su ki bolit.\n"
#: ../urpmq:85
#, fuzzy, c-format
@@ -3179,6 +3179,14 @@ msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
#, fuzzy
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --obsoletes - amosta su tag obsoletes: totu is ki imbeçat.\n"
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --obsoletes - amosta su tag obsoletes: totu is ki imbeçat.\n"
+
+#, fuzzy
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "%d pakitus"
diff --git a/po/sk.po b/po/sk.po
index d8d4b792..1ba7b7f2 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2005-09-07 16:34+0100\n"
"Last-Translator: Tibor Pittich <Tibor.Pittich@mandriva.org>\n"
"Language-Team: Slovak <i18n@mandrake.sk>\n"
@@ -58,7 +58,7 @@ msgstr "Inštalácia balíka `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Získavanie balíka `%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Zrušiť"
@@ -70,22 +70,22 @@ msgstr "Zrušiť"
msgid "...retrieving failed: %s"
msgstr "...získavanie zlyhalo: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "Inštalácia RPM"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Ok"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -106,7 +106,7 @@ msgstr ""
"\n"
"Čo si želáte spraviť?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -121,7 +121,7 @@ msgstr ""
"\n"
"Vykonať?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -136,26 +136,31 @@ msgstr ""
"\n"
"Mali by ste preferovať iba jeho uloženie. Aký je váš výber?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Inštalácia"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Uložiť"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Zrušiť"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Vyberte umiestnenie pre uloženie súboru"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -241,17 +246,17 @@ msgstr ""
msgid "No packages specified"
msgstr "žiaden balík s menom %s"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Sú vyžadované právomoci root-a"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Príprava balíkov na inštaláciu..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -260,7 +265,7 @@ msgstr ""
"Niektoré požadované balíky nie je možné nainštalovať:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -271,42 +276,37 @@ msgstr ""
"%s\n"
"Pokračovať?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Varovanie"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (na aktualizáciu)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (na inštaláciu)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Výber balíka"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Jeden z nasledujúcich balíkov je potrebný:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Zrušiť"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -317,22 +317,22 @@ msgstr ""
"%s\n"
"Pokračovať?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -340,7 +340,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
@@ -348,7 +348,7 @@ msgstr ""
"Kvôli zachovaniu závislostí, by mali byť nainštalované nasledujúce balíky "
"(%d MB)"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -356,34 +356,34 @@ msgstr ""
"Kvôli zachovaniu závislostí, by mali byť nainštalované nasledujúce balíky "
"(%d MB)"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "nie je možné získať zdrojové balíky, prerušenie"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Prosím vložte médium \"%s\" do zariadenia [%s]"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Hotovo"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "Inštalácia zlyhala"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, fuzzy, c-format
msgid "You may want to update your urpmi database."
msgstr ""
@@ -391,22 +391,22 @@ msgstr ""
"%s\n"
"Možno budete chcieť aktualizovať Vašu urpmi databázu"
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Inštalácia zlyhala"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Všetko je už nainštalované"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Inštalácia ukončená"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "znovuspustenie urpmi"
@@ -481,7 +481,7 @@ msgstr "Získavanie balíka `%s'..."
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "použitie špecifického prostredia na %s\n"
@@ -536,62 +536,62 @@ msgstr "chyba pri registrácii lokálnych balíkov"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Táto operácia nie je povolená ak program beží v reštriktívnom režime"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "nesprávna deklarácia proxy v príkazovom riadku\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: nie je možné prečítať súbor \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Chýbajúci podpis (%s)"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -608,7 +608,7 @@ msgstr ""
"\n"
"použitie:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr ""
@@ -655,7 +655,7 @@ msgstr "nie je možné zapísať konfiguračný súbor [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "nie je možné zapísať konfiguračný súbor [%s]"
@@ -1350,7 +1350,7 @@ msgstr "Vyhľadávanie"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -2026,8 +2026,8 @@ msgstr " --sourcerpm - zobraziť značku zdrojové rpm: sourcerpm.\n"
#: ../urpmf:75
#, fuzzy, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --obsoletes - zobraziť značku zastaralé: obsoletes.\n"
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - zobraziť značku vyžadované: requires.\n"
#: ../urpmf:76
#, fuzzy, c-format
@@ -2055,27 +2055,27 @@ msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - zobraziť verziu, vydanie a architektúru spolu s menom.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "nebol nájdený hdlist súbor pre zdroj \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "vytváranie hdlist synthesis súboru pre zdroj \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "zápis súboru so zoznamom pre zdroj \"%s\""
@@ -2103,7 +2103,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --obsoletes - zobraziť značku zastaralé: obsoletes.\n"
#: ../urpmi:81
@@ -2206,7 +2206,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --obsoletes - zobraziť značku zastaralé: obsoletes.\n"
#: ../urpmi:109
@@ -3024,8 +3024,8 @@ msgstr " --requires - zobraziť značku vyžadované: requires.\n"
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --obsoletes - zobraziť značku zastaralé: obsoletes.\n"
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - zobraziť značku vyžadované: requires.\n"
#: ../urpmq:85
#, fuzzy, c-format
@@ -3195,6 +3195,14 @@ msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
#, fuzzy
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --obsoletes - zobraziť značku zastaralé: obsoletes.\n"
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --obsoletes - zobraziť značku zastaralé: obsoletes.\n"
+
+#, fuzzy
#~ msgid " --repackage - Re-package the files before erasing\n"
#~ msgstr " --packager - zobraziť značku autor balíka: packager.\n"
diff --git a/po/sl.po b/po/sl.po
index 92760dae..7e62c31e 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -12,7 +12,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2014-05-13 09:43+0000\n"
"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
"Language-Team: Slovenian <lugos-slo@lugos.si>, Translation list <mageia-"
@@ -64,7 +64,7 @@ msgstr "Nameščanje paketa »%s« (%s/%s) ..."
msgid "Downloading package `%s'..."
msgstr "Prenos paketa »%s« ..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Prekliči"
@@ -76,22 +76,22 @@ msgstr "Prekliči"
msgid "...retrieving failed: %s"
msgstr "... prenos je spodletel: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "Namestitev RPM"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Napaka: ni bilo možno najti datoteke %s, prekinitev"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "V _redu"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -112,7 +112,7 @@ msgstr ""
"\n"
"Kaj želite narediti?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -127,7 +127,7 @@ msgstr ""
"\n"
"Nadaljevanje?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -142,26 +142,31 @@ msgstr ""
"\n"
"Mogoče bi ga raje samo shranili. Kakšna je vaša izbira?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Namesti"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Shrani"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Prekliči"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Izberite mesto za shranjevanje datoteke"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "V redu"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -245,17 +250,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Noben paket ni bil določen"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Za to morate biti skrbnik"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Pripravljam namestitev paketov ..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -264,7 +269,7 @@ msgstr ""
"Nekaterih zahtevanih paketov ni mogoče namestiti:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -275,42 +280,37 @@ msgstr ""
"%s\n"
"Ali naj se namestitev vseeno nadaljuje?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Opozorilo"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "V redu"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (za nadgradnjo)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (za namestitev)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Izbira paketov"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Potreben je eden od naslednjih paketov:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Prekini"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -321,22 +321,22 @@ msgstr ""
"%s\n"
"Naj se namestitev vseeno nadaljuje?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Uporabljenega bo %s dodatnega prostora na disku."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "Sproščenega bo %s prostora na disku."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "Prenesenih bo %s paketov."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -345,39 +345,39 @@ msgstr[1] "Nadaljujem z namestitvijo %d paketov?"
msgstr[2] "Nadaljujem z namestitvijo %d paketov?"
msgstr[3] "Nadaljujem z namestitvijo %d paketov?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Za zadovoljitev odvisnosti bo nameščen naslednji paket:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Za zadovoljitev odvisnosti bodo nameščeni naslednji paketi:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "paketov z izvorno kodo ni mogoče dobiti, predčasna prekinitev"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Vstavite vir imenovan »%s«"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr "Prišlo je do napake:"
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Opravljeno"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -386,27 +386,27 @@ msgstr ""
"Namestitev ni uspela, ker manjkajo nekatere datoteke:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Poskusite posodobiti podatkovno zbirko urpmi."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Namestitev ni uspela:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Paket(-i) so že nameščeni"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Namestitev je končana"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "ponovno zaganjanje urpmi"
@@ -482,7 +482,7 @@ msgstr "V mapo %s ni mogoče prenašati paketov"
msgid "Environment directory %s does not exist"
msgstr "Mapa %s ne obstaja"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "uporabljam specifično okolje pri %s\n"
@@ -537,63 +537,63 @@ msgstr "napaka pri registraciji krajevnih paketov"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Ta postopek ni dovoljen v omejenem načinu"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "napačna deklaracija posredniškega strežnika v ukazni vrstici\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: datoteke rpm »%s« ni mogoče brati\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "nepričakovan izraz %s"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "manjkajoč izraz pred %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "nepričakovan izraz %s (predlog: uporabite -a ali -o ?)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "ni izraza za zaprtje"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"Privzeto urpmf pričakuje regularni izraz. Uporabite argument »--literal«"
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "mapa za chroot ne obstaja"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "Ni mogoče uporabiti %s brez %s"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "Ni mogoče uporabiti %s z/s %s"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "Preveč argumentov\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -610,7 +610,7 @@ msgstr ""
"\n"
"Uporaba:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Avtorske pravice (C) %s %s"
@@ -659,7 +659,7 @@ msgstr "branje datoteke nastavitvene datoteke [%s] ni možno"
msgid "medium `%s' is defined twice, aborting"
msgstr "vir »%s« je naveden dvakrat, prekinjam"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "zapisovanje nastavitvene datoteke [%s] ni možno"
@@ -1359,8 +1359,8 @@ msgstr "Arhit."
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(predlagan)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -2065,9 +2065,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - ime izvornega paketa rpm\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - oznake priporočenih paketov\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - oznake zahtevanih paketov\n"
#: ../urpmf:76
#, c-format
@@ -2095,27 +2095,27 @@ msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - izpis različice, izdaje in arhitekture z vsakim imenom.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "nezaključen izraz (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Nepravilen format: uporabite lahko samo eno oznako z več vrednostmi"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "ni bilo možno najti datoteke hdlist za vir »%s«"
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "ni bilo možno najti datoteke synthesis za vir »%s«"
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "ni bilo možno najti datoteke xml-info za vir »%s«"
@@ -2141,8 +2141,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - samodejno odstrani osirotele pakete\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --no-suggests - brez samodejne izbire priporočenih paketov.\n"
#: ../urpmi:81
@@ -2245,8 +2245,8 @@ msgstr ""
" preverjanja odvisnosti in integritete.\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --allow-suggests - samodejno izbere »priporočene« pakete.\n"
#: ../urpmi:109
@@ -3091,9 +3091,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - izpiše zahtevano.\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - prikaže priporočene pakete.\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - izpiše zahtevano.\n"
#: ../urpmq:85
#, c-format
@@ -3268,6 +3268,15 @@ msgstr "Zagon programa za namestitev paketov Mageje"
msgid "Authentication is required to run Mageia Package Installer"
msgstr "Za zagon nameščanja paketov Mageje je potrebno overjanje"
+#~ msgid "(suggested)"
+#~ msgstr "(predlagan)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - oznake priporočenih paketov\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - prikaže priporočene pakete.\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d paket, %d MiB)"
diff --git a/po/sq.po b/po/sq.po
index d5c488ac..c08ca349 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2002-12-04 23:55+0200\n"
"Last-Translator: Naim Daka <naim70@freesurf.ch>\n"
"Language-Team: Albanian <LL@li.org>\n"
@@ -57,7 +57,7 @@ msgstr "Instalimi i pakove `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Shkarkimi i pakos `%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Anulo"
@@ -69,22 +69,22 @@ msgstr "Anulo"
msgid "...retrieving failed: %s"
msgstr "...rikuperimi dështoi: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Instalimi i sistemit"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Ok"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -97,7 +97,7 @@ msgid ""
"What would you like to do?"
msgstr ""
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, fuzzy, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -109,7 +109,7 @@ msgstr ""
"Ju duhet të jeni administrator për t'instaluar mvarësit e radhitura:\n"
"%s\n"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -119,26 +119,31 @@ msgid ""
"You may prefer to just save it. What is your choice?"
msgstr ""
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Instalo"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Ruaj"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Anulo"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, fuzzy, c-format
msgid "Choose location to save file"
msgstr "Zgjedhe një skedare"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -223,17 +228,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Asnjë urdhër i specifikuar"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, fuzzy, c-format
msgid "Must be root"
msgstr "Porta e Minit"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Pregatitje për instalimin e pakove..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -242,7 +247,7 @@ msgstr ""
"Disa nga pakot e kërkuara nuk mund të instalohen:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -252,42 +257,37 @@ msgstr ""
"Disa nga pakot e kërkuara nuk mund të instalohen:\n"
"%s"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Kujdes"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Azhurno"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, fuzzy, c-format
msgid " (to install)"
msgstr "Fundi i instalimit"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Një nga pakot e radhitura nevojitet:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, fuzzy, c-format
msgid "_Abort"
msgstr "Ndërpreje"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -297,35 +297,35 @@ msgstr ""
"Pakot a radhitura duhet të zhduken që të tjerat të azhurnohen:\n"
"%s"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Për ta plotësuar mvarësin, pakotë me radhë do të zhduken (%d MB)"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -334,34 +334,34 @@ msgstr ""
"instalohen:\n"
"\n"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "e pa mundur marrja e burimit të pakos, ndërpritje"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Ju lutemi futni burimin e emruar \"%s\" në mjetin [%s]"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, fuzzy, c-format
msgid "_Done"
msgstr "Përfundoi"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "Instalimi dështio"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, fuzzy, c-format
msgid "You may want to update your urpmi database."
msgstr ""
@@ -369,22 +369,22 @@ msgstr ""
"%s\n"
"A dëshironi t'azhurnoni bazën e të dhënave urpmi"
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Instalimi dështio"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Gjdo gjë është veçse e instaluar"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Instalimi përfundoi"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -460,7 +460,7 @@ msgstr "Shkarkimi i pakos `%s'..."
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "përdorim specifik i mjedisit në %s\n"
@@ -515,62 +515,62 @@ msgstr "gabim gjatë regjistrimit të pakove lokale"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "proxy që është deklaruar në linjën komanduese nuk është i saktë\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: nuk mund ta lexojë skedaren rpm \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Mungon nënshkrimi (%s)"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -586,7 +586,7 @@ msgstr ""
"\n"
"përdorim:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "E drejtë autori (C) %s %s"
@@ -633,7 +633,7 @@ msgstr "i pa mundur shkrimi i skedares konfiguruese [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "i pa mundur shkrimi i skedares konfiguruese [%s]"
@@ -1325,7 +1325,7 @@ msgstr "Hulumto"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -1991,8 +1991,8 @@ msgstr " --sourcerpm - çfaqe etiketën sourcerpm: burimi rpm.\n"
#: ../urpmf:75
#, fuzzy, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --obsoletes - çfaqe etiketën obsoletes: gjitha absolutisht.\n"
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - çfaqe etiketën requires: gjitha dëshiratë.\n"
#: ../urpmf:76
#, fuzzy, c-format
@@ -2020,27 +2020,27 @@ msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - çfaqe versionin, hollësitë dhe arkitekturen me emër.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "asnjë skedare e gjetur hdlist për burimin \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "krijimi i skedares sintezë për burimin \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "shkruarja e skedares për listën e burimit \"%s\""
@@ -2068,7 +2068,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --obsoletes - çfaqe etiketën obsoletes: gjitha absolutisht.\n"
#: ../urpmi:81
@@ -2172,7 +2172,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --obsoletes - çfaqe etiketën obsoletes: gjitha absolutisht.\n"
#: ../urpmi:109
@@ -2977,8 +2977,8 @@ msgstr " --requires - çfaqe etiketën requires: gjitha dëshiratë.\n"
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --obsoletes - çfaqe etiketën obsoletes: gjitha absolutisht.\n"
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - çfaqe etiketën requires: gjitha dëshiratë.\n"
#: ../urpmq:85
#, fuzzy, c-format
@@ -3140,6 +3140,14 @@ msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
#, fuzzy
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --obsoletes - çfaqe etiketën obsoletes: gjitha absolutisht.\n"
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --obsoletes - çfaqe etiketën obsoletes: gjitha absolutisht.\n"
+
+#, fuzzy
#~ msgid " --repackage - Re-package the files before erasing\n"
#~ msgstr " --packager - çfaqe etiketën packager: paketues.\n"
diff --git a/po/sr.po b/po/sr.po
index 8b2b2b88..25b9df96 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-sr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2004-02-01 19:27+0100\n"
"Last-Translator: Toma Jankovic <webmaster@mandrake.co.yu>\n"
"Language-Team: serbian <mdk@linux.rs.sr>\n"
@@ -66,7 +66,7 @@ msgstr "Инсталирам пакет `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Скидам пакет `%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Одустани"
@@ -78,22 +78,22 @@ msgstr "Одустани"
msgid "...retrieving failed: %s"
msgstr "...повраћај неуспео: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Инсталација система"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_У реду"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -106,7 +106,7 @@ msgid ""
"What would you like to do?"
msgstr ""
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, fuzzy, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -118,7 +118,7 @@ msgstr ""
"Морате да имате root овлашћења да би инсталирали следеће пакете:\n"
"%s\n"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -128,26 +128,31 @@ msgid ""
"You may prefer to just save it. What is your choice?"
msgstr ""
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "Инсталирај"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Сачувај"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Поништи"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, fuzzy, c-format
msgid "Choose location to save file"
msgstr "Изаберите фајл"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "У реду"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -230,17 +235,17 @@ msgstr " --media - користи само дати медиј, одво
msgid "No packages specified"
msgstr "Није одређена команда"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, fuzzy, c-format
msgid "Must be root"
msgstr "Порт за миша"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Припремам инсталацију пакета"
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -249,7 +254,7 @@ msgstr ""
"Неки изабрани пакети се не могу инсталирати:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -259,42 +264,37 @@ msgstr ""
"Неки изабрани пакети се не могу инсталирати:\n"
"%s"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Упозорење"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "У реду"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Ажурирање"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, fuzzy, c-format
msgid " (to install)"
msgstr "Излаз из инсталације"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Потребан(и) су следећи пакет(и):"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Одустати"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -304,22 +304,22 @@ msgstr ""
"Следећи пакети се морају уклонити да би други могли да буду ажурирани:\n"
"%s"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -327,46 +327,46 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Ради задовољења зависности, следећи пакети ће бити уклоњени (%d MB)"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Ради задовољења зависности, следећи пакети ће бити уклоњени (%d MB)"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "извор пакета није доступан, излазим..."
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Убаците медиј са именом %s у уређај [%s]"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, fuzzy, c-format
msgid "_Done"
msgstr "Урађено"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "Инсталација није успела"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, fuzzy, c-format
msgid "You may want to update your urpmi database."
msgstr ""
@@ -374,22 +374,22 @@ msgstr ""
"%s\n"
"Можда желите да ажурирате вашу urpmi базу података."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Инсталација није успела"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "све је већ инсталирано"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Инсталација готова"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "рестартујем urpmi"
@@ -462,7 +462,7 @@ msgstr "Скидам пакет `%s'..."
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "користим дато окружење на %s\n"
@@ -517,62 +517,62 @@ msgstr "грешка при регистровању локалних пакет
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "лоша proxy-декларација у командној линији\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: не могу да прочитам rpm датотеку \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Недостаје потпис (%s)"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -588,7 +588,7 @@ msgstr ""
"\n"
"употреба:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, fuzzy, c-format
msgid "Copyright (C) %s by %s"
msgstr "Сва права (C) %s задржава Мандрива"
@@ -635,7 +635,7 @@ msgstr "не могу да извршим упис у конфигурацион
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "не могу да извршим упис у конфигурациону датотеку [%s]"
@@ -1325,7 +1325,7 @@ msgstr "Тражи"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -1991,8 +1991,8 @@ msgstr " --sourcerpm - приказује таг sourcerpm: source rpm.\n"
#: ../urpmf:75
#, fuzzy, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --obsoletes - приказује таг вишак: сви вишкови (у више реда).\n"
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - приказује таг захтева: сви захтеви\n"
#: ../urpmf:76
#, fuzzy, c-format
@@ -2021,27 +2021,27 @@ msgstr ""
" -f - приказује верзију, издање и архитектуру, укључујући и "
"име.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "није пронађена hdlist датотека за медиј \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "креирам hdlist симтезну датотеку за медиј \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "уписујем листу фајлова за медиј \"%s\""
@@ -2068,7 +2068,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --obsoletes - приказује таг вишак: сви вишкови (у више реда).\n"
#: ../urpmi:81
@@ -2171,7 +2171,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --obsoletes - приказује таг вишак: сви вишкови (у више реда).\n"
#: ../urpmi:109
@@ -2972,8 +2972,8 @@ msgstr " --requires - приказује таг захтева: сви з
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --obsoletes - приказује таг вишак: сви вишкови (у више реда).\n"
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - приказује таг захтева: сви захтеви\n"
#: ../urpmq:85
#, fuzzy, c-format
@@ -3133,6 +3133,16 @@ msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
#, fuzzy
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr ""
+#~ " --obsoletes - приказује таг вишак: сви вишкови (у више реда).\n"
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr ""
+#~ " --obsoletes - приказује таг вишак: сви вишкови (у више реда).\n"
+
+#, fuzzy
#~ msgid " --repackage - Re-package the files before erasing\n"
#~ msgstr " --packager - приказује таг packager: packager.\n"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index dc3f2d0f..79fda174 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-sr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2004-02-01 19:27+0100\n"
"Last-Translator: Toma Jankovic <webmaster@mandrake.co.yu>\n"
"Language-Team: serbian <mdk@linux.rs.sr>\n"
@@ -66,7 +66,7 @@ msgstr "Instaliram paket `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Skidam paket `%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Odustani"
@@ -78,22 +78,22 @@ msgstr "Odustani"
msgid "...retrieving failed: %s"
msgstr "...povraćaj neuspeo: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Instalacija sistema"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_U redu"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -106,7 +106,7 @@ msgid ""
"What would you like to do?"
msgstr ""
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, fuzzy, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -118,7 +118,7 @@ msgstr ""
"Morate da imate root ovlašćenja da bi instalirali sledeće pakete:\n"
"%s\n"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -128,26 +128,31 @@ msgid ""
"You may prefer to just save it. What is your choice?"
msgstr ""
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "Instaliraj"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Sačuvaj"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Poništi"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, fuzzy, c-format
msgid "Choose location to save file"
msgstr "Izaberite fajl"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "U redu"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -231,17 +236,17 @@ msgstr " --media - koristi samo dati medij, odvojen zarezom.\n"
msgid "No packages specified"
msgstr "Nije određena komanda"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, fuzzy, c-format
msgid "Must be root"
msgstr "Port za miša"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Pripremam instalaciju paketa"
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -250,7 +255,7 @@ msgstr ""
"Neki izabrani paketi se ne mogu instalirati:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -260,42 +265,37 @@ msgstr ""
"Neki izabrani paketi se ne mogu instalirati:\n"
"%s"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Upozorenje"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "U redu"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Ažuriranje"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, fuzzy, c-format
msgid " (to install)"
msgstr "Izlaz iz instalacije"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Potreban(i) su sledeći paket(i):"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Odustati"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -305,22 +305,22 @@ msgstr ""
"Sledeći paketi se moraju ukloniti da bi drugi mogli da budu ažurirani:\n"
"%s"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -328,46 +328,46 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Radi zadovoljenja zavisnosti, sledeći paketi će biti uklonjeni (%d MB)"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Radi zadovoljenja zavisnosti, sledeći paketi će biti uklonjeni (%d MB)"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "izvor paketa nije dostupan, izlazim..."
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Ubacite medij sa imenom %s u uređaj [%s]"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, fuzzy, c-format
msgid "_Done"
msgstr "Urađeno"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "Instalacija nije uspela"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, fuzzy, c-format
msgid "You may want to update your urpmi database."
msgstr ""
@@ -375,22 +375,22 @@ msgstr ""
"%s\n"
"Možda želite da ažurirate vašu urpmi bazu podataka."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Instalacija nije uspela"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "sve je već instalirano"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Instalacija gotova"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "restartujem urpmi"
@@ -463,7 +463,7 @@ msgstr "Skidam paket `%s'..."
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "koristim dato okruženje na %s\n"
@@ -518,62 +518,62 @@ msgstr "greška pri registrovanju lokalnih paketa"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "loša proxy-deklaracija u komandnoj liniji\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: ne mogu da pročitam rpm datoteku \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Nedostaje potpis (%s)"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -589,7 +589,7 @@ msgstr ""
"\n"
"upotreba:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Sva prava (C) %s zadržava %s"
@@ -636,7 +636,7 @@ msgstr "ne mogu da izvršim upis u konfiguracionu datoteku [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "ne mogu da izvršim upis u konfiguracionu datoteku [%s]"
@@ -1326,7 +1326,7 @@ msgstr "Traži"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -1996,8 +1996,8 @@ msgstr " --sourcerpm - prikazuje tag sourcerpm: source rpm.\n"
#: ../urpmf:75
#, fuzzy, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --obsoletes - prikazuje tag višak: svi viškovi (u više reda).\n"
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - prikazuje tag zahteva: svi zahtevi\n"
#: ../urpmf:76
#, fuzzy, c-format
@@ -2026,27 +2026,27 @@ msgstr ""
" -f - prikazuje verziju, izdanje i arhitekturu, uključujući i "
"ime.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "kreiram hdlist simteznu datoteku za medij \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "upisujem listu fajlova za medij \"%s\""
@@ -2073,7 +2073,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --obsoletes - prikazuje tag višak: svi viškovi (u više reda).\n"
#: ../urpmi:81
@@ -2176,7 +2176,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --obsoletes - prikazuje tag višak: svi viškovi (u više reda).\n"
#: ../urpmi:109
@@ -2981,8 +2981,8 @@ msgstr " --requires - prikazuje tag zahteva: svi zahtevi\n"
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --obsoletes - prikazuje tag višak: svi viškovi (u više reda).\n"
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - prikazuje tag zahteva: svi zahtevi\n"
#: ../urpmq:85
#, fuzzy, c-format
@@ -3145,6 +3145,16 @@ msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
#, fuzzy
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr ""
+#~ " --obsoletes - prikazuje tag višak: svi viškovi (u više reda).\n"
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr ""
+#~ " --obsoletes - prikazuje tag višak: svi viškovi (u više reda).\n"
+
+#, fuzzy
#~ msgid " --repackage - Re-package the files before erasing\n"
#~ msgstr " --packager - prikazuje tag packager: packager.\n"
diff --git a/po/sv.po b/po/sv.po
index 1076a1ad..af1abdef 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,6 +1,6 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR Free Software Foundation, Inc.
-#
+#
# Translators:
# Cecilia Johnsson <datb@thegym.net>, 2000
# Fuad Sabanovic <manijak@telia.com>, 2000
@@ -17,14 +17,15 @@
msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2014-05-12 23:39+0000\n"
"Last-Translator: Willard1975 <willard@null.net>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/mageia/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/mageia/language/"
+"sv/)\n"
+"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8-bit\n"
-"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../gurpm/RPMProgressDialog.pm:47
@@ -67,7 +68,7 @@ msgstr "Installerar paket \"%s\" (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Laddar ner paket \"%s\"..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Avbryt"
@@ -79,34 +80,43 @@ msgstr "Avbryt"
msgid "...retrieving failed: %s"
msgstr "...hämtning misslyckades: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "RPM installation"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Fel: kan inte hitta filen %s, avbryter operationen"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_OK"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
"\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 "Du har valt ett källpaket:\n\n%s\n\nDu vill troligen inte installera detta paket (efter installation kan du\nmodifiera källkoden och sedan kompilera koden).\n\nVad vill du göra?"
+msgstr ""
+"Du har valt ett källpaket:\n"
+"\n"
+"%s\n"
+"\n"
+"Du vill troligen inte installera detta paket (efter installation kan du\n"
+"modifiera källkoden och sedan kompilera koden).\n"
+"\n"
+"Vad vill du göra?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -114,9 +124,14 @@ msgid ""
"%s\n"
"\n"
"Proceed?"
-msgstr "Du är på väg att installera följande paket på din dator:\n\n%s\n\nFortsätta?"
+msgstr ""
+"Du är på väg att installera följande paket på din dator:\n"
+"\n"
+"%s\n"
+"\n"
+"Fortsätta?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -124,28 +139,38 @@ msgid ""
"%s\n"
"\n"
"You may prefer to just save it. What is your choice?"
-msgstr "Du är på väg att installera följande paket på din dator:\n\n%s\n\nKanske föredrar du att endast spara detta. Vilket är ditt val?"
+msgstr ""
+"Du är på väg att installera följande paket på din dator:\n"
+"\n"
+"%s\n"
+"\n"
+"Kanske föredrar du att endast spara detta. Vilket är ditt val?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Installera"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Spara"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "Av_bryt"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Välj var filen ska sparas"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "OK"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -162,13 +187,15 @@ msgstr " --help - visar det här hjälpmeddelandet.\n"
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
-msgstr " --auto - ej interaktivt läge. väljer standardsvar på alla frågor.\n"
+msgstr ""
+" --auto - ej interaktivt läge. väljer standardsvar på alla frågor.\n"
#: ../gurpmi.pm:59 ../urpmi:75 ../urpmq:48
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - välj automatiskt paket för att uppdatera systemet.\n"
+msgstr ""
+" --auto-select - välj automatiskt paket för att uppdatera systemet.\n"
#: ../gurpmi.pm:60 ../urpme:46 ../urpmi:100 ../urpmq:64
#, c-format
@@ -181,7 +208,9 @@ msgstr " --force - tvinga användning även om vissa paket inte finns.\n
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr " --verify-rpm - verifiera rpm-signatur före installation (standard)\n (--no-verify-rpm inaktiverar det).\n"
+msgstr ""
+" --verify-rpm - verifiera rpm-signatur före installation (standard)\n"
+" (--no-verify-rpm inaktiverar det).\n"
#: ../gurpmi.pm:63 ../urpmf:36 ../urpmi:68 ../urpmq:43
#, c-format
@@ -191,7 +220,8 @@ msgstr " --media - använd endast givet media, separerat med komma.\n"
#: ../gurpmi.pm:64 ../urpmi:147
#, c-format
msgid " -p - allow search in provides to find package.\n"
-msgstr " -p - tillåt sökning i \"provides\" för att hitta paket.\n"
+msgstr ""
+" -p - tillåt sökning i \"provides\" för att hitta paket.\n"
#: ../gurpmi.pm:65 ../urpmi:148
#, c-format
@@ -208,169 +238,179 @@ msgstr " --root - använd en annan root för rpm installation.\n"
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
-msgstr " --test - verifiera endast om installationen kan utföras korrekt.\n"
+msgstr ""
+" --test - verifiera endast om installationen kan utföras korrekt.\n"
#: ../gurpmi.pm:68 ../urpmi:71
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --searchmedia - använd endast givet media för att söka efter valda paket.\n"
+msgstr ""
+" --searchmedia - använd endast givet media för att söka efter valda "
+"paket.\n"
#: ../gurpmi.pm:115
#, c-format
msgid "No packages specified"
msgstr "Inga paket specifierade"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Måste vara root"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Förbereder paketinstallation..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
-msgstr "Vissa begärda paket kan inte installeras:\n%s"
+msgstr ""
+"Vissa begärda paket kan inte installeras:\n"
+"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s\n"
"Continue installation anyway?"
-msgstr "Vissa begärda paket kan inte installeras:\n%s\nVill du fortsätta ändå?"
+msgstr ""
+"Vissa begärda paket kan inte installeras:\n"
+"%s\n"
+"Vill du fortsätta ändå?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Varning"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "OK"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (för att uppdatera)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (för att installera)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Val av paket"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Ett av följande paket är nödvändigt:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Avbryt"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s\n"
"Continue installation anyway?"
-msgstr "Följande paket måste tas bort för att andra ska bli uppdaterade:\n%s\nVill du fortsätta ändå?"
+msgstr ""
+"Följande paket måste tas bort för att andra ska bli uppdaterade:\n"
+"%s\n"
+"Vill du fortsätta ändå?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "%s mera disk-utrymme kommer att bli använt."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "%s disk-utrymme kommer att frigöras."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s paket kommer att hämtas."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Fortsätt installationen ett paket?"
msgstr[1] "Fortsätt installationen av %d paket?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgstr "För att tillfredsställa beroenden, kommer följande paket att installeras:"
+msgstr ""
+"För att tillfredsställa beroenden, kommer följande paket att installeras:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
-msgstr "För att tillfredsställa beroenden kommer följande paket att installeras:"
+msgstr ""
+"För att tillfredsställa beroenden kommer följande paket att installeras:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "kunde inte läsa källan, avbryter"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Lägg i media med namnet \"%s\""
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr "Ett fel inträffade:"
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Klar"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
-msgstr "Installationen misslyckades, vissa filer saknas:\n%s"
+msgstr ""
+"Installationen misslyckades, vissa filer saknas:\n"
+"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Du behöver nog uppdatera din urpmi-databas."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Installationen misslyckades:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Allt är redan installerat"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Installation slutförd"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "startar om urpmi"
@@ -380,7 +420,9 @@ msgstr "startar om urpmi"
msgid ""
"usage: %s [options]\n"
"where [options] are from\n"
-msgstr "användning: %s [flaggor]\ndär [flaggor] är från\n"
+msgstr ""
+"användning: %s [flaggor]\n"
+"där [flaggor] är från\n"
#: ../rpm-find-leaves:17
#, c-format
@@ -420,7 +462,8 @@ msgstr "Kör urpmi i begränsat läge"
#: ../urpm.pm:23
#, c-format
msgid "While some packages may have been installed, there were failures.\n"
-msgstr "Medans vissa paket kan ha blivit installerade så fanns det misslyckanden.\n"
+msgstr ""
+"Medans vissa paket kan ha blivit installerade så fanns det misslyckanden.\n"
#: ../urpm.pm:194
#, c-format
@@ -442,7 +485,7 @@ msgstr "Kan inte ladda ner paket till [%s]"
msgid "Environment directory %s does not exist"
msgstr "Omgivning sökväg %s existerar inte"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "använder specifik miljö på %s\n"
@@ -497,72 +540,80 @@ msgstr "fel vid registrering av lokala paket"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Denna operation är inte tillåten i begränsat läge"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "felaktig proxydeklaration på kommandorad\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: kan inte läsa rpm-fil \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "oväntat uttryck %s"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "uttryck saknas före %s"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "oväntat uttryck %s (förslag: använd -a eller -o)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "inget uttryck att stänga"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
-msgstr "som standard väntar urpmf på en regexp. du borde använda alternativet \"--literal\""
+msgstr ""
+"som standard väntar urpmf på en regexp. du borde använda alternativet \"--"
+"literal\""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot katalog existerar inte"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "Kan inte använda %s utan %s"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "Kan inte använda %s med %s"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "För många argument\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
"%s\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 "%s version %s\n%s\nDet här är fri programvara och får distribueras enligt villkoren i GNU GPL.\n\nanvändning:\n"
+msgstr ""
+"%s version %s\n"
+"%s\n"
+"Det här är fri programvara och får distribueras enligt villkoren i GNU GPL.\n"
+"\n"
+"användning:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Copyright (C) %s, %s"
@@ -577,7 +628,9 @@ msgstr "Kopiering misslyckades"
msgid ""
"You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done "
"automatically)"
-msgstr "Du måste montera CD-ROM själv (eller installera perl-Hal-Cdroms för att få det automatiserat)"
+msgstr ""
+"Du måste montera CD-ROM själv (eller installera perl-Hal-Cdroms för att få "
+"det automatiserat)"
#: ../urpm/cdrom.pm:82
#, c-format
@@ -609,7 +662,7 @@ msgstr "kan inte läsa inställningsfil [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "medium '%s' är definierat två gånger, avbryter"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "kan inte skriva inställningsfil [%s]"
@@ -622,7 +675,9 @@ msgstr "%s är inte tillgänglig, faller tillbaka till %s"
#: ../urpm/download.pm:169
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
-msgstr "kan inte läsa proxy-inställningar (inte tillräckliga behörigheter för att läsa %s)"
+msgstr ""
+"kan inte läsa proxy-inställningar (inte tillräckliga behörigheter för att "
+"läsa %s)"
#: ../urpm/download.pm:199
#, c-format
@@ -788,7 +843,9 @@ msgstr "tar bort paket %s"
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "skapade transaktion för installation på %s (ta bort=%d, installera=%d, uppdatera=%d)"
+msgstr ""
+"skapade transaktion för installation på %s (ta bort=%d, installera=%d, "
+"uppdatera=%d)"
#: ../urpm/install.pm:344
#, c-format
@@ -865,14 +922,20 @@ msgstr "Du bör försöka uppdatera urpmi-databasen."
msgid ""
"Installation failed, bad rpms:\n"
"%s"
-msgstr "Installationen misslyckades, felaktiga rpm:\n%s"
+msgstr ""
+"Installationen misslyckades, felaktiga rpm:\n"
+"%s"
#: ../urpm/main_loop.pm:108
#, c-format
msgid ""
-"There is not enough space on your filesystem to download all packages (%s needed, %s available).\n"
+"There is not enough space on your filesystem to download all packages (%s "
+"needed, %s available).\n"
"Are you sure you want to continue?"
-msgstr "Det finns inte tillräckligt med utrymme på ditt filsystem för att ladda ner alla paket (%s behövs, %s tillgängligt).\nÄr du säker du vill fortsätta?"
+msgstr ""
+"Det finns inte tillräckligt med utrymme på ditt filsystem för att ladda ner "
+"alla paket (%s behövs, %s tillgängligt).\n"
+"Är du säker du vill fortsätta?"
#: ../urpm/main_loop.pm:138
#, c-format
@@ -988,9 +1051,11 @@ msgstr "använder associerad media för parallelläge: %s"
#: ../urpm/media.pm:673
#, c-format
msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, "
-"--update, --use-distrib or --parallel"
-msgstr "--synthesis kan inte användas med --media, --excludemedia, --sortmedia, -- update, --use-distrib eller --parallel"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update, --use-distrib or --parallel"
+msgstr ""
+"--synthesis kan inte användas med --media, --excludemedia, --sortmedia, -- "
+"update, --use-distrib eller --parallel"
#: ../urpm/media.pm:786
#, c-format
@@ -1000,7 +1065,8 @@ msgstr "ignorerar non-free mediet `%s'"
#: ../urpm/media.pm:795
#, c-format
msgid "un-ignoring non-free medium `%s' b/c nonfree packages are installed"
-msgstr "slutar att ignorera icke-fri media `%s' b/c icke-fria paket installeras"
+msgstr ""
+"slutar att ignorera icke-fri media `%s' b/c icke-fria paket installeras"
#: ../urpm/media.pm:799
#, c-format
@@ -1290,8 +1356,8 @@ msgstr "Arkitektur"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(föreslagen)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -1331,7 +1397,8 @@ msgstr "TB"
#: ../urpm/orphans.pm:79
#, c-format
msgid "Marking %s as manually installed, it won't be auto-orphaned"
-msgstr "Markerar %s som manuellt installerad, så det inte blir märkt som obehövligt"
+msgstr ""
+"Markerar %s som manuellt installerad, så det inte blir märkt som obehövligt"
#: ../urpm/orphans.pm:527
#, c-format
@@ -1343,8 +1410,14 @@ msgid_plural ""
"The following packages:\n"
"%s\n"
"are now orphaned."
-msgstr[0] "Följande paket:\n%s\nbehövs inte längre."
-msgstr[1] "Följande paket:\n%s\nbehövs inte längre."
+msgstr[0] ""
+"Följande paket:\n"
+"%s\n"
+"behövs inte längre."
+msgstr[1] ""
+"Följande paket:\n"
+"%s\n"
+"behövs inte längre."
#: ../urpm/orphans.pm:530
#, c-format
@@ -1358,13 +1431,21 @@ msgstr[1] "Du kanske vill ta bort dem."
msgid ""
"The following package:\n"
"%s\n"
-"is now orphaned, if you wish to remove it, you can use \"urpme --auto-orphans\""
+"is now orphaned, if you wish to remove it, you can use \"urpme --auto-orphans"
+"\""
msgid_plural ""
"The following packages:\n"
"%s\n"
-"are now orphaned, if you wish to remove them, you can use \"urpme --auto-orphans\""
-msgstr[0] "Följande paket:\n%s\nbehövs ej mera, använd \"urpme --auto-orphans\" för att ta bort det"
-msgstr[1] "Följande paket:\n%s\nbehövs ej mera, använd \"urpme --auto-orphans\" för att ta bort dem"
+"are now orphaned, if you wish to remove them, you can use \"urpme --auto-"
+"orphans\""
+msgstr[0] ""
+"Följande paket:\n"
+"%s\n"
+"behövs ej mera, använd \"urpme --auto-orphans\" för att ta bort det"
+msgstr[1] ""
+"Följande paket:\n"
+"%s\n"
+"behövs ej mera, använd \"urpme --auto-orphans\" för att ta bort dem"
#: ../urpm/parallel.pm:15
#, c-format
@@ -1419,9 +1500,11 @@ msgstr "cp misslyckades på maskin %s (%d)"
#: ../urpm/parallel_ssh.pm:84
#, c-format
msgid ""
-"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit"
-" code: %d)"
-msgstr "%s misslyckades på maskin %s (kanske den inte har en korrekt version av urpmi?) (felkod %d)"
+"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
+"code: %d)"
+msgstr ""
+"%s misslyckades på maskin %s (kanske den inte har en korrekt version av "
+"urpmi?) (felkod %d)"
#: ../urpm/removable.pm:46
#, c-format
@@ -1447,7 +1530,8 @@ msgstr "urpmi startades om, och listan av prioriterade paket ändrades inte"
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "urpmi startades om, och listan av prioriterade paket ändrades: %s mot %s"
+msgstr ""
+"urpmi startades om, och listan av prioriterade paket ändrades: %s mot %s"
#: ../urpm/select.pm:220
#, c-format
@@ -1504,14 +1588,18 @@ msgstr "för att behålla %s"
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgstr "Följande paket måste tas bort för att andra ska bli uppdaterade:\n%s"
+msgstr ""
+"Följande paket måste tas bort för att andra ska bli uppdaterade:\n"
+"%s"
#: ../urpm/select.pm:675
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s"
-msgstr "Följande paket måste tas bort för att andra ska bli uppdaterade:\n%s"
+msgstr ""
+"Följande paket måste tas bort för att andra ska bli uppdaterade:\n"
+"%s"
#: ../urpm/select.pm:702
#, c-format
@@ -1639,7 +1727,10 @@ msgstr " --noscripts - kör inga skript i paket(en).\n"
msgid ""
" --use-distrib - configure urpme on the fly from a distrib tree, useful\n"
" to (un)install a chroot with --root option.\n"
-msgstr " --use-distrib - konfigurera urpmi 'on the fly' från ett distributionsträd, användbart\n vid (av)installation av chroot med --root option.\n"
+msgstr ""
+" --use-distrib - konfigurera urpmi 'on the fly' från ett "
+"distributionsträd, användbart\n"
+" vid (av)installation av chroot med --root option.\n"
#: ../urpme:54 ../urpmi:150 ../urpmq:87
#, c-format
@@ -1688,8 +1779,10 @@ msgstr "Inga obehövliga paket att ta bort"
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "För att tillfredsställa beroenden kommer följande paket att tas bort"
-msgstr[1] "För att tillfredsställa beroenden kommer följande %d paket att tas bort"
+msgstr[0] ""
+"För att tillfredsställa beroenden kommer följande paket att tas bort"
+msgstr[1] ""
+"För att tillfredsställa beroenden kommer följande %d paket att tas bort"
#: ../urpme:151
#, c-format
@@ -1745,7 +1838,8 @@ msgstr " --literal, -l - sök inte mönster, använd argument som söksträng.
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
-msgstr " --sortmedia - sorterar media enligt kommaseparerade delsträngar.\n"
+msgstr ""
+" --sortmedia - sorterar media enligt kommaseparerade delsträngar.\n"
#: ../urpmf:38
#, c-format
@@ -1775,12 +1869,14 @@ msgstr " --verbose - utförligt läge.\n"
#: ../urpmf:43
#, c-format
msgid " -i - ignore case distinctions in patterns.\n"
-msgstr " -i - versaler och gemener jämförs lika i varje mönster.\n"
+msgstr ""
+" -i - versaler och gemener jämförs lika i varje mönster.\n"
#: ../urpmf:44
#, c-format
msgid " -I - honor case distinctions in patterns (default).\n"
-msgstr " -I - versaler och gemener jämförs olika i varje mönster.\n"
+msgstr ""
+" -I - versaler och gemener jämförs olika i varje mönster.\n"
#: ../urpmf:45
#, c-format
@@ -1795,7 +1891,9 @@ msgstr "Mönster-uttryck:\n"
#: ../urpmf:47
#, c-format
msgid " text - any text is parsed as a regexp, unless -l is used.\n"
-msgstr " text - vilken text som helst används för att söka, om inte -l är använt.\n"
+msgstr ""
+" text - vilken text som helst används för att söka, om inte -l är "
+"använt.\n"
#: ../urpmf:48
#, c-format
@@ -1825,7 +1923,9 @@ msgstr " ( ) - vänster och höger parentes.\n"
#: ../urpmf:53
#, c-format
msgid "List of tags:\n"
-msgstr "Lista på taggar:\n\n"
+msgstr ""
+"Lista på taggar:\n"
+"\n"
#: ../urpmf:54
#, c-format
@@ -1933,9 +2033,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - visa källrpm-namn\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - suggests tag\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - visa krav\n"
#: ../urpmf:76
#, c-format
@@ -1962,27 +2062,27 @@ msgstr " -m - visa källan paketet finns i\n"
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - visa version, utgåva och arkitektur med namn.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "ej avslutat mönster-uttryck (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Felaktigt format: du kan endast använda en flervals-tagg"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "ingen hdlist-fil tillgänglig för media \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "ingen synthesis-fil tillgänglig för media \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "ingen xml-info tillgänglig för media \"%s\""
@@ -2008,8 +2108,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - ta bort obehövliga paket utan att fråga\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --no-suggests - välj inte \"föreslagna\" paket automatiskt.\n"
#: ../urpmi:81
@@ -2017,7 +2117,9 @@ msgstr " --no-suggests - välj inte \"föreslagna\" paket automatiskt.\n"
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
-msgstr " --no-uninstall - fråga aldrig om ett paket ska avinstalleras, avbryt installationen.\n"
+msgstr ""
+" --no-uninstall - fråga aldrig om ett paket ska avinstalleras, avbryt "
+"installationen.\n"
#: ../urpmi:82
#, c-format
@@ -2029,7 +2131,10 @@ msgstr " --no-install - installera inte paket (endast nedladdning)\n"
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
-msgstr " --keep - behåll om möjligt existerande paket, ignorera efterfrågade \n paket som leder till avinstalleringar.\n"
+msgstr ""
+" --keep - behåll om möjligt existerande paket, ignorera "
+"efterfrågade \n"
+" paket som leder till avinstalleringar.\n"
#: ../urpmi:85
#, c-format
@@ -2037,7 +2142,10 @@ msgid ""
" --split-level - split in small transaction if more than given packages\n"
" are going to be installed or upgraded,\n"
" default is %d.\n"
-msgstr " --split-level - dela upp i små transaktioner om fler än angivna paket\n kommer att installeras eller uppdateras,\n standard är %d\n"
+msgstr ""
+" --split-level - dela upp i små transaktioner om fler än angivna paket\n"
+" kommer att installeras eller uppdateras,\n"
+" standard är %d\n"
#: ../urpmi:89
#, c-format
@@ -2074,31 +2182,38 @@ msgstr " --noclean - rensa inte rpms från cache.\n"
msgid ""
" --downgrade - downgrade a package from the version currently installed\n"
" to the previously highest version\n"
-msgstr "--downgrade - nergradera ett paket från den nuvarande installerade\ntill den tidigare högsta versionen\n"
+msgstr ""
+"--downgrade - nergradera ett paket från den nuvarande installerade\n"
+"till den tidigare högsta versionen\n"
#: ../urpmi:99
#, c-format
msgid ""
" --replacepkgs - force installing packages which are already installed.\n"
-msgstr " --replacepkgs - tvinga installation av paket som redan är installerade.\n"
+msgstr ""
+" --replacepkgs - tvinga installation av paket som redan är installerade.\n"
#: ../urpmi:101
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
" dependencies checking.\n"
-msgstr " --allow-nodeps - tillåter användaren installera paket utan\n att kontrollera beroenden.\n"
+msgstr ""
+" --allow-nodeps - tillåter användaren installera paket utan\n"
+" att kontrollera beroenden.\n"
#: ../urpmi:103
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
" dependencies checking and integrity.\n"
-msgstr " --allow-force - tillåter användaren att installera paket utan\n kontroll av beroenden och integritet.\n"
+msgstr ""
+" --allow-force - tillåter användaren att installera paket utan\n"
+" kontroll av beroenden och integritet.\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --allow-suggests - välj \"föreslagna\" paket automatiskt.\n"
#: ../urpmi:109
@@ -2106,7 +2221,10 @@ msgstr " --allow-suggests - välj \"föreslagna\" paket automatiskt.\n"
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 - konfigurera urpmi 'on the fly' från ett distributionsträd, användbart\n vid installation av chroot med --root option.\n"
+msgstr ""
+" --use-distrib - konfigurera urpmi 'on the fly' från ett "
+"distributionsträd, användbart\n"
+" vid installation av chroot med --root option.\n"
#: ../urpmi:111 ../urpmi.addmedia:60 ../urpmi.update:37
#, c-format
@@ -2118,14 +2236,18 @@ msgstr " --metalink - generera och använd en lokal metalink.\n"
msgid ""
" --download-all - download all needed packages before trying to install "
"them\n"
-msgstr " --download-all - ladda ner alla behövliga paket innan de blir installerade\n"
+msgstr ""
+" --download-all - ladda ner alla behövliga paket innan de blir "
+"installerade\n"
#: ../urpmi:113
#, c-format
msgid ""
" --downloader - program to use to retrieve distant files. \n"
" known programs: %s\n"
-msgstr " --downloader - program för hämtning av fjärr-filer. \n kända program: %s\n"
+msgstr ""
+" --downloader - program för hämtning av fjärr-filer. \n"
+" kända program: %s\n"
#: ../urpmi:116
#, c-format
@@ -2162,28 +2284,38 @@ msgstr " --limit-rate - begränsa nedladdningshastigheten.\n"
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
" (--no-resume disables it, default is disabled).\n"
-msgstr " --resume - återuppta nedladdning av delvis nedladdade filer\n (--no-resume inaktiverar det, som standard är det inaktiverat).\n"
+msgstr ""
+" --resume - återuppta nedladdning av delvis nedladdade filer\n"
+" (--no-resume inaktiverar det, som standard är det "
+"inaktiverat).\n"
#: ../urpmi:124 ../urpmi.addmedia:62 ../urpmi.update:39 ../urpmq:74
#, 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 " --proxy - använd specificerad HTTP-proxy, portnumret antas\n vara 1080 som standard (formatet är <proxydator[:port]>).\n"
+msgstr ""
+" --proxy - använd specificerad HTTP-proxy, portnumret antas\n"
+" vara 1080 som standard (formatet är <proxydator[:"
+"port]>).\n"
#: ../urpmi:126 ../urpmi.addmedia:64 ../urpmi.update:41 ../urpmq:76
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
" authentication (format is <user:password>).\n"
-msgstr " --proxy-user - ange användare och lösenord för proxy-\n autentisering (formatet är <användare:lösenord>).\n"
+msgstr ""
+" --proxy-user - ange användare och lösenord för proxy-\n"
+" autentisering (formatet är <användare:lösenord>).\n"
#: ../urpmi:128
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
" next arg.\n"
-msgstr " --bug - mata ut en felrapport i katalogen som indikeras av\n nästa arg.\n"
+msgstr ""
+" --bug - mata ut en felrapport i katalogen som indikeras av\n"
+" nästa arg.\n"
#: ../urpmi:134
#, c-format
@@ -2203,7 +2335,8 @@ msgstr " --ignoresize - kontrollera inte diskutrymme före installation.\n"
#: ../urpmi:137
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
-msgstr " --ignorearch - tillåt installation av rpm som inte matchar arkitektur.\n"
+msgstr ""
+" --ignorearch - tillåt installation av rpm som inte matchar arkitektur.\n"
#: ../urpmi:138
#, c-format
@@ -2230,7 +2363,9 @@ msgstr " --prefer - paket som skall föredras\n"
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
-msgstr " --more-choices - om flera paket hittas, föreslå fler alternativ\n än standard.\n"
+msgstr ""
+" --more-choices - om flera paket hittas, föreslå fler alternativ\n"
+" än standard.\n"
#: ../urpmi:144
#, c-format
@@ -2272,7 +2407,9 @@ msgstr "Fel: kan inte använda --auto-select samtidigt som en fil-lista.\n"
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
-msgstr "Fel: För att skapa felrapport, använd samma argument som tidigare\noch lägg till --bug.\n"
+msgstr ""
+"Fel: För att skapa felrapport, använd samma argument som tidigare\n"
+"och lägg till --bug.\n"
#: ../urpmi:217
#, c-format
@@ -2293,14 +2430,18 @@ msgstr "använder --buildrequires"
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "vänligen använd --buildrequires eller --install-src, använder --buildrequires som standard"
+msgstr ""
+"vänligen använd --buildrequires eller --install-src, använder --"
+"buildrequires som standard"
#: ../urpmi:250
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
-msgstr "Katalogen [%s] finns redan, välj en annan katalog för felrapport eller radera den"
+msgstr ""
+"Katalogen [%s] finns redan, välj en annan katalog för felrapport eller "
+"radera den"
#: ../urpmi:251
#, c-format
@@ -2312,7 +2453,9 @@ msgstr "Kunde inte skapa katalog [%s] för felrapport"
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
-msgstr "Fel: %s verkar vara monterad som read-only.\nAnvänd --allow-force för att tvinga operationen."
+msgstr ""
+"Fel: %s verkar vara monterad som read-only.\n"
+"Använd --allow-force för att tvinga operationen."
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
#: ../urpmi:426
@@ -2356,7 +2499,10 @@ msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgstr "Följande paket kan inte installeras eftersom det är beroende av paket som\när äldre än de installerade paketen:\n%s"
+msgstr ""
+"Följande paket kan inte installeras eftersom det är beroende av paket som\n"
+"är äldre än de installerade paketen:\n"
+"%s"
#: ../urpmi:487
#, c-format
@@ -2364,14 +2510,19 @@ msgid ""
"The following packages can't be installed because they depend on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgstr "Följande paket kan inte installeras eftersom de är beroende av paket som\när äldre än de installerade paketen:\n%s"
+msgstr ""
+"Följande paket kan inte installeras eftersom de är beroende av paket som\n"
+"är äldre än de installerade paketen:\n"
+"%s"
#: ../urpmi:493 ../urpmi:511
#, c-format
msgid ""
"\n"
"Continue installation anyway?"
-msgstr "\nFortsätt installation ändå?"
+msgstr ""
+"\n"
+"Fortsätt installation ändå?"
#: ../urpmi:494 ../urpmi:512 ../urpmi:627 ../urpmi.addmedia:136
#, c-format
@@ -2383,7 +2534,9 @@ msgstr " (J/n) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgstr "Ett begärt paket kan inte installeras:\n%s"
+msgstr ""
+"Ett begärt paket kan inte installeras:\n"
+"%s"
#: ../urpmi:526
#, c-format
@@ -2396,7 +2549,10 @@ msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgstr "Installationen kan inte fortsätta eftersom följande paket måste\ntas bort så att andra kan uppdateras:\n%s\n"
+msgstr ""
+"Installationen kan inte fortsätta eftersom följande paket måste\n"
+"tas bort så att andra kan uppdateras:\n"
+"%s\n"
#: ../urpmi:536
#, c-format
@@ -2404,7 +2560,10 @@ msgid ""
"The installation cannot continue because the following packages\n"
"have to be removed for others to be upgraded:\n"
"%s\n"
-msgstr "Installationen kan inte fortsätta eftersom följande paket måste\ntas bort så att andra kan uppdateras:\n%s\n"
+msgstr ""
+"Installationen kan inte fortsätta eftersom följande paket måste\n"
+"tas bort så att andra kan uppdateras:\n"
+"%s\n"
#: ../urpmi:544
#, c-format
@@ -2414,9 +2573,13 @@ msgstr "(endast test, ingenting kommer att bli borttaget)"
#: ../urpmi:563
#, c-format
msgid ""
-"You must first call urpmi with --buildrequires to install the following dependencies:\n"
+"You must first call urpmi with --buildrequires to install the following "
+"dependencies:\n"
+"%s\n"
+msgstr ""
+"Du måste först använda urpmi --buildqequires för att installera följande "
+"beroenden:\n"
"%s\n"
-msgstr "Du måste först använda urpmi --buildqequires för att installera följande beroenden:\n%s\n"
#: ../urpmi:573
#, c-format
@@ -2440,10 +2603,8 @@ msgstr "(endast test, installation kommer inte att utföras)"
msgid "Press Enter when mounted..."
msgstr "Tryck Enter när klart..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not
-#. be translated!
-#. -PO: neither the ``with''. Only what is between <brackets> can be
-#. translated.
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
+#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, c-format
msgid ""
@@ -2466,7 +2627,27 @@ msgid ""
"\n"
"\n"
"and [options] are from\n"
-msgstr "Användning: urpmi.addmedia [flaggor] <namn> <url>\ndär <url> är något av följande\n [file:/]/<sökväg>\n ftp://<användarnamn>:<lösenord>@<värdnamn>/<sökväg>\n ftp://<värdnamn>/<sökväg>\n http://<värdnamn>/<sökväg>\n cdrom://<sökväg>\n\nanvändning: urpmi.addmedia [flaggor] --distrib --mirrorlist <url>\nanvändning: urpmi.addmedia [flaggor] --mirrorlist <url> <namn> <relativ-sökväg>\n\nexempel:\n\n urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST'\n urpmi.addmedia --mirrorlist '$MIRRORLIST' backports media/main/backports\n urpmi.addmedia --distrib --zeroconf\n\n\noch [flaggor] är från\n"
+msgstr ""
+"Användning: urpmi.addmedia [flaggor] <namn> <url>\n"
+"där <url> är något av följande\n"
+" [file:/]/<sökväg>\n"
+" ftp://<användarnamn>:<lösenord>@<värdnamn>/<sökväg>\n"
+" ftp://<värdnamn>/<sökväg>\n"
+" http://<värdnamn>/<sökväg>\n"
+" cdrom://<sökväg>\n"
+"\n"
+"användning: urpmi.addmedia [flaggor] --distrib --mirrorlist <url>\n"
+"användning: urpmi.addmedia [flaggor] --mirrorlist <url> <namn> <relativ-"
+"sökväg>\n"
+"\n"
+"exempel:\n"
+"\n"
+" urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST'\n"
+" urpmi.addmedia --mirrorlist '$MIRRORLIST' backports media/main/backports\n"
+" urpmi.addmedia --distrib --zeroconf\n"
+"\n"
+"\n"
+"och [flaggor] är från\n"
#: ../urpmi.addmedia:56 ../urpmi.update:33 ../urpmq:71
#, c-format
@@ -2493,14 +2674,21 @@ msgstr " --curl - använd aria2 för att hämta fjärrfiler.\n"
msgid ""
" --update - create an update medium, \n"
" or discard non-update media (when used with --distrib)\n"
-msgstr " --update - skapa ett uppdateringsmedium, \n eller ignorera media som inte har uppdateringar (med flaggan --distrib)\n"
+msgstr ""
+" --update - skapa ett uppdateringsmedium, \n"
+" eller ignorera media som inte har uppdateringar (med "
+"flaggan --distrib)\n"
#: ../urpmi.addmedia:68
#, c-format
msgid ""
" --xml-info - use the specific policy for downloading xml info files\n"
-" one of: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
-msgstr " --xml-info - använd specifik policy för hämtning av xml info-filer\n en av: never, on-demand, update-only, always. se urpmi.cfg(5)\n"
+" one of: never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
+msgstr ""
+" --xml-info - använd specifik policy för hämtning av xml info-filer\n"
+" en av: never, on-demand, update-only, always. se urpmi."
+"cfg(5)\n"
#: ../urpmi.addmedia:70
#, c-format
@@ -2522,7 +2710,9 @@ msgstr " --no-probe - försök ej hitta någon synthesis-fil.\n"
msgid ""
" --distrib - automatically create all media from an installation\n"
" medium.\n"
-msgstr " --distrib - skapa automatiskt all media från ett\n installationsmedia.\n"
+msgstr ""
+" --distrib - skapa automatiskt all media från ett\n"
+" installationsmedia.\n"
#: ../urpmi.addmedia:76
#, c-format
@@ -2552,7 +2742,8 @@ msgstr " --nopubkey - importera inte pubkey för adderat media\n"
#: ../urpmi.addmedia:81
#, c-format
msgid " --raw - add the media in config, but don't update it.\n"
-msgstr " --raw - lägg till mediat i config, men uppdatera inte det.\n"
+msgstr ""
+" --raw - lägg till mediat i config, men uppdatera inte det.\n"
#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
#, c-format
@@ -2604,7 +2795,9 @@ msgstr "behöver inte ange <relativ sökväg till synthesis> med --distrib"
msgid ""
"\n"
"Do you want to add media '%s'?"
-msgstr "\nVill du lägga till källa '%s'"
+msgstr ""
+"\n"
+"Vill du lägga till källa '%s'"
#: ../urpmi.addmedia:156 ../urpmi.addmedia:181
#, c-format
@@ -2626,7 +2819,9 @@ msgstr "Kan inte använda %s med fjärr-media"
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
-msgstr "användning: urpmi.removemedia (-a | <namn>...)\ndär <namn> är medianamnet som ska tas bort.\n"
+msgstr ""
+"användning: urpmi.removemedia (-a | <namn>...)\n"
+"där <namn> är medianamnet som ska tas bort.\n"
#: ../urpmi.removemedia:41
#, c-format
@@ -2653,14 +2848,18 @@ msgstr "inget att ta bort (använd urpmi.addmedia för att lägga till media)\n"
msgid ""
"the entry to remove is missing\n"
"(one of %s)\n"
-msgstr "objektet som ska tas bort saknas\n(en av %s)\n"
+msgstr ""
+"objektet som ska tas bort saknas\n"
+"(en av %s)\n"
#: ../urpmi.update:30
#, c-format
msgid ""
"usage: urpmi.update [options] <name> ...\n"
"where <name> is a medium name to update.\n"
-msgstr "användning: urpmi.update [flaggor] <namn>...\ndär <namn> är medianamnet som ska uppdateras.\n"
+msgstr ""
+"användning: urpmi.update [flaggor] <namn>...\n"
+"där <namn> är medianamnet som ska uppdateras.\n"
#: ../urpmi.update:43
#, c-format
@@ -2717,7 +2916,9 @@ msgstr "inget att uppdatera (använd urpmi.addmedia för att lägga till media)\
msgid ""
"the entry to update is missing\n"
"(one of %s)\n"
-msgstr "objektet som ska uppdateras saknas\n(en av %s)\n"
+msgstr ""
+"objektet som ska uppdateras saknas\n"
+"(en av %s)\n"
#: ../urpmi.update:98
#, c-format
@@ -2737,9 +2938,11 @@ msgstr "aktiverar media %s"
#: ../urpmq:44
#, c-format
msgid ""
-" --searchmedia - use only the given media to search requested (or updated)"
-" packages.\n"
-msgstr " --searchmedia - använd endast givet media för att söka efter valda (eller uppdaterade) paket.\n"
+" --searchmedia - use only the given media to search requested (or updated) "
+"packages.\n"
+msgstr ""
+" --searchmedia - använd endast givet media för att söka efter valda (eller "
+"uppdaterade) paket.\n"
#: ../urpmq:49
#, c-format
@@ -2751,7 +2954,10 @@ msgstr " --auto-orphans - lista obehövliga paket\n"
msgid ""
" --not-available\n"
" - list installed packages not available on any media.\n"
-msgstr " --not-available\n - lista installerade paket som inte finns tillgängligt på något media.\n"
+msgstr ""
+" --not-available\n"
+" - lista installerade paket som inte finns tillgängligt på "
+"något media.\n"
#: ../urpmq:53
#, c-format
@@ -2776,7 +2982,8 @@ msgstr " --list-url - lista tillgänglig media och dess sökväg.\n"
#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
-msgstr " --list-nodes - visa tillgängliga noder vid användning av --parallel.\n"
+msgstr ""
+" --list-nodes - visa tillgängliga noder vid användning av --parallel.\n"
#: ../urpmq:60
#, c-format
@@ -2785,8 +2992,10 @@ msgstr " --list-aliases - lista tillgängliga parallellalias.\n"
#: ../urpmq:61
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
-msgstr " --dump-config - dumpa konfigurationen i form av urpmi.addmedia argument.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+" --dump-config - dumpa konfigurationen i form av urpmi.addmedia argument.\n"
#: ../urpmq:62
#, c-format
@@ -2801,14 +3010,19 @@ msgstr "--sources - skriv käll-URL:er av valda paket\n"
#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
-msgstr " --ignorearch - tillåt sökande för rpm-paket som inte motsvarar arkitekturen.\n"
+msgstr ""
+" --ignorearch - tillåt sökande för rpm-paket som inte motsvarar "
+"arkitekturen.\n"
#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
-msgstr " --use-distrib - konfigurera urpmi 'on the fly' från ett distributionsträd.\n Detta tillåter kontroll av distribution.\n"
+msgstr ""
+" --use-distrib - konfigurera urpmi 'on the fly' från ett "
+"distributionsträd.\n"
+" Detta tillåter kontroll av distribution.\n"
#: ../urpmq:79
#, c-format
@@ -2836,9 +3050,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - visa krav\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - visa förslag\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - visa krav\n"
#: ../urpmq:85
#, c-format
@@ -2855,7 +3069,9 @@ msgstr " --summary, -S - skriv ut summering.\n"
msgid ""
" --requires-recursive, -d\n"
" - query package dependencies.\n"
-msgstr " --requires-recursive, -d\n - utöka förfrågning till att omfatta paketberoenden.\n"
+msgstr ""
+" --requires-recursive, -d\n"
+" - utöka förfrågning till att omfatta paketberoenden.\n"
#: ../urpmq:90
#, c-format
@@ -2867,19 +3083,24 @@ msgstr " --whatrequires - omvänd sökning för vad som krävs av paket.\n"
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
-msgstr " --whatrequires-recursive\n - utökad omvänd sökning (inkluderar virtuella paket).\n"
+msgstr ""
+" --whatrequires-recursive\n"
+" - utökad omvänd sökning (inkluderar virtuella paket).\n"
#: ../urpmq:93
#, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
-msgstr " --whatprovides, -p\n - sök i \"provides\" för att hitta paket.\n"
+msgstr ""
+" --whatprovides, -p\n"
+" - sök i \"provides\" för att hitta paket.\n"
#: ../urpmq:96
#, c-format
msgid " -c - complete output with package to be removed.\n"
-msgstr " -c - fullständig utmatning med paketet som ska tas bort.\n"
+msgstr ""
+" -c - fullständig utmatning med paketet som ska tas bort.\n"
#: ../urpmq:98
#, c-format
@@ -2889,7 +3110,9 @@ msgstr " -g - visa grupper med namn.\n"
#: ../urpmq:99
#, c-format
msgid " -i - print useful information in human readable form.\n"
-msgstr " -i - visa användbar information i en för människan läsbar form.\n"
+msgstr ""
+" -i - visa användbar information i en för människan läsbar "
+"form.\n"
#: ../urpmq:100
#, c-format
@@ -2916,7 +3139,8 @@ msgstr " -s - nästa paket är ett källpaket (samma som --src).\n"
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
-msgstr " -u - ta bort paket om en nyare version redan är installerad.\n"
+msgstr ""
+" -u - ta bort paket om en nyare version redan är installerad.\n"
#: ../urpmq:105
#, c-format
@@ -2926,7 +3150,9 @@ msgstr " -y - kräv luddig sökning (samma som --fuzzy).\n"
#: ../urpmq:106
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
-msgstr " -Y - som -y, fast tvingar matchning av stora och små bokstäver.\n"
+msgstr ""
+" -Y - som -y, fast tvingar matchning av stora och små "
+"bokstäver.\n"
#: ../urpmq:107
#, c-format
@@ -2951,22 +3177,28 @@ msgstr "använd -l för att lista filer"
#: ../urpmq:415
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
-msgstr "ingen xml-info för media \"%s\", endast ofullständigt resultat för paketet %s"
+msgstr ""
+"ingen xml-info för media \"%s\", endast ofullständigt resultat för paketet %s"
#: ../urpmq:416
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
-msgstr "ingen xml-info för media \"%s\", endast ofullständigt resultat för paketen %s"
+msgstr ""
+"ingen xml-info för media \"%s\", endast ofullständigt resultat för paketen %s"
#: ../urpmq:419
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "ingen xml-info för media \"%s\", kan inte returnera resultat för paketet %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
+msgstr ""
+"ingen xml-info för media \"%s\", kan inte returnera resultat för paketet %s"
#: ../urpmq:420
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
-msgstr "ingen xml-info för media \"%s\", kan inte returnera resultat för paketen %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"ingen xml-info för media \"%s\", kan inte returnera resultat för paketen %s"
#: ../urpmq:487
#, c-format
@@ -2988,3 +3220,12 @@ msgstr "Kör Mageias paketinstallerare"
#: ../polkit/org.mageia.gurpmi2.policy.in.h:2
msgid "Authentication is required to run Mageia Package Installer"
msgstr "Autentisering krävs för att köra Mageias paketinstallerare"
+
+#~ msgid "(suggested)"
+#~ msgstr "(föreslagen)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - suggests tag\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - visa förslag\n"
diff --git a/po/tg.po b/po/tg.po
index 7a45de33..6d630ed6 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-tg\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2005-09-17 16:34+0500\n"
"Last-Translator: Victor Ibragimov <youth_opportunities@tajikngo.org>\n"
"Language-Team: Tajik\n"
@@ -66,7 +66,7 @@ msgstr "Барномаи коромодаи `%s' (%s/%s) коргузорӣ ме
msgid "Downloading package `%s'..."
msgstr "Фаровири қуттии `%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Бекор кардан"
@@ -78,22 +78,22 @@ msgstr "Бекор кардан"
msgid "...retrieving failed: %s"
msgstr "...барқароркунӣ нагузашт: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "Коргузориши RPM"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Ок"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, fuzzy, c-format
msgid ""
"You have selected a source package:\n"
@@ -115,7 +115,7 @@ msgstr ""
"\n"
"Шумо чи кор кардан мехоҳед?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, fuzzy, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -131,7 +131,7 @@ msgstr ""
"\n"
"Шумо онро танҳо захира карда метавонед. Интихоби шумо чӣ гуна аст?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -147,26 +147,31 @@ msgstr ""
"\n"
"Шумо онро танҳо захира карда метавонед. Интихоби шумо чӣ гуна аст?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Коргузорӣ"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Нигоҳ доштан"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Бекор кардан"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Барои захиракунии файл ҷойгиршавиро интихоб кунед"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -255,17 +260,17 @@ msgstr ""
msgid "No packages specified"
msgstr "қуттии бо номи %s нест"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, fuzzy, c-format
msgid "Must be root"
msgstr "Даргоҳи муш"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Тайёркунии қуттиҳо барои коргузорӣ..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -274,7 +279,7 @@ msgstr ""
"Якчанд барномаҳои коромода коргузорӣ нахоҳанд шуд:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -284,42 +289,37 @@ msgstr ""
"Якчанд барномаҳои коромода коргузорӣ нахоҳанд шуд:\n"
"%s"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Огоҳӣ"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Афзоиш"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, fuzzy, c-format
msgid " (to install)"
msgstr "Коргузорӣ ба итмом расид"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Яке аз қуттиҳои зерин даркор аст:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Қатъ кардан"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -330,70 +330,70 @@ msgstr ""
"%s\n"
"Шумо розӣ ҳастед?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"Барои қаноатмандии тобеиятҳо бастаҳои зерин кор гузошта мешаванд (%d Мб)"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
"Барои қаноатмандии тобеиятҳо бастаҳои %d зерин кор гузошта мешаванд (%d МБ)"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "қуттиҳои сарчашмавӣ гирифтан номумкин, кандашавӣ"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Лутфан муҳити бо номи \"%s\" ба дастгоҳи [%s] дароред"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Шуд"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "Коргузорӣ нагузашт"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, fuzzy, c-format
msgid "You may want to update your urpmi database."
msgstr ""
@@ -401,22 +401,22 @@ msgstr ""
"%s\n"
"Мумкин шумо додаҳои urpmi-ро нав мекунед"
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Коргузорӣ нагузашт"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Ҳамааш аллакай кор гузошта шудааст"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Коргузориш шуд"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "urpmi бозоғоз шуда истодааст"
@@ -490,7 +490,7 @@ msgstr "Фаровири қуттии `%s'..."
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "барои %s давраи махсус истифода мегардад\n"
@@ -545,62 +545,62 @@ msgstr "хатогии ба қайдгирии қуттиҳои маҳаллӣ"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "дар сатри фармонӣ proxy нодуруст нишон дода шудааст\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: хондани файли rpm \"%s\" намешавад\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Имзо мавҷуд нест (%s)"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -617,7 +617,7 @@ msgstr ""
"\n"
"истифода:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr ""
@@ -664,7 +664,7 @@ msgstr "навиштани файли танзимдарории [%s] номум
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "навиштани файли танзимдарории [%s] номумкин"
@@ -1354,7 +1354,7 @@ msgstr "Ҷустуҷӯ"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -2031,9 +2031,8 @@ msgstr " --sourcerpm - тэг sourcerpm-ро чоп намоед: rpm-и а
#: ../urpmf:75
#, fuzzy, c-format
-msgid " --suggests - suggests tags\n"
-msgstr ""
-" --obsoletes - тэг obsoletes-ро чоп намоед: ҳамаи файлҳои кӯҳнашуда.\n"
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - тэг requires-ро чоп намоед: ҳамаи вобастагиҳоро.\n"
#: ../urpmf:76
#, fuzzy, c-format
@@ -2061,27 +2060,27 @@ msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - тафсир, релиз ва архитектураро бо номҳояшон чоп намоед.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "файли hdlist барои муҳити \"%s\" ёфт нашуд"
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "файли сунъии офаридаи hdlist барои муҳити \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "навиштани файли рӯйхат барои миёнаи \"%s\""
@@ -2110,7 +2109,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr ""
" --obsoletes - тэг obsoletes-ро чоп намоед: ҳамаи файлҳои кӯҳнашуда.\n"
@@ -2224,7 +2223,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr ""
" --obsoletes - тэг obsoletes-ро чоп намоед: ҳамаи файлҳои кӯҳнашуда.\n"
@@ -3051,9 +3050,8 @@ msgstr " --requires - тэг requires-ро чоп намоед: ҳамаи
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
-msgstr ""
-" --obsoletes - тэг obsoletes-ро чоп намоед: ҳамаи файлҳои кӯҳнашуда.\n"
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - тэг requires-ро чоп намоед: ҳамаи вобастагиҳоро.\n"
#: ../urpmq:85
#, fuzzy, c-format
@@ -3225,6 +3223,16 @@ msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
#, fuzzy
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr ""
+#~ " --obsoletes - тэг obsoletes-ро чоп намоед: ҳамаи файлҳои кӯҳнашуда.\n"
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr ""
+#~ " --obsoletes - тэг obsoletes-ро чоп намоед: ҳамаи файлҳои кӯҳнашуда.\n"
+
+#, fuzzy
#~ msgid " --repackage - Re-package the files before erasing\n"
#~ msgstr ""
#~ " --packager - тэг packager-ро чоп намоед: қуттӣ тартибдиҳанда.\n"
diff --git a/po/th.po b/po/th.po
index 22807b23..11fd7d5e 100644
--- a/po/th.po
+++ b/po/th.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2002-11-25 13:52-0500\n"
"Last-Translator: Wachara Chinsettawong <wachara@yahoo.com>\n"
"Language-Team: Thai <th@li.org>\n"
@@ -62,7 +62,7 @@ msgstr ""
msgid "Downloading package `%s'..."
msgstr "กำลังติดตั้งแพ็คเก็จ %s"
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "ยกเลิก"
@@ -74,22 +74,22 @@ msgstr "ยกเลิก"
msgid "...retrieving failed: %s"
msgstr "การอ่านข้อมูลล้มเหลว: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, fuzzy, c-format
msgid "RPM installation"
msgstr "กำลังเตรียมการติดตั้ง"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Ok"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -102,7 +102,7 @@ msgid ""
"What would you like to do?"
msgstr ""
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, fuzzy, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -114,7 +114,7 @@ msgstr ""
"คุณจะต้องเป็นรูทในการติดตั้ง ความเป็นอิสระ :\n"
"%s\n"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -124,26 +124,31 @@ msgid ""
"You may prefer to just save it. What is your choice?"
msgstr ""
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_ติดตั้ง"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_บันทึก"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_ยกเลิก"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr ""
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "ตกลง"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -221,24 +226,24 @@ msgstr " --media - เลือกใช้เฉพาะมีเด
msgid "No packages specified"
msgstr "ไม่มีการกำหนดคำสั่ง"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, fuzzy, c-format
msgid "Must be root"
msgstr "พอร์ตของเม้าส์"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, fuzzy, c-format
msgid "Preparing packages installation..."
msgstr "การ install package"
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr "ไม่สามารถ install บางเพกเกจได้"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -246,42 +251,37 @@ msgid ""
"Continue installation anyway?"
msgstr "ไม่สามารถ install บางเพกเกจได้"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "คำเตือน"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "ตกลง"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr ""
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, fuzzy, c-format
msgid " (to install)"
msgstr "ออกจากการติดตั้ง"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "หนึ่งใน Packages ต่อไปนี้ต้องได้รับการติดตั้ง "
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, fuzzy, c-format
msgid "_Abort"
msgstr "เลิก"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -289,89 +289,89 @@ msgid ""
"Continue installation anyway?"
msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกลบ"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "เพื่อความถูกต้องของการเป็นอิสระระหว่างโปรแกรมแพ็คเกจบางตัวจะถูกลบทิ้ง(%d MB)"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "เพื่อความถูกต้องของการเป็นอิสระระหว่างโปรแกรมแพ็คเกจบางตัวจะถูกลบทิ้ง(%d MB)"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ไม่สามารถเรียก source package,กำลังยกเลิก"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "กรุณาใส่อุปกรณ์ที่มีชื่อ \"%s\" ใน [%s]"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, fuzzy, c-format
msgid "_Done"
msgstr "ทำเรียบร้อยแล้ว"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "การติดตั้งไม่สำเร็จ"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, fuzzy, c-format
msgid "You may want to update your urpmi database."
msgstr ""
"การติดตั้งล้มเหลวมีบางไฟล์ที่ขาดหายไป\n"
"ขอแนะนำให้ทำการอัพเดตฐานข้อมูล urpmi"
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "การติดตั้งไม่สำเร็จ"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "install เสร็จเรียบร้อย"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, fuzzy, c-format
msgid "restarting urpmi"
msgstr "กำลังติดตั้ง $rpm\n"
@@ -443,7 +443,7 @@ msgstr "กำลังติดตั้งแพ็คเก็จ %s"
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
@@ -498,62 +498,62 @@ msgstr "ลงทะเบียน local package มีข้อผิดพล
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "การแจ้งพร็อกซี่ที่ไม่ดี\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq:ไม่สามารถอ่าน rpm file \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "ข้อมูลบางตัวยังไม่ได้ใส่ลงไป"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -569,7 +569,7 @@ msgstr ""
"\n"
"วิธีใช้:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr ""
@@ -616,7 +616,7 @@ msgstr "ไม่สามารถเขียน config file [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "ไม่สามารถเขียน config file [%s]"
@@ -1300,7 +1300,7 @@ msgstr "ค้นหา"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -1939,8 +1939,8 @@ msgstr " --group - พิมพ์ tag group: group."
#: ../urpmf:75
#, fuzzy, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --obsoletes -พิมพ์ tag ไม่ใช้แล้ว:ใช้ไม่ได้ทั้งหมด(หลายบรรทัด)."
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - พิมพ์ tag ที่ต้องการ:ที่ต้องการทั้งหมด(หลายบรรทัด)."
#: ../urpmf:76
#, fuzzy, c-format
@@ -1967,27 +1967,27 @@ msgstr " --list - แสดงรายชื่อแพ็คเก
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - เวอร์ชั่นที่พิมพ์, รีลีสและ arch พร้อมชื่อ.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "ไม่พบ hdlist file สำหรับอุปกรณ์\"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "สร้าง hdlist synthesis file สำหรับ อุปกรณ์ \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "กำลังเขียน list file สำหรับอุปกรณ์\"%s\""
@@ -2014,7 +2014,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --obsoletes -พิมพ์ tag ไม่ใช้แล้ว:ใช้ไม่ได้ทั้งหมด(หลายบรรทัด)."
#: ../urpmi:81
@@ -2107,7 +2107,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --obsoletes -พิมพ์ tag ไม่ใช้แล้ว:ใช้ไม่ได้ทั้งหมด(หลายบรรทัด)."
#: ../urpmi:109
@@ -2868,8 +2868,8 @@ msgstr " --requires - พิมพ์ tag ที่ต้องการ:
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --obsoletes -พิมพ์ tag ไม่ใช้แล้ว:ใช้ไม่ได้ทั้งหมด(หลายบรรทัด)."
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - พิมพ์ tag ที่ต้องการ:ที่ต้องการทั้งหมด(หลายบรรทัด)."
#: ../urpmq:85
#, fuzzy, c-format
@@ -3024,6 +3024,14 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#, fuzzy
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --obsoletes -พิมพ์ tag ไม่ใช้แล้ว:ใช้ไม่ได้ทั้งหมด(หลายบรรทัด)."
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --obsoletes -พิมพ์ tag ไม่ใช้แล้ว:ใช้ไม่ได้ทั้งหมด(หลายบรรทัด)."
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(แพ็คเก็จ %d ชุด, %d MB)"
diff --git a/po/tl.po b/po/tl.po
index 2ad3d280..8c96ce97 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-tl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2005-03-08 20:24+0800\n"
"Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
"Language-Team: Filipino <salinpinoy@comitus.net>\n"
@@ -58,7 +58,7 @@ msgstr "Ini-install ang package na `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Dina-download ang package na `%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "I-cancel"
@@ -70,22 +70,22 @@ msgstr "I-cancel"
msgid "...retrieving failed: %s"
msgstr "...pagkukuha muli nabigo: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Pag-install ng RPM"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Ok"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, fuzzy, c-format
msgid ""
"You have selected a source package:\n"
@@ -109,7 +109,7 @@ msgstr ""
"\n"
"Ano ang gusto mong gawin?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, fuzzy, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -124,7 +124,7 @@ msgstr ""
"\n"
"Pwede mong naising i-save na lang ito. Ano ang pili mo?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -139,26 +139,31 @@ msgstr ""
"\n"
"Pwede mong naising i-save na lang ito. Ano ang pili mo?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, fuzzy, c-format
msgid "_Install"
msgstr "I-install"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, fuzzy, c-format
msgid "_Save"
msgstr "Save"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Cancel"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Piliin ang lugar kung saan ise-save ang file"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Ayos"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -248,17 +253,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Walang command na nabanggit"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, fuzzy, c-format
msgid "Must be root"
msgstr "Kailangan na kayo ay root"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Hinahanda ang pag-i-install ng mga package..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -267,7 +272,7 @@ msgstr ""
"Ilang package na hiniling ay hindi ma-install:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -277,42 +282,37 @@ msgstr ""
"Ilang package na hiniling ay hindi ma-install:\n"
"%s"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Babala"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Ayos"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr " (i-upgrade)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, fuzzy, c-format
msgid " (to install)"
msgstr " (i-install)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Isa sa mga sumusunod na package ay kailangan:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, fuzzy, c-format
msgid "_Abort"
msgstr "_Abort"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -323,29 +323,29 @@ msgstr ""
"%s\n"
"Magpatuloy?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
@@ -353,7 +353,7 @@ msgstr ""
"Para ma-satisfy ang dependency/pagkaka-asa-asa, ang mga sumusunod na %d "
"package ay ii-install (%d MB)"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -361,34 +361,34 @@ msgstr ""
"Para ma-satisfy ang dependency/pagkaka-asa-asa, ang mga sumusunod na %d "
"package ay ii-install (%d MB)"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "hindi makuha ang mga source package, hindi tumutuloy"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Pakisuksok ang medium na may pangalang \"%s\" sa device na [%s]"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, fuzzy, c-format
msgid "_Done"
msgstr "Tapos"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "Pag-i-install ay nabigo"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, fuzzy, c-format
msgid "You may want to update your urpmi database."
msgstr ""
@@ -396,22 +396,22 @@ msgstr ""
"%s\n"
"Baka gusto mong i-update ang iyong urpmi database"
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Pag-i-install ay nabigo"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Lahat ay naka-install na"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Natapos na ang pag-install"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "sinisimulan muli ang urpmi"
@@ -487,7 +487,7 @@ msgstr "Dina-download ang package na `%s'..."
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "ginagamit ang specific environment sa %s\n"
@@ -542,62 +542,62 @@ msgstr "error sa pagrerehistro ng mga local package"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "masamang pagdeklara ng proxy sa command line\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: hindi mabasa ang rpm file na \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Nawawalang signature (%s)"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -614,7 +614,7 @@ msgstr ""
"\n"
"paggamit:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr ""
@@ -661,7 +661,7 @@ msgstr "hindi maisulat ang config file [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "hindi maisulat ang config file [%s]"
@@ -1351,7 +1351,7 @@ msgstr "Maghanap"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -2032,8 +2032,8 @@ msgstr " --sourcerpm - i-print ang tag sourcerpm: source rpm.\n"
#: ../urpmf:75
#, fuzzy, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --obsoletes - i-print ang tag obsoletes: lahat ng pinapalaos.\n"
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - i-print ang tag requires: lahat ng kinakailangan.\n"
#: ../urpmf:76
#, fuzzy, c-format
@@ -2063,27 +2063,27 @@ msgstr ""
"arkitektura\n"
" kasama ang pangalan.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "walang nahanap na hdlist file para sa medium na \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "nakabuo ng hdlist synthesis file para sa medium na \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "isinusulat ang list file para sa medium na \"%s\""
@@ -2112,7 +2112,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --obsoletes - i-print ang tag obsoletes: lahat ng pinapalaos.\n"
#: ../urpmi:81
@@ -2216,7 +2216,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --obsoletes - i-print ang tag obsoletes: lahat ng pinapalaos.\n"
#: ../urpmi:109
@@ -3050,8 +3050,8 @@ msgstr " --requires - i-print ang tag requires: lahat ng kinakailangan.\n"
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --obsoletes - i-print ang tag obsoletes: lahat ng pinapalaos.\n"
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - i-print ang tag requires: lahat ng kinakailangan.\n"
#: ../urpmq:85
#, fuzzy, c-format
@@ -3231,6 +3231,16 @@ msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
#, fuzzy
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr ""
+#~ " --obsoletes - i-print ang tag obsoletes: lahat ng pinapalaos.\n"
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr ""
+#~ " --obsoletes - i-print ang tag obsoletes: lahat ng pinapalaos.\n"
+
+#, fuzzy
#~ msgid " --repackage - Re-package the files before erasing\n"
#~ msgstr " --packager - i-print ang tag packager: taga-package.\n"
diff --git a/po/tr.po b/po/tr.po
index 22db58fd..9420a3ef 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -15,7 +15,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2014-05-12 23:57+0300\n"
"Last-Translator: Atilla ÖNTAŞ <tarakbumba@gmail.com>\n"
"Language-Team: Mageia Turkish Translation Team <i18n-tr@ml.mageia.org>\n"
@@ -66,7 +66,7 @@ msgstr "'%s' paketi kuruluyor ( %s/%s )..."
msgid "Downloading package `%s'..."
msgstr "'%s' paketi indiriliyor..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "İptal"
@@ -78,22 +78,22 @@ msgstr "İptal"
msgid "...retrieving failed: %s"
msgstr "...getirme başarısız: [%s]"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "RPM Paketi Kurulumu"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Hata: %s bulunamadı, işlem iptal edilecek"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Tamam"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -114,7 +114,7 @@ msgstr ""
"\n"
"Ne yapmak istersiniz?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -129,7 +129,7 @@ msgstr ""
"\n"
"Devam edilsin mi?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -144,26 +144,31 @@ msgstr ""
"\n"
"Bunu sadece kaydetmeyi de seçebilirsiniz. Seçiminiz nedir?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Kur"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Kaydet"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "İp_tal"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Dosyayı kaydetmek için bir yer seçin"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Tamam"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -250,17 +255,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Herhangi bir paket belirtilmemiş."
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Yetkili kullanıcı olunmalı"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Paket kurulumuna hazırlanılıyor..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -269,7 +274,7 @@ msgstr ""
"İstenen bazı paketler kurulamaz:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -280,42 +285,37 @@ msgstr ""
"%s\n"
"Yine de kuruluma devam edilsin mi?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Uyarı"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Tamam"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (güncellenecek)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (yüklenecek)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Paket seçimi"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Aşağıdaki paketlerden birine ihtiyaç var:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "D_urdur"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -327,63 +327,63 @@ msgstr ""
"%s\n"
"Yine de devam edilsin mi?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Diskin %s kadarı kullanılacak."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "Diskin %s kadarı boşalacak."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "Paketler için %s alınacak"
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Bir paketin kurulumuna devam edilsin mi?"
msgstr[1] "%d Paketlerinin kurulumuna devam edilsin mi?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"Bağımlılık sorununu aşabilmek için, aşağıdaki paketin kurulması gerekiyor:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
"Bağımlılık sorununu aşabilmek için, aşağıdaki paketlerin kurulması gerekiyor:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "kaynak paketleri alınamadı, çıkılıyor"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Lütfen \"%s\" isimli ortamı yerleştirin"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr "Bir hata oluştu:"
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Bitti"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -392,27 +392,27 @@ msgstr ""
"Kurulum başarısız oldu. Bazı dosyalar kayıp:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Urpmi veritabanınızı güncellemek isteyebilirsiniz."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Kurulum başarısız oldu"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Herşey zaten kurulu"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Kurulum tamamlandı"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "urpmi yeniden başlatılıyor."
@@ -486,7 +486,7 @@ msgstr "Paketler %s içine indirilemiyor"
msgid "Environment directory %s does not exist"
msgstr "Ortam değişkenleri dizini %s mevcut değil."
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "%s' de belirtilen ortam kullanılıyor\n"
@@ -541,64 +541,64 @@ msgstr "yerel paketlerin sicil kaydı yapılırken hata"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Sınırlı kipte çalışılırken bu işlem yasaklanmıştır."
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "komut satırından kötü vekil sunucu bildirimi\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: \"%s\" rpm dosyası okunamıyor\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "beklenmeyen ifade %s"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "%s 'den önce kayıp ifade"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "beklenmeyen ifade %s (öneri: -a or -o kullanın ?)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "kapatmak için ifade yok"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"varsayılan olarak upmf bir regexp bekler. \"--literal\" seçeneğini "
"kullanmalısınız."
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot dizini geçerli değil"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "%s, %s olmadan kullanılamaz"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "%s, %s ile kullanılamaz"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "Çok fazla parametre\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -614,7 +614,7 @@ msgstr ""
"\n"
"kullanımı:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Copyright (C) %s bir %s ürünüdür"
@@ -663,7 +663,7 @@ msgstr "yapılandırma dosyasına [%s] yazılamıyor"
msgid "medium `%s' is defined twice, aborting"
msgstr "`%s' ortamı ikinci defa tanımlandı, iptal ediliyor"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "yapılandırma dosyasına [%s] yazılamıyor"
@@ -1354,8 +1354,8 @@ msgstr "Mimari"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(önerilen)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -2041,9 +2041,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - kaynak rpm adı\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - önerilenler etiket\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - gereklilikler etiketi\n"
#: ../urpmf:76
#, c-format
@@ -2070,27 +2070,27 @@ msgstr " -m - paketin bulunduğu kurulum kaynağı.\n"
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - sürüm, yayımı ve mimarisini yazdırır.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "sonlandırılmamış ifade (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Geçeresiz biçim: sadece multi-valued etiket kullanılabilir"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "\"%s\" ortamı için hdlist mevcut değil."
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "\"%s\" ortamı için sentez mevcut değil."
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "\"%s\" ortamı için xml-info mevcut değil."
@@ -2118,8 +2118,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - gereksiz paketleri sormadan kaldır\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --no-suggests - \"önerilen\" pkaetleri otomatikman seçme.\n"
#: ../urpmi:81
@@ -2217,8 +2217,8 @@ msgstr ""
" sormadan kuruluma izin verir.\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --allow-suggests - \"önerilen\" paketleri otomatik seç.\n"
#: ../urpmi:109
@@ -3073,9 +3073,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - gereklilikleri yazdırır.\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - önerilenleri yazdır.\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - gereklilikleri yazdırır.\n"
#: ../urpmq:85
#, c-format
@@ -3247,6 +3247,15 @@ msgstr "Mageia Paket Kurulum Aracını Çalıştır"
msgid "Authentication is required to run Mageia Package Installer"
msgstr "Mageia Paket Kurulum Aracını çalıştırmak için yetkilendirme gerekli"
+#~ msgid "(suggested)"
+#~ msgstr "(önerilen)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - önerilenler etiket\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - önerilenleri yazdır.\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d paket, %d MB)"
diff --git a/po/uk.po b/po/uk.po
index afc71007..740f2ad2 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2014-05-12 21:39+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <translation@linux.org.ua>\n"
@@ -64,7 +64,7 @@ msgstr "Встановлюємо пакунок «%s» (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Звантажуємо пакунок «%s»…"
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Скасувати"
@@ -76,22 +76,22 @@ msgstr "Скасувати"
msgid "...retrieving failed: %s"
msgstr "…не вдалося отримати: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "Встановлення RPM"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Помилка: не вдалося знайти файл %s, дію припинено"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Гаразд"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -112,7 +112,7 @@ msgstr ""
"\n"
"Що Ви хочете зробити?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -127,7 +127,7 @@ msgstr ""
"\n"
"Можливо, ви хочете просто зберегти його. Яким буде ваш вибір?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -142,26 +142,31 @@ msgstr ""
"\n"
"Можливо, ви хочете просто зберегти його. Яким буде ваш вибір?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Встановити"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "З_берегти"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Скасувати"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Виберіть місце для збереження файла"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Гаразд"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -248,17 +253,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Не вибрано пакунків"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Потрібно бути root"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Підготовлюються пакунки до встановлення..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -267,7 +272,7 @@ msgstr ""
"Деякі із замовлених пакунків неможливо встановити:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -278,42 +283,37 @@ msgstr ""
"%s\n"
"Продовжувати встановлення?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Попередження"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Гаразд"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (поновити)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (встановити)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Вибір пакунків"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Потрібен один із наступних пакунків:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Перервати"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -324,22 +324,22 @@ msgstr ""
"%s\n"
"Продовжувати встановлення?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Буде використано %s додаткового місця на диску."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "Буде звільнено %s місця на диску."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "Буде отримано %s пакунків."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -347,39 +347,39 @@ msgstr[0] "Продовжити встановлення %d пакунка?"
msgstr[1] "Продовжити встановлення %d пакунків?"
msgstr[2] "Продовжити встановлення %d пакунків?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Наступний пакунок буде встановлено для задоволення залежностей:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Наступні пакунки буде встановлено для задоволення залежностей:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "неможливо одержати початкові пакунки, завершується"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Вставте, будь ласка, носій з назвою «%s»"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr "Трапилася помилка:"
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "Виконано"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -388,27 +388,27 @@ msgstr ""
"Встановлення зазнало невдачі, немає файлів:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "Можливо, вам варто оновити вашу базу даних urpmi."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Невдала спроба встановлення:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Все вже встановлено"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Встановлення завершено"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "перезапуск urpmi"
@@ -483,7 +483,7 @@ msgstr "Не вдалося звантажити пакунки до %s"
msgid "Environment directory %s does not exist"
msgstr "Каталогу середовища %s не існує"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "використовується особливе оточення на %s\n"
@@ -538,64 +538,64 @@ msgstr "помилка реєстрації пакунків"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Цю дію заборонено до виконання в обмеженому режимі"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "неправильне оголошення проксі в командному рядку\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: неможливо прочитати rpm-файл \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "неочікуваний вираз %s"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "перед %s немає виразу"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "неочікуваний вираз %s (можливо, слід було вказати -a або -o ?)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "відсутній вираз, який слід закрити"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"типово urpmf очікує на формальний вираз. Вам слід скористатися параметром «--"
"literal»"
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "каталогу chroot не існує"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "Не можна використовувати %s без %s"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "Не можна використовувати %s разом з %s"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "Забагато аргументів\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -611,7 +611,7 @@ msgstr ""
"\n"
"використання:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "© %s, %s"
@@ -662,7 +662,7 @@ msgstr "неможливо прочитати файл налаштувань [%
msgid "medium `%s' is defined twice, aborting"
msgstr "носій «%s» вказано двічі, аварійне завершення"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "неможливо записати конфігураційний файл [%s]"
@@ -1068,8 +1068,8 @@ msgstr "пропускаємо носій з невільними програм
#, c-format
msgid "un-ignoring non-free medium `%s' b/c nonfree packages are installed"
msgstr ""
-"скасовуємо ігнорування невільного джерела пакунків «%s», оскільки встановлено "
-"невільні пакунки"
+"скасовуємо ігнорування невільного джерела пакунків «%s», оскільки "
+"встановлено невільні пакунки"
#: ../urpm/media.pm:799
#, c-format
@@ -1362,8 +1362,8 @@ msgstr "Арх."
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(пропонується)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -2072,9 +2072,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - назва джерельного rpm\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - мітки пропозицій (suggests)\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - мітки залежностей (requires)\n"
#: ../urpmf:76
#, c-format
@@ -2101,27 +2101,27 @@ msgstr " -m - носій, на якому було знайдено
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - вивести версію, випуск і архів з назвою.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "незавершений вираз (%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Неправильний формат: можна використовувати лише багатозначні мітки"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "немає файла hdlist для носія «%s»"
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "немає файла synthesis для носія «%s»"
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "немає файла xml-info для носія «%s»"
@@ -2147,8 +2147,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - вилучити «осиротілі» у автоматичному режимі\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --no-suggests - не вибирати автоматично «запропоновані» пакунки.\n"
#: ../urpmi:81
@@ -2252,8 +2252,8 @@ msgstr ""
"перевірки залежностей і цілісності.\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --allow-suggests - автоматично вибирати «пропоновані» пакунки.\n"
#: ../urpmi:109
@@ -3105,9 +3105,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - вивести список залежностей.\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - вивести пропозиції.\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - вивести список залежностей.\n"
#: ../urpmq:85
#, c-format
@@ -3281,6 +3281,15 @@ msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
"Щоб запустити засіб встановлення пакунків Mageia, слід пройти розпізнавання"
+#~ msgid "(suggested)"
+#~ msgstr "(пропонується)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - мітки пропозицій (suggests)\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - вивести пропозиції.\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d пакунок, %d Мб)"
diff --git a/po/urpmi.pot b/po/urpmi.pot
index 7514887a..b3f7215f 100644
--- a/po/urpmi.pot
+++ b/po/urpmi.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,7 +55,7 @@ msgstr ""
msgid "Downloading package `%s'..."
msgstr ""
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr ""
@@ -65,22 +65,22 @@ msgstr ""
msgid "...retrieving failed: %s"
msgstr ""
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr ""
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr ""
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -92,7 +92,7 @@ msgid ""
"What would you like to do?"
msgstr ""
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -102,7 +102,7 @@ msgid ""
"Proceed?"
msgstr ""
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -112,26 +112,31 @@ msgid ""
"You may prefer to just save it. What is your choice?"
msgstr ""
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr ""
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr ""
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr ""
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr ""
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr ""
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -199,24 +204,24 @@ msgstr ""
msgid "No packages specified"
msgstr ""
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr ""
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr ""
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr ""
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -224,42 +229,37 @@ msgid ""
"Continue installation anyway?"
msgstr ""
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr ""
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr ""
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr ""
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr ""
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr ""
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr ""
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -267,86 +267,86 @@ msgid ""
"Continue installation anyway?"
msgstr ""
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid "To satisfy dependencies, the following package is going to be installed:"
msgstr ""
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid "To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr ""
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr ""
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr ""
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr ""
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr ""
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr ""
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr ""
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr ""
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -418,7 +418,7 @@ msgstr ""
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
@@ -473,62 +473,62 @@ msgstr ""
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr ""
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr ""
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -538,7 +538,7 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr ""
@@ -583,7 +583,7 @@ msgstr ""
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr ""
@@ -1260,7 +1260,7 @@ msgstr ""
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -1897,7 +1897,7 @@ msgstr ""
#: ../urpmf:75
#, c-format
-msgid " --suggests - suggests tags\n"
+msgid " --recommends - recommends tags\n"
msgstr ""
#: ../urpmf:76
@@ -1925,27 +1925,27 @@ msgstr ""
msgid " -f - print version, release and arch with name.\n"
msgstr ""
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr ""
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr ""
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr ""
@@ -1972,7 +1972,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr ""
#: ../urpmi:81
@@ -2058,7 +2058,7 @@ msgstr ""
#: ../urpmi:105
#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr ""
#: ../urpmi:109
@@ -2786,7 +2786,7 @@ msgstr ""
#: ../urpmq:84
#, c-format
-msgid " --suggests - print suggests.\n"
+msgid " --recommends - print recommends.\n"
msgstr ""
#: ../urpmq:85
diff --git a/po/uz.po b/po/uz.po
index c9910b94..3d1c76af 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: uz\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2007-09-13 16:43+0200\n"
"Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
"Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -59,7 +59,7 @@ msgstr "\"%s\" (%s/%s) paketi o'rnatilmoqda..."
msgid "Downloading package `%s'..."
msgstr "\"%s\" paketi olinmoqda..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Bekor qilish"
@@ -71,22 +71,22 @@ msgstr "Bekor qilish"
msgid "...retrieving failed: %s"
msgstr "...olish muvaffaqiyatsiz tugadi: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "RPM o'rnatish"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Xato: %s fayli topilmadi, amal bekor qilinadi"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Ok"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -99,7 +99,7 @@ msgid ""
"What would you like to do?"
msgstr ""
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -114,7 +114,7 @@ msgstr ""
"\n"
"Davom etishni istaysizmi?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -129,26 +129,31 @@ msgstr ""
"\n"
"Ularni o'rnatmasdan kompyuterga saqlasa ham bo'ladi. Siz nimani istaysiz?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "O'r_natish"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Saqlash"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Bekor qilish"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Faylni qaerga saqlash joyini tanlang"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -231,17 +236,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Hech qanday paket ko'rsatilmagan"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "root bo'lish kerak"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Oʻrnatishga paketlar tayyorlanmoqda..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -250,7 +255,7 @@ msgstr ""
"Talab qilingan ba'zi bir paketlarni o'rnatib bo'lmaydi:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -261,42 +266,37 @@ msgstr ""
"%s\n"
"Bunga qaramasdan o'rnatishni davom ettirishni istaysizmi?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Diqqat"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (yangilash)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (o'rnatish)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Paket tanlovi"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Quyidagi paketlardan biri kerak:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "To'_xtatish"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -307,67 +307,67 @@ msgstr ""
"%s\n"
"O'rnatishni davom ettirishni istaysizmi?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Diskda qo'shimcha %s joy ishlatiladi."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "Diskda %s joy bo'shatiladi."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, fuzzy, c-format
msgid "%s of packages will be retrieved."
msgstr "Diskda %s joy bo'shatiladi."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "%d-ta paketni o'rnatish bilan davom etishni istaysizmi?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Bog'liqliklarni ta'minlash uchun quyidagi paket ham o'rnatiladi:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Bog'liqliklarni ta'minlash uchun quyidagi paketlar ham o'rnatiladi:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr ""
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Iltimos \"%s\" nomli to'plamni [%s] uskunasiga qo'ying"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Tayyor"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "O'rnatish muvaffaqiyatsiz tugadi:"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, fuzzy, c-format
msgid "You may want to update your urpmi database."
msgstr ""
@@ -375,22 +375,22 @@ msgstr ""
"%s\n"
"Balki urpmi ma'lumot bazasini yangilashingiz kerak."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "O'rnatish muvaffaqiyatsiz tugadi:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Hamma narsa allaqachon o'rnatilgan"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "O'rnatish tugadi"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "urpmi qaytadan ishga tushmoqda"
@@ -466,7 +466,7 @@ msgstr "\"%s\" paketi olinmoqda..."
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
@@ -521,62 +521,62 @@ msgstr ""
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: RPM-faylini (%s) o'qib bo'lmadi\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Imzo yetishmaydi (%s)"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot direktoriyasi mavjud emas"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "%s amalidan %s amalisiz foydalanib bo'lmaydi"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "%s amalidan %s amali bilan birga foydalanib bo'lmaydi"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -592,7 +592,7 @@ msgstr ""
"\n"
"Foydalanish:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Copyright (C) %s by %s"
@@ -639,7 +639,7 @@ msgstr "%s moslama faylini o'qib bo'lmadi"
msgid "medium `%s' is defined twice, aborting"
msgstr "\"%s\" to'plami ikki marta aniqlangan, amal bekor qilinadi"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "moslama faylini (%s) yozib bo'lmadi"
@@ -1333,8 +1333,8 @@ msgstr ""
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(taklif qilingan)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -1981,7 +1981,7 @@ msgstr ""
#: ../urpmf:75
#, c-format
-msgid " --suggests - suggests tags\n"
+msgid " --recommends - recommends tags\n"
msgstr ""
#: ../urpmf:76
@@ -2009,27 +2009,27 @@ msgstr " -m - paket qaysi to'plamda topilganini ko'rsatish\n"
msgid " -f - print version, release and arch with name.\n"
msgstr ""
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "to'plam uchun hech qanday hdlist fayli topilmadi: \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "to'plam uchun hdlist synthesis fayli yaratildi: \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "to'plam uchun ro'yxat fayli yozilmoqda: \"%s\""
@@ -2056,7 +2056,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr ""
#: ../urpmi:81
@@ -2145,7 +2145,7 @@ msgstr ""
#: ../urpmi:105
#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr ""
#: ../urpmi:109
@@ -2939,7 +2939,7 @@ msgstr " --verbose - ortiqcha xabarlar bilan.\n"
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
+msgid " --recommends - print recommends.\n"
msgstr " --verbose - ortiqcha xabarlar bilan.\n"
#: ../urpmq:85
@@ -3093,6 +3093,13 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#~ msgid "(suggested)"
+#~ msgstr "(taklif qilingan)"
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --verbose - ortiqcha xabarlar bilan.\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d-ta paket, %d Mb)"
diff --git a/po/uz@cyrillic.po b/po/uz@cyrillic.po
index 00bb4b92..761eb6e3 100644
--- a/po/uz@cyrillic.po
+++ b/po/uz@cyrillic.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: uz\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2007-09-13 16:43+0200\n"
"Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
"Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -59,7 +59,7 @@ msgstr "\"%s\" (%s/%s) пакети ўрнатилмоқда..."
msgid "Downloading package `%s'..."
msgstr "\"%s\" пакети олинмоқда..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Бекор қилиш"
@@ -71,22 +71,22 @@ msgstr "Бекор қилиш"
msgid "...retrieving failed: %s"
msgstr "...олиш муваффақиятсиз тугади: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "RPM ўрнатиш"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Хато: %s файли топилмади, амал бекор қилинади"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_Ок"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -99,7 +99,7 @@ msgid ""
"What would you like to do?"
msgstr ""
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -114,7 +114,7 @@ msgstr ""
"\n"
"Давом этишни истайсизми?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -129,26 +129,31 @@ msgstr ""
"\n"
"Уларни ўрнатмасдан компьютерга сақласа ҳам бўлади. Сиз нимани истайсиз?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "Ўр_натиш"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Сақлаш"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Бекор қилиш"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Файлни қаерга сақлаш жойини танланг"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "Ок"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -229,17 +234,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Ҳеч қандай пакет кўрсатилмаган"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "root бўлиш керак"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Ўрнатишга пакетлар тайёрланмоқда..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -248,7 +253,7 @@ msgstr ""
"Талаб қилинган баъзи бир пакетларни ўрнатиб бўлмайди:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -259,42 +264,37 @@ msgstr ""
"%s\n"
"Бунга қарамасдан ўрнатишни давом эттиришни истайсизми?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Диққат"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "Ок"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (янгилаш)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (ўрнатиш)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Пакет танлови"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Қуйидаги пакетлардан бири керак:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "Тў_хтатиш"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -305,67 +305,67 @@ msgstr ""
"%s\n"
"Ўрнатишни давом эттиришни истайсизми?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Дискда қўшимча %s жой ишлатилади."
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "Дискда %s жой бўшатилади."
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, fuzzy, c-format
msgid "%s of packages will be retrieved."
msgstr "Дискда %s жой бўшатилади."
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "%d-та пакетни ўрнатиш билан давом этишни истайсизми?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Боғлиқликларни таъминлаш учун қуйидаги пакет ҳам ўрнатилади:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Боғлиқликларни таъминлаш учун қуйидаги пакетлар ҳам ўрнатилади:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr ""
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Илтимос \"%s\" номли тўпламни [%s] ускунасига қўйинг"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Тайёр"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "Ўрнатиш муваффақиятсиз тугади:"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, fuzzy, c-format
msgid "You may want to update your urpmi database."
msgstr ""
@@ -373,22 +373,22 @@ msgstr ""
"%s\n"
"Балки urpmi маълумот базасини янгилашингиз керак."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "Ўрнатиш муваффақиятсиз тугади:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Ҳамма нарса аллақачон ўрнатилган"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Ўрнатиш тугади"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "urpmi қайтадан ишга тушмоқда"
@@ -464,7 +464,7 @@ msgstr "\"%s\" пакети олинмоқда..."
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
@@ -519,62 +519,62 @@ msgstr ""
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: RPM-файлини (%s) ўқиб бўлмади\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Имзо етишмайди (%s)"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot директорияси мавжуд эмас"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "%s амалидан %s амалисиз фойдаланиб бўлмайди"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "%s амалидан %s амали билан бирга фойдаланиб бўлмайди"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -590,7 +590,7 @@ msgstr ""
"\n"
"Фойдаланиш:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Copyright (C) %s by %s"
@@ -637,7 +637,7 @@ msgstr "%s мослама файлини ўқиб бўлмади"
msgid "medium `%s' is defined twice, aborting"
msgstr "\"%s\" тўплами икки марта аниқланган, амал бекор қилинади"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "мослама файлини (%s) ёзиб бўлмади"
@@ -1327,8 +1327,8 @@ msgstr ""
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(таклиф қилинган)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -1972,7 +1972,7 @@ msgstr ""
#: ../urpmf:75
#, c-format
-msgid " --suggests - suggests tags\n"
+msgid " --recommends - recommends tags\n"
msgstr ""
#: ../urpmf:76
@@ -2000,27 +2000,27 @@ msgstr " -m - пакет қайси тўпламда топилга
msgid " -f - print version, release and arch with name.\n"
msgstr ""
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "тўплам учун ҳеч қандай hdlist файли топилмади: \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "тўплам учун hdlist synthesis файли яратилди: \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "тўплам учун рўйхат файли ёзилмоқда: \"%s\""
@@ -2047,7 +2047,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr ""
#: ../urpmi:81
@@ -2136,7 +2136,7 @@ msgstr ""
#: ../urpmi:105
#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr ""
#: ../urpmi:109
@@ -2925,7 +2925,7 @@ msgstr " --verbose - ортиқча хабарлар билан.\n"
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
+msgid " --recommends - print recommends.\n"
msgstr " --verbose - ортиқча хабарлар билан.\n"
#: ../urpmq:85
@@ -3079,6 +3079,13 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#~ msgid "(suggested)"
+#~ msgstr "(таклиф қилинган)"
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --verbose - ортиқча хабарлар билан.\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d-та пакет, %d Мб)"
diff --git a/po/vi.po b/po/vi.po
index e6ab0299..fbe7412c 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-vi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2005-06-08 15:13+0700\n"
"Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -56,7 +56,7 @@ msgstr "Đang cài đặt gói `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Đang tải về gói `%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Bỏ qua"
@@ -68,22 +68,22 @@ msgstr "Bỏ qua"
msgid "...retrieving failed: %s"
msgstr "...không thu thập được: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "Cài đặt RPM"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "_OK"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -104,7 +104,7 @@ msgstr ""
"\n"
"Bạn muốn làm gì?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -119,7 +119,7 @@ msgstr ""
"\n"
"Thực hiện cài đặt?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -134,26 +134,31 @@ msgstr ""
"\n"
"Bạn có thể chỉ muốn lưu nó. Bạn chọn làm việc gì?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Cài đặt"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Lưu"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "Bỏ _qua"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Chọn nơi lưu tập tin"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "OK"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -236,17 +241,17 @@ msgstr ""
msgid "No packages specified"
msgstr "không có gói tin với tên %s"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Phải là root"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Đang chuẩn bị cài đặt các gói tin..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -255,7 +260,7 @@ msgstr ""
"Không thể cài đặt một số gói tin được yêu cầu:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -266,42 +271,37 @@ msgstr ""
"%s\n"
"Tiếp tục?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Cảnh báo"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "OK"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr "(để nâng cấp)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr "(để cài đặt)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "Cần một gói trong các gói tin sau đây:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "Hủy _bỏ"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -312,67 +312,67 @@ msgstr ""
"%s\n"
"Tiếp tục?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Để thỏa mãn phụ thuộc, gói tin sau đây sẽ được cài đặt (%d MB)"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Để thỏa mãn phụ thuộc, gói tin sau đây sẽ được cài đặt (%d MB)"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "không thể lấy các gói nguồn, hủy bỏ"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Hãy nạp phương tiện có tên \"%s\" trên thiết bị [%s]"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "H_oàn thành"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "Cài đặt không được"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, fuzzy, c-format
msgid "You may want to update your urpmi database."
msgstr ""
@@ -380,22 +380,22 @@ msgstr ""
"%s\n"
"Có thể bạn nên cập nhật cơ sở dữ liệu của urpmi."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Cài đặt không được"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "Mọi thứ đã được cài đặt rồi"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "Kết thúc cài đặt"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "khởi chạy lại urpmi"
@@ -469,7 +469,7 @@ msgstr "Đang tải về gói `%s'..."
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "đang dùng môi trường đặc hiệu trên %s\n"
@@ -524,62 +524,62 @@ msgstr "lỗi đăng ký các gói tin cục bộ"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "khai báo proxy sai trong dòng lệnh\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: không thể đọc tập tin rpm \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Thiếu chữ ký (%s)"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -596,7 +596,7 @@ msgstr ""
"\n"
"Cách dùng:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Bản quyền (C) %s %s"
@@ -643,7 +643,7 @@ msgstr "Không thể ghi tập tin cấu hình [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "Không thể ghi tập tin cấu hình [%s]"
@@ -1337,7 +1337,7 @@ msgstr "Tìm kiếm"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -1991,8 +1991,8 @@ msgstr " --sourcerpm - in ra tag sourcerpm: source rpm.\n"
#: ../urpmf:75
#, fuzzy, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --obsoletes - in ra các dòng tag: toàn bộ dòng.\n"
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - in ra yêu cầu tag: toàn bộ các yêu cầu.\n"
#: ../urpmf:76
#, fuzzy, c-format
@@ -2019,27 +2019,27 @@ msgstr " -l - liệt kê các tập tin trong gói tin.\n"
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - in phiên bản, phát hành và arch với tên.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr ""
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "không tìm thấy tập tin hdlist cho phương tiện \"%s\""
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "build tập tin tổng hợp hdlist cho phương tiện \"%s\""
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "đang ghi tập tin danh sách cho phương tiện \"%s\""
@@ -2066,7 +2066,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --obsoletes - in ra các dòng tag: toàn bộ dòng.\n"
#: ../urpmi:81
@@ -2167,7 +2167,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --obsoletes - in ra các dòng tag: toàn bộ dòng.\n"
#: ../urpmi:109
@@ -2977,8 +2977,8 @@ msgstr " --requires - in ra yêu cầu tag: toàn bộ các yêu cầu.\n"
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --obsoletes - in ra các dòng tag: toàn bộ dòng.\n"
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - in ra yêu cầu tag: toàn bộ các yêu cầu.\n"
#: ../urpmq:85
#, fuzzy, c-format
@@ -3143,6 +3143,14 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#, fuzzy
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --obsoletes - in ra các dòng tag: toàn bộ dòng.\n"
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --obsoletes - in ra các dòng tag: toàn bộ dòng.\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d các gói, %d MB)"
diff --git a/po/wa.po b/po/wa.po
index a418e61b..cce67600 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2004-08-08 20:26+0200\n"
"Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
"Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -63,7 +63,7 @@ msgstr "Dj' astale li pacaedje «%s» (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "Dj' aberwetêye li pacaedje «%s»..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "Rinoncî"
@@ -75,22 +75,22 @@ msgstr "Rinoncî"
msgid "...retrieving failed: %s"
msgstr "...l' aberwetaedje a fwait berwete: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "Astalaedje do pacaedje"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Aroke: dji n' a savou trover l' fitchî %s, dj' arestêye l' operåcion"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "'l est bon"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -111,7 +111,7 @@ msgstr ""
"\n"
"Cwè voloz vs fé?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -126,7 +126,7 @@ msgstr ""
"\n"
"Estoz vs d' acoird?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -141,26 +141,31 @@ msgstr ""
"\n"
"Motoit vos vloz djusse li schaper. Cwè tchoezixhoz vs?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "_Astaler"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "_Schaper"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "_Rinoncî"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "Tchoezixhoz l' plaece wice schaper l' fitchî"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "'l est bon"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -251,17 +256,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Nou pacaedje di scpecifyî"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "Vos dvoz esse root"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "Dj' aprestêye les pacaedjes po l' astalaedje..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -270,7 +275,7 @@ msgstr ""
"Sacwants pacaedjes dimandés n' polèt nén esse astalés:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -281,42 +286,37 @@ msgstr ""
"%s\n"
"Continouwer tot l' minme avou l' astalaedje?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "Adviertixhmint"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "'l est bon"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (a mete a djoû)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (a-z astaler)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "Tchoezixhaedje des pacaedjes"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "I gn a mezåjhe d' onk des pacaedjes ki shuvèt:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "_Rinoncî"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -328,68 +328,68 @@ msgstr ""
"%s\n"
"Continouwer tot l' minme avou l' astalaedje?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, fuzzy, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Continouwer avou l' astalaedje d' on pacaedje? (%d Mo)"
msgstr[1] "Continouwer avou l' astalaedje d' on pacaedje? (%d Mo)"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Po satisfyî les aloyaedjes, li pacaedje aloyî ki shût va esse astalé:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Po satisfyî les aloyaedjes, les pacaedjes shuvants vont esse astalés"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "dji n' a savou prinde les pacaedjes sourdants, dji lai toumer"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "S' i vs plait metoz li sopoirt lomé «%s» el éndjin [%s]"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "_Fwait"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s"
msgstr "L' astalåcion a fwait berwete:"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, fuzzy, c-format
msgid "You may want to update your urpmi database."
msgstr ""
@@ -397,22 +397,22 @@ msgstr ""
"%s\n"
"Vos dvrîz motoit mete a djoû li båze di dnêyes urpmi."
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "L' astalåcion a fwait berwete:"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "tot a ddja stî astalé"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "L' astalåcion a fini"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "renondant urpmi"
@@ -487,7 +487,7 @@ msgstr "Dj' aberwetêye li pacaedje «%s»..."
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "eployant on evironmint specifike so %s\n"
@@ -542,62 +542,62 @@ msgstr "åk n' a nén stî tot-z eredjistrant les pacaedjes locås"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Ciste operåcion ci n' est nén possibe e môde rastrindou"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "måle declaråcion do procsi sol roye di comande\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: dji n' sai lére li fitchî rpm «%s»\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, fuzzy, c-format
msgid "unexpected expression %s"
msgstr "Patrons po les ratourneures:\n"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "I manke li sinateure (%s)"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, fuzzy, c-format
msgid "no expression to close"
msgstr "Patrons po les ratourneures:\n"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "li ridant po candjî d' raecene (chroot) n' egzistêye nén"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "Dji n' sai eployî %s sins %s"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "Dji n' sai eployî %s avou %s"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "Pår trop d' årgumints\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -614,7 +614,7 @@ msgstr ""
"\n"
"Po s' è siervi:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Copyright © %s pa %s"
@@ -661,7 +661,7 @@ msgstr "dji n' sai lére li fitchî d' apontiaedje [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "li sopoirt «%s» est defini deus côps, dji lai toumer"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "dji n' sai scrire li fitchî d' apontiaedje [%s]"
@@ -1360,7 +1360,7 @@ msgstr ""
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
+msgid "(recommended)"
msgstr ""
#: ../urpm/msg.pm:185
@@ -2039,10 +2039,8 @@ msgstr " --sourcerpm - no do fitchî src.rpm sourdant.\n"
#: ../urpmf:75
#, fuzzy, c-format
-msgid " --suggests - suggests tags\n"
-msgstr ""
-" --obsoletes - les vîs pacaedjes (avou ds ôtès nos) replaecîs pa ci-"
-"chal.\n"
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - tot çou k' i gn a mezåjhe po l' pacaedje.\n"
#: ../urpmf:76
#, c-format
@@ -2071,28 +2069,28 @@ msgstr ""
" -f - mostere li modêye et release, eyet l' årtchitecteure avou "
"l' no.\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, fuzzy, c-format
msgid "unterminated expression (%s)"
msgstr "Patrons po les ratourneures:\n"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
"Cogne nén comifåt: vos n' poloz eployî k' ene seule etike multi-valixhances"
-#: ../urpmf:286
+#: ../urpmf:287
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "nou fitchî hdlist di trové pol sopoirt «%s»"
-#: ../urpmf:293
+#: ../urpmf:294
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "dji fwai li fitchî d' sinteze hdlist pol sopoirt «%s»"
-#: ../urpmf:302
+#: ../urpmf:303
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "dji screye li fitchî d' djivêye («list») pol sopoirt «%s»"
@@ -2119,7 +2117,7 @@ msgstr ""
#: ../urpmi:80 ../urpmq:52
#, fuzzy, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr ""
" --obsoletes - les vîs pacaedjes (avou ds ôtès nos) replaecîs pa ci-"
"chal.\n"
@@ -2224,7 +2222,7 @@ msgstr ""
#: ../urpmi:105
#, fuzzy, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr ""
" --obsoletes - les vîs pacaedjes (avou ds ôtès nos) replaecîs pa ci-"
"chal.\n"
@@ -3059,10 +3057,8 @@ msgstr " --requires - tot çou k' i gn a mezåjhe po l' pacaedje.\n"
#: ../urpmq:84
#, fuzzy, c-format
-msgid " --suggests - print suggests.\n"
-msgstr ""
-" --obsoletes - les vîs pacaedjes (avou ds ôtès nos) replaecîs pa ci-"
-"chal.\n"
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - tot çou k' i gn a mezåjhe po l' pacaedje.\n"
#: ../urpmq:85
#, fuzzy, c-format
@@ -3238,6 +3234,18 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#, fuzzy
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr ""
+#~ " --obsoletes - les vîs pacaedjes (avou ds ôtès nos) replaecîs pa ci-"
+#~ "chal.\n"
+
+#, fuzzy
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr ""
+#~ " --obsoletes - les vîs pacaedjes (avou ds ôtès nos) replaecîs pa ci-"
+#~ "chal.\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d pacaedje, %d Mo)"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6c7b8370..c0e85f5b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2008-03-30 14:22+0800\n"
"Last-Translator: 汤诗语 <shiyu@mandriva.org>\n"
"Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@mandrivalinux."
@@ -64,7 +64,7 @@ msgstr "正在安装软件包“%s”(%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "正在下载软件包“%s”..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "取消"
@@ -76,22 +76,22 @@ msgstr "取消"
msgid "...retrieving failed: %s"
msgstr "...获取失败: %s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "RPM 安装"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "错误: 找不到文件 %s,将取消操作"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "确定(_O)"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -112,7 +112,7 @@ msgstr ""
"\n"
"您想要执行什么操作?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -127,7 +127,7 @@ msgstr ""
"\n"
"继续吗?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -142,26 +142,31 @@ msgstr ""
"\n"
"您也可以选择只是保存相应的软件包。您要进行什么操作?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "安装(_I)"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "保存(_S)"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "取消(_C)"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "选择保存文件的位置"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "确定"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -239,17 +244,17 @@ msgstr " --searchmedia - 只使用给定介质来搜索所请求的软件包
msgid "No packages specified"
msgstr "未指定软件包"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "必须是 root"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "准备安装软件包..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -258,7 +263,7 @@ msgstr ""
"某些要求的软件包无法安装:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -269,42 +274,37 @@ msgstr ""
"%s\n"
"仍然继续安装吗?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "警告"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "确定"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr "(升级)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr "(安装)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "软件包选择"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "需要下列软件包之一:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "中止(_A)"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -315,60 +315,60 @@ msgstr ""
"%s\n"
"仍然继续安装吗?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "将会使用 %s 的额外磁盘空间。"
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "将会释放 %s 的磁盘空间。"
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "将会获取 %s 的软件包。"
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "继续安装 %d 个软件包吗?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "为了满足依赖关系,将安装下列软件包:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "为了满足依赖关系,将安装下列软件包:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "无法读取源软件包,中止"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "请插入介质“%s”"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "完成(_D)"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -377,27 +377,27 @@ msgstr ""
"安装失败,缺少某些文件:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "您可能需要更新您的 urpmi 数据库。"
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "安装失败: "
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "软件包已经安装"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "安装完成"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "重新启动 urpmi"
@@ -471,7 +471,7 @@ msgstr "无法将软件包下载到 %s"
msgid "Environment directory %s does not exist"
msgstr "环境目录 %s 不存在"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "在 %s 使用指定环境\n"
@@ -526,62 +526,62 @@ msgstr "注册本地软件包出错"
msgid "This operation is forbidden while running in restricted mode"
msgstr "运行于限制模式运行时,禁止执行此操作"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "命令行声明的代理服务器无效\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "意外表达式 %s"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "%s 前缺少表达式"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "意外表达式 %s(建议:使用 -a 或 -o?)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, c-format
msgid "no expression to close"
msgstr "没有要关闭的表达式"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr "默认情况下,urpmf 使用正则表达式。您应该使用选项“--literal”"
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot 目录不存在"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "没有 %2$s 无法使用 %1$s"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "无法和 %2$s 一起使用 %1$s"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "参数太多\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -597,7 +597,7 @@ msgstr ""
"\n"
"用法:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "版权 (C) %s %s"
@@ -644,7 +644,7 @@ msgstr "无法读取配置文件[%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "介质“%s”定义了两次,正在退出"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "无法写入配置文件[%s]"
@@ -1332,8 +1332,8 @@ msgstr "架构"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(建议安装)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -1979,9 +1979,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - 源 rpm 名称\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - suggests 标签\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - requires 标签\n"
#: ../urpmf:76
#, c-format
@@ -2008,27 +2008,27 @@ msgstr " -m - 软件包所在介质\n"
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - 和名称一起打印版本、发行号和平台。\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, c-format
msgid "unterminated expression (%s)"
msgstr "未终止的表达式(%s)"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "格式不对: 您只能使用一个多值标签"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "介质“%s”的 hdlist 不可用"
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "介质“%s”的综合文件不可用"
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "介质“%s”没有可用的 xml-info"
@@ -2054,8 +2054,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - 不询问直接删除孤立软件包\n"
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --no-suggests - 不自动选择“推荐的”软件包。\n"
#: ../urpmi:81
@@ -2146,8 +2146,8 @@ msgid ""
msgstr " --allow-force - 允许提示用户安装软件包而不检查依赖性和完整性。\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --allow-suggests - 自动选择“推荐的”软件包。\n"
#: ../urpmi:109
@@ -2949,9 +2949,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - 打印 requires 标签。\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - 打印 suggests 标签。\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - 打印 requires 标签。\n"
#: ../urpmq:85
#, c-format
@@ -3110,6 +3110,15 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#~ msgid "(suggested)"
+#~ msgstr "(建议安装)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - suggests 标签\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - 打印 suggests 标签。\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d 个软件包,%d MB)"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 3d34aff2..ad527a00 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: zh_TW\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
"PO-Revision-Date: 2013-04-11 15:16+0800\n"
"Last-Translator: You-Cheng Hsieh <yochenhsieh@gmail.com>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -73,7 +73,7 @@ msgstr "正在安裝套件 `%s' (%s/%s)..."
msgid "Downloading package `%s'..."
msgstr "正在下載套件 `%s'..."
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
#, c-format
msgid "Cancel"
msgstr "取消"
@@ -85,22 +85,22 @@ msgstr "取消"
msgid "...retrieving failed: %s"
msgstr "...擷取失敗:%s"
-#: ../gurpmi:45
+#: ../gurpmi:49
#, c-format
msgid "RPM installation"
msgstr "RPM 套件安裝"
-#: ../gurpmi:59
+#: ../gurpmi:63
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "錯誤:無法找到檔案 %s,作業將取消"
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
#, c-format
msgid "_Ok"
msgstr "確定 (_O)"
-#: ../gurpmi:80
+#: ../gurpmi:84
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -121,7 +121,7 @@ msgstr ""
"\n"
"您想怎麼做?"
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -136,7 +136,7 @@ msgstr ""
"\n"
"要繼續嗎?"
-#: ../gurpmi:94
+#: ../gurpmi:98
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -151,26 +151,31 @@ msgstr ""
"\n"
"您或許傾向儲存而非安裝它。您的選擇是什麼?"
-#: ../gurpmi:112
+#: ../gurpmi:116
#, c-format
msgid "_Install"
msgstr "安裝 (_I)"
-#: ../gurpmi:113
+#: ../gurpmi:117
#, c-format
msgid "_Save"
msgstr "儲存 (_S)"
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
#, c-format
msgid "_Cancel"
msgstr "取消 (_C)"
-#: ../gurpmi:122
+#: ../gurpmi:126
#, c-format
msgid "Choose location to save file"
msgstr "選擇存檔的位置"
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "確定"
+
#: ../gurpmi.pm:56
#, c-format
msgid "Options:"
@@ -248,17 +253,17 @@ msgstr " --searchmedia - 只使用指定的媒體來搜尋需要的套件。\n
msgid "No packages specified"
msgstr "未指定套件"
-#: ../gurpmi2:42
+#: ../gurpmi2:46
#, c-format
msgid "Must be root"
msgstr "必須擁有管理者權限"
-#: ../gurpmi2:72
+#: ../gurpmi2:76
#, c-format
msgid "Preparing packages installation..."
msgstr "正在準備套件安裝..."
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -267,7 +272,7 @@ msgstr ""
"某些要求的套件無法安裝:\n"
"%s"
-#: ../gurpmi2:95
+#: ../gurpmi2:99
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -278,42 +283,37 @@ msgstr ""
"%s\n"
"無論如何都要繼續安裝嗎?"
-#: ../gurpmi2:115
+#: ../gurpmi2:119
#, c-format
msgid "Warning"
msgstr "警告"
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "確定"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
#, c-format
msgid " (to upgrade)"
msgstr " (升級用)"
-#: ../gurpmi2:166
+#: ../gurpmi2:170
#, c-format
msgid " (to install)"
msgstr " (安裝用)"
-#: ../gurpmi2:169
+#: ../gurpmi2:173
#, c-format
msgid "Package choice"
msgstr "套件選擇"
-#: ../gurpmi2:170
+#: ../gurpmi2:174
#, c-format
msgid "One of the following packages is needed:"
msgstr "需要下列套件之一:"
-#: ../gurpmi2:200
+#: ../gurpmi2:204
#, c-format
msgid "_Abort"
msgstr "放棄 (_A)"
-#: ../gurpmi2:235
+#: ../gurpmi2:239
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -324,60 +324,60 @@ msgstr ""
"%s\n"
"無論如何都要繼續安裝嗎?"
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
#, c-format
msgid "%s of additional disk space will be used."
msgstr "將使用 %s 額外磁碟空間。"
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
#, c-format
msgid "%s of disk space will be freed."
msgstr "將釋放 %s 磁碟空間。"
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
#, c-format
msgid "%s of packages will be retrieved."
msgstr "將取得 %s 軟體套件。"
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "繼續安裝這 %d 個套件?"
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "為了滿足相依性,將會安裝下列套件:"
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "為了滿足相依性,將會一併安裝下列套件:"
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
#, c-format
msgid "unable to get source packages, aborting"
msgstr "無法取得原始碼套件,放棄"
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "請置入名為 \"%s\" 的媒體"
-#: ../gurpmi2:303
+#: ../gurpmi2:307
#, c-format
msgid "An error occurred:"
msgstr ""
-#: ../gurpmi2:315
+#: ../gurpmi2:319
#, c-format
msgid "_Done"
msgstr "完成 (_D)"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -386,27 +386,27 @@ msgstr ""
"安裝失敗,某些檔案遺失:\n"
"%s"
-#: ../gurpmi2:335
+#: ../gurpmi2:339
#, c-format
msgid "You may want to update your urpmi database."
msgstr "您可能需要更新您的 urpmi 資料庫。"
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
#, c-format
msgid "Installation failed:"
msgstr "安裝失敗;"
-#: ../gurpmi2:344
+#: ../gurpmi2:348
#, c-format
msgid "The package(s) are already installed"
msgstr "每個套件都已經安裝了"
-#: ../gurpmi2:346
+#: ../gurpmi2:350
#, c-format
msgid "Installation finished"
msgstr "安裝完畢"
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
#, c-format
msgid "restarting urpmi"
msgstr "正在重新啟動 urpmi"
@@ -480,7 +480,7 @@ msgstr "無法下載套件至 %s"
msgid "Environment directory %s does not exist"
msgstr "環境目錄 %s 不存在"
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
#, c-format
msgid "using specific environment on %s\n"
msgstr "正在 %s 上使用特定的環境\n"
@@ -535,62 +535,62 @@ msgstr "註冊本地端套件錯誤"
msgid "This operation is forbidden while running in restricted mode"
msgstr "使用限制模式執行時禁止該操作程序"
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "命令列傳入的代理伺服器宣告錯誤\n"
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq:無法讀取 rpm 檔案 \"%s\"\n"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
#, c-format
msgid "unexpected expression %s"
msgstr "未預期的表示式 %s"
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
#, c-format
msgid "missing expression before %s"
msgstr "在 %s 前找不到表示式"
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "非預期的表示式 %s(建議:使用 -a 或 -o?)"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
#, fuzzy, c-format
msgid "no expression to close"
msgstr "樣版表示式:\n"
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr "預設 urpmf 需要正規表示式。您應該使用 \"--literal\" 選項"
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot 目錄不存在"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
#, c-format
msgid "Can't use %s without %s"
msgstr "使用 %s 時不能沒有 %s"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr "%s 不能跟 %s 一起用"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
#, c-format
msgid "Too many arguments\n"
msgstr "參數太多\n"
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
#, c-format
msgid ""
"%s version %s\n"
@@ -606,7 +606,7 @@ msgstr ""
"\n"
"用法:\n"
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Copyright (C) %s by %s"
@@ -653,7 +653,7 @@ msgstr "無法讀取設定檔 [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "媒體 '%s' 被定義了兩次,正在取消"
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "無法寫入設定檔 [%s]"
@@ -1341,8 +1341,8 @@ msgstr "硬體架構"
#: ../urpm/msg.pm:170
#, c-format
-msgid "(suggested)"
-msgstr "(建議)"
+msgid "(recommended)"
+msgstr ""
#: ../urpm/msg.pm:185
#, c-format
@@ -1985,9 +1985,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - 原始碼套件名稱\n"
#: ../urpmf:75
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - 建議標籤\n"
+#, fuzzy, c-format
+msgid " --recommends - recommends tags\n"
+msgstr " --requires - 需要標籤\n"
#: ../urpmf:76
#, c-format
@@ -2014,27 +2014,27 @@ msgstr " -m - 這個套件被找到的媒介\n"
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - 顯示版本、發行編號與平台。\n"
-#: ../urpmf:148
+#: ../urpmf:149
#, fuzzy, c-format
msgid "unterminated expression (%s)"
msgstr "樣版表示式:\n"
-#: ../urpmf:193
+#: ../urpmf:194
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "格式錯誤:您只能使用一個多值標籤"
-#: ../urpmf:286
+#: ../urpmf:287
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "媒體 \"%s\" 沒有可用的 hdlist"
-#: ../urpmf:293
+#: ../urpmf:294
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "媒體 \"%s\" 沒有可用的 synthesis"
-#: ../urpmf:302
+#: ../urpmf:303
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "媒體 \"%s\" 沒有可用的 xml-info"
@@ -2060,8 +2060,8 @@ msgid " --auto-orphans - remove orphans without asking\n"
msgstr ""
#: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr " --no-suggests - 不要自動選取 \"建議的\" 套件。\n"
#: ../urpmi:81
@@ -2158,8 +2158,8 @@ msgstr ""
" 性。\n"
#: ../urpmi:105
-#, c-format
-msgid " --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr " --allow-suggests - 自動選取 \"建議的\" 套件。\n"
#: ../urpmi:109
@@ -2959,9 +2959,9 @@ msgid " --requires - print requires.\n"
msgstr " --requires - 顯示需求。\n"
#: ../urpmq:84
-#, c-format
-msgid " --suggests - print suggests.\n"
-msgstr " --suggests - 顯示建議。\n"
+#, fuzzy, c-format
+msgid " --recommends - print recommends.\n"
+msgstr " --requires - 顯示需求。\n"
#: ../urpmq:85
#, c-format
@@ -3122,6 +3122,15 @@ msgstr ""
msgid "Authentication is required to run Mageia Package Installer"
msgstr ""
+#~ msgid "(suggested)"
+#~ msgstr "(建議)"
+
+#~ msgid " --suggests - suggests tags\n"
+#~ msgstr " --suggests - 建議標籤\n"
+
+#~ msgid " --suggests - print suggests.\n"
+#~ msgstr " --suggests - 顯示建議。\n"
+
#~ msgid "(%d package, %d MB)"
#~ msgid_plural "(%d packages, %d MB)"
#~ msgstr[0] "(%d 個套件,共 %d MB)"