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/ms.po | 49 ++++++++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

(limited to 'po/ms.po')

diff --git a/po/ms.po b/po/ms.po
index 83f28c4a..5d5e3272 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,7 +6,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: 2003-02-20 03:24--730\n"
 "Last-Translator: Yuzz <yuzz@likom.com.my>\n"
 "Language-Team: Malaysia <yuzz@emasonline.com>\n"
@@ -561,6 +561,21 @@ msgstr ""
 msgid "Unable to create medium."
 msgstr "Gagal membuat laporan fail. keluar\n"
 
+#: ../rpmdrake:1
+#, fuzzy, 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 ""
+"Fail yang berikut adalah tidak sah:\n"
+"\n"
+"%s\n"
+"\n"
+"Adakah anda ingin teruskan (langkui pakej ini)?"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
@@ -776,6 +791,14 @@ msgstr "Menyediakan pakej untuk instal..."
 msgid "Some packages can't be removed"
 msgstr "Pakej `%s' tidak boleh diinstal\n"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s"
+msgstr "Pakej `%s' tidak boleh diinstal\n"
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Finland"
@@ -950,18 +973,6 @@ msgstr "kemaskini normal"
 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"
@@ -1174,18 +1185,6 @@ msgstr ""
 msgid "%s KB"
 msgstr ""
 
-#: ../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