Merge new strings

1 files changed, 206 insertions, 62 deletions

diff --git a/po/af.po b/po/af.po
index b1ec916f..ba162eda 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: 2005-01-03 13:52+0100\n"
+"POT-Creation-Date: 2005-01-06 15:42+0100\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"
@@ -73,6 +73,207 @@ msgstr " (J/n) "
 msgid "%s: command not found\n"
 msgstr ""
 
+#: ../gurpmi:99
+#, c-format
+msgid "Please wait..."
+msgstr ""
+
+#: ../gurpmi:110
+#, fuzzy, c-format
+msgid "Unknown option %s"
+msgstr "%s word installeer\n"
+
+#: ../gurpmi:114
+#, fuzzy, c-format
+msgid "No packages specified"
+msgstr "geen pakket het die naam %s nie\n"
+
+#: ../gurpmi:118
+#, c-format
+msgid "Must be root"
+msgstr ""
+
+#: ../gurpmi:128
+#, fuzzy, c-format
+msgid "RPM installation"
+msgstr "Installasievoorbereiding..."
+
+#: ../gurpmi:141
+#, 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"
+"\n"
+"What would you like to do?"
+msgstr ""
+
+#: ../gurpmi:149
+#, c-format
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+
+#: ../gurpmi:154
+#, c-format
+msgid ""
+"You are about to install the following software packages on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"Proceed?"
+msgstr ""
+
+#: ../gurpmi:164
+#, fuzzy, c-format
+msgid "_Install"
+msgstr "Installasie het misluk"
+
+#: ../gurpmi:165
+#, c-format
+msgid "_Save"
+msgstr ""
+
+#: ../gurpmi:166 ../gurpmi:229
+#, fuzzy, c-format
+msgid "_Cancel"
+msgstr "Kanselleer"
+
+#: ../gurpmi:170
+#, c-format
+msgid "Choose location to save file"
+msgstr ""
+
+#: ../gurpmi:220
+#, c-format
+msgid " (to upgrade)"
+msgstr ""
+
+#: ../gurpmi:221
+#, fuzzy, c-format
+msgid " (to install)"
+msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+
+#: ../gurpmi:225 ../urpmi:350
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Slegs een van die volgende pakkette word benodig:"
+
+#: ../gurpmi:230 ../gurpmi:246
+#, fuzzy, c-format
+msgid "_Ok"
+msgstr "OK"
+
+#: ../gurpmi:247
+#, c-format
+msgid "_Abort"
+msgstr ""
+
+#: ../gurpmi:276
+#, c-format
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s\n"
+"Continue?"
+msgstr ""
+
+#: ../gurpmi:287
+#, fuzzy, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s\n"
+"Continue?"
+msgstr "Die volgende pakket bevat %s: %s\n"
+
+#: ../gurpmi:300
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be "
+"installed:\n"
+"%s\n"
+msgstr ""
+"How afhanklikhede te bevredig, moet die volgende pakkette installeer word (%"
+"d MB)"
+
+#: ../gurpmi:307
+#, c-format
+msgid "Package installation..."
+msgstr "Installasievoorbereiding..."
+
+#: ../gurpmi:309 ../urpmi:483 ../urpmq:302
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#: ../gurpmi:323 ../urpmi:494
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Sit asb. die %s getiteld %s in"
+
+#: ../gurpmi:350
+#, fuzzy, c-format
+msgid "Downloading package `%s'..."
+msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+
+#: ../gurpmi:365
+#, fuzzy, c-format
+msgid ""
+"The following packages have bad signatures:\n"
+"%s\n"
+"\n"
+"Do you want to continue installation ?"
+msgstr "Die volgende pakket bevat %s: %s\n"
+
+#: ../gurpmi:372 ../gurpmi:421 ../urpmi:556 ../urpmi:672
+#, c-format
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
+msgstr ""
+
+#: ../gurpmi:379 ../urpme:111 ../urpmi:597
+#, fuzzy, c-format
+msgid "removing %s"
+msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+
+#: ../gurpmi:387 ../urpm.pm:2751
+#, c-format
+msgid "Preparing..."
+msgstr ""
+
+#: ../gurpmi:389
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Installeer tans pakket %s (%s/%s)...."
+
+#: ../gurpmi:407 ../urpmi:566 ../urpmi:610 ../urpmi:631 ../urpmi:651
+#, c-format
+msgid "Installation failed"
+msgstr "Installasie het misluk"
+
+#: ../gurpmi:416
+#, c-format
+msgid "_Done"
+msgstr ""
+
+#: ../gurpmi:424 ../urpmi:688
+#, c-format
+msgid "The package(s) are already installed"
+msgstr "Alles is alreeds installeer"
+
+#: ../gurpmi:426
+#, fuzzy, c-format
+msgid "Installation finished"
+msgstr "Installasie het misluk"
+
 #: ../rpm-find-leaves:12
 #, c-format
 msgid ""
@@ -679,11 +880,6 @@ msgstr ""
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:2751
-#, c-format
-msgid "Preparing..."
-msgstr ""
-
 #: ../urpm.pm:2789
 #, c-format
 msgid "using process %d for executing transaction"
@@ -900,11 +1096,6 @@ msgstr ""
 msgid " (y/N) "
 msgstr " (J/n) "
 
-#: ../urpme:111 ../urpmi:597
-#, fuzzy, c-format
-msgid "removing %s"
-msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
-
 #: ../urpme:115
 #, c-format
 msgid "Removing failed"
@@ -1372,11 +1563,6 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:350
-#, c-format
-msgid "One of the following packages is needed:"
-msgstr "Slegs een van die volgende pakkette word benodig:"
-
 #: ../urpmi:353
 #, c-format
 msgid "What is your choice? (1-%d) "
@@ -1444,16 +1630,6 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../urpmi:483 ../urpmq:302
-#, c-format
-msgid "unable to get source packages, aborting"
-msgstr ""
-
-#: ../urpmi:494
-#, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Sit asb. die %s getiteld %s in"
-
 #: ../urpmi:495
 #, fuzzy, c-format
 msgid "Press Enter when ready..."
@@ -1469,19 +1645,6 @@ msgstr "Die volgende pakket bevat %s: %s\n"
 msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi:556 ../urpmi:672
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-
-#: ../urpmi:566 ../urpmi:610 ../urpmi:631 ../urpmi:651
-#, c-format
-msgid "Installation failed"
-msgstr "Installasie het misluk"
-
 #: ../urpmi:581
 #, fuzzy, c-format
 msgid "distributing %s"
@@ -1517,12 +1680,7 @@ msgstr "Installasie het misluk"
 msgid "Installation is possible"
 msgstr "Installasie het misluk"
 
-#: ../urpmi:688
-#, c-format
-msgid "The package(s) are already installed"
-msgstr "Alles is alreeds installeer"
-
-#: ../urpmi:702
+#: ../urpmi:703
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
@@ -1782,7 +1940,7 @@ msgstr "%s word installeer\n"
 #, c-format
 msgid ""
 "urpmq version %s\n"
-"Copyright (C) 2000-2004 Mandrakesoft.\n"
+"Copyright (C) 2000-2005 Mandrakesoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -1918,12 +2076,12 @@ msgstr ""
 msgid "skipping media %s: no hdlist\n"
 msgstr ""
 
-#: ../urpmq:401
+#: ../urpmq:399
 #, c-format
 msgid "No filelist found\n"
 msgstr ""
 
-#: ../urpmq:411
+#: ../urpmq:409
 #, c-format
 msgid "No changelog found\n"
 msgstr ""
@@ -1931,24 +2089,10 @@ msgstr ""
 #~ msgid "Do nothing"
 #~ msgstr "Moet niks doen nie"
 
-#, fuzzy
-#~ msgid "Install it"
-#~ msgstr "Installasie het misluk"
-
-#~ msgid "Package installation..."
-#~ msgstr "Installasievoorbereiding..."
-
 #~ msgid "Initializing..."
 #~ msgstr "Aanvangstadium...."
 
 #, fuzzy
-#~ msgid "Downloading package `%s'..."
-#~ msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
-
-#~ msgid "Installing package `%s' (%s/%s)..."
-#~ msgstr "Installeer tans pakket %s (%s/%s)...."
-
-#, fuzzy
 #~ msgid "syntax error in config file at line %s"
 #~ msgstr "Net die supergebruiker kan plaaslike pakkette installeer"