Merge po files

1 files changed, 32 insertions, 29 deletions

diff --git a/po/ms.pom b/po/ms.pom
index c6d16d68..2ebcfd2d 100644
--- a/po/ms.pom
+++ b/po/ms.pom
@@ -1,4 +1,10 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:102
+#, fuzzy, c-format
+msgid "LDAP Server"
+msgstr "Pelayan _LDAP:"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Pelayan"
@@ -14,6 +20,12 @@ msgid "Graphical Environment"
 msgstr "Pembolehubah Persekitaran"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:85
+#, c-format
+msgid "Web Server"
+msgstr "Pelayan Web"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:26
 #, fuzzy, c-format
 msgid "Office Workstation"
@@ -22,24 +34,20 @@ msgstr "StesyenKerja Default"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:28
 #, c-format
-msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+msgid "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets (OpenOffice.org Calc, Kspread), PDF viewers, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:29
 #, c-format
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+msgid "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, gnumeric), pdf viewers, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:34
 #, fuzzy, c-format
 msgid "Game station"
-msgstr "Stesen Syowa, E Ongul I"
+msgstr "Permainan memori"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:35
@@ -68,9 +76,7 @@ msgstr "Internet Bergrafik"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:45
 #, fuzzy, c-format
-msgid ""
-"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
-"Web"
+msgid "Set of tools to read and send mail and news (mutt, tin..) and to browse the Web"
 msgstr "dan dan dan"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
@@ -104,31 +110,31 @@ msgid "Editors, shells, file tools, terminals"
 msgstr "Penyunting fail"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:66 share/compssUsers.pl:170
+#: share/compssUsers.pl:170
 #, fuzzy, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Pustaka dan fail selitan untuk Oaf."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:70 share/compssUsers.pl:174
+#: share/compssUsers.pl:174
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentasi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:71 share/compssUsers.pl:175
+#: share/compssUsers.pl:175
 #, fuzzy, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "dan on dan Bebas"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:75 share/compssUsers.pl:178
+#: share/compssUsers.pl:178
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:76 share/compssUsers.pl:179
+#: share/compssUsers.pl:179
 #, fuzzy, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Asas"
@@ -149,16 +155,16 @@ msgstr "Groupware"
 #: share/compssUsers.pl:90
 #, fuzzy, c-format
 msgid "Kolab Server"
-msgstr "_Pelayan NIS:"
+msgstr "Pelayan Kolab"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:93 share/compssUsers.pl:134
+#: share/compssUsers.pl:134
 #, fuzzy, c-format
 msgid "Firewall/Router"
 msgstr "_Konfigurasikan Firewall"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:94 share/compssUsers.pl:135
+#: share/compssUsers.pl:135
 #, fuzzy, c-format
 msgid "Internet gateway"
 msgstr "Gateway Tidak Sah"
@@ -218,7 +224,7 @@ msgid "NFS Server, Samba server"
 msgstr "Konfigurasi Pelayan Samba"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:117 share/compssUsers.pl:130
+#: share/compssUsers.pl:130
 #, c-format
 msgid "Database"
 msgstr "Pangkalan Data"
@@ -274,9 +280,7 @@ msgstr "StesyenKerja Default"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:148
 #, fuzzy, c-format
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
+msgid "The K Desktop Environment, the basic graphical environment with a collection of accompanying tools"
 msgstr "Desktop Persekitaran asas"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
@@ -288,9 +292,7 @@ msgstr "StesyenKerja Default"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:153
 #, fuzzy, c-format
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
+msgid "A graphical environment with user-friendly set of applications and desktop tools"
 msgstr "A pengguna dan"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
@@ -303,7 +305,7 @@ msgstr "Desktop Default:"
 #: share/compssUsers.pl:160
 #, fuzzy, c-format
 msgid "Other Graphical Desktops"
-msgstr "Memulakan pemasangan bergrafik..."
+msgstr "Pada Semua Desktop"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:161
@@ -318,7 +320,8 @@ msgid "Utilities"
 msgstr "Utiliti"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:186 share/compssUsers.pl:187 standalone/logdrake:384
+#: share/compssUsers.pl:187
+#: standalone/logdrake:384
 #, fuzzy, c-format
 msgid "SSH Server"
 msgstr "_Pelayan NIS:"
@@ -339,7 +342,7 @@ msgstr "Alatan Tetapan Pelayan NFS"
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
 msgid "Network Utilities/Monitoring"
-msgstr "Konfigurasi Rangkaian bagi %s"
+msgstr "Aplet pengawas rangkaian"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:197
@@ -357,5 +360,5 @@ msgstr "Wizard pelayan"
 #: share/compssUsers.pl:202
 #, fuzzy, c-format
 msgid "Wizards to configure server"
-msgstr "Beritahu pelayan untuk keluar"
+msgstr "Sila tetapkan pelayan PXE"