From afea9f23bd47b71e45bc0b1ee689be5c6230ff87 Mon Sep 17 00:00:00 2001
From: Guillaume Cottenceau <gc@mandriva.com>
Date: Wed, 18 Jun 2003 17:08:29 +0000
Subject: merge

---
 po/af.po | 46 +++++++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

(limited to 'po/af.po')

diff --git a/po/af.po b/po/af.po
index 7702dab8..3a51742d 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-06-13 21:08+0200\n"
+"POT-Creation-Date: 2003-06-18 19:02+0200\n"
 "PO-Revision-Date: Tue Sep 19 2000 08:40:28+0200\n"
 "Last-Translator: Schalk W. Cronjé <schalkc@ntaba.co.za>\n"
 "Language-Team: Afrikaans <lia@af.org.za>\n"
@@ -570,6 +570,16 @@ msgstr "Belangrikhied: %s"
 msgid "Unable to create medium."
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
@@ -791,6 +801,16 @@ msgstr "Installasievoorbereiding"
 msgid "Some packages can't be removed"
 msgstr "Pakket kan nie installeer word nie"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s"
+msgstr ""
+"Om alle afhanklikhede te bevredig moet hierdie\n"
+"pakkette verwyder word:"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Finland"
@@ -968,18 +988,6 @@ msgstr "Normale opdaterings"
 msgid "Removable device"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"(waiting for urpmi subroutine for explanation)\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Graphical desktop/Icewm"
@@ -1197,18 +1205,6 @@ msgstr "Beskrywings"
 msgid "%s KB"
 msgstr "%.1f KB"
 
-#: ../rpmdrake:1
-#, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Sciences/Chemistry"
-- 
cgit v1.2.1