fix kde merge

1 files changed, 50 insertions, 50 deletions

diff --git a/perl-install/share/po/ms.po b/perl-install/share/po/ms.po
index d240460bf..10fc827e2 100644
--- a/perl-install/share/po/ms.po
+++ b/perl-install/share/po/ms.po
@@ -2137,7 +2137,7 @@ msgstr "Ubahsuai penapis"
 #: diskdrake/interactive.pm:448
 #, fuzzy, c-format
 msgid "Use for loopback"
-msgstr "Gunakan tetapan '%1' untuk kumpulan"
+msgstr "Gunakan tetapan '%s' untuk kumpulan"
 
 #: diskdrake/interactive.pm:497
 #, fuzzy, c-format
@@ -2147,7 +2147,7 @@ msgstr "&Cipta Baru Folder."
 #: diskdrake/interactive.pm:500
 #, fuzzy, c-format
 msgid "Start sector: "
-msgstr "%1 akan bermula."
+msgstr "%s akan bermula."
 
 #: diskdrake/interactive.pm:502 diskdrake/interactive.pm:899
 #, fuzzy, c-format
@@ -2444,7 +2444,7 @@ msgstr "Nama: "
 #: diskdrake/interactive.pm:1185
 #, fuzzy, c-format
 msgid "Start: sector %s\n"
-msgstr "%1 akan bermula."
+msgstr "%s akan bermula."
 
 #: diskdrake/interactive.pm:1186
 #, fuzzy, c-format
@@ -3063,7 +3063,7 @@ msgstr "Pencetak Tidak Diketahui"
 #: harddrake/data.pm:435
 #, fuzzy, c-format
 msgid "cpu # "
-msgstr "CPU %1: %2"
+msgstr "CPU %s: %2"
 
 #: harddrake/sound.pm:191 standalone/drakconnect:169
 #: standalone/drakconnect:615
@@ -3548,7 +3548,7 @@ msgstr "`%s' dengan tiada persamaan `%s'"
 #: help.pm:146
 #, fuzzy, c-format
 msgid "Truly minimal install"
-msgstr "Tidak dapat pasang %1:%2"
+msgstr "Tidak dapat pasang %s:%2"
 
 #: help.pm:149
 #, fuzzy, c-format
@@ -5272,7 +5272,7 @@ msgstr "on"
 #: install_steps.pm:599
 #, fuzzy, c-format
 msgid "No floppy drive available"
-msgstr "Tiada penyelarasan untuk %1"
+msgstr "Tiada penyelarasan untuk %s"
 
 #: install_steps_auto_install.pm:76 install_steps_stdio.pm:27
 #, fuzzy, c-format
@@ -5659,7 +5659,7 @@ msgstr "dan."
 #: install_steps_interactive.pm:394 install_steps_interactive.pm:452
 #, fuzzy, c-format
 msgid "Looking for available packages..."
-msgstr "Tiada penyelarasan untuk %1"
+msgstr "Tiada penyelarasan untuk %s"
 
 #: install_steps_interactive.pm:397
 #, c-format
@@ -6046,7 +6046,7 @@ msgstr "Tamat"
 #: interactive/newt.pm:92
 #, fuzzy, c-format
 msgid "Do"
-msgstr "<p><b>Apa yang saya boleh tolong?</b></p><p>%1</p>"
+msgstr "<p><b>Apa yang saya boleh tolong?</b></p><p>%s</p>"
 
 #: interactive/stdio.pm:29 interactive/stdio.pm:148
 #, c-format
@@ -6088,7 +6088,7 @@ msgstr "Rentetan petikan, asal \"> \""
 #: interactive/stdio.pm:104
 #, fuzzy, c-format
 msgid " enter `void' for void entry"
-msgstr "Masukkan Arahan untuk Aplet %1.%2"
+msgstr "Masukkan Arahan untuk Aplet %s.%2"
 
 #: interactive/stdio.pm:122
 #, c-format
@@ -8424,12 +8424,12 @@ msgstr ""
 #: mouse.pm:69
 #, fuzzy, c-format
 msgid "MM Series"
-msgstr "%1 x %2 Piksel (%3 x %4 mm)"
+msgstr "%s x %2 Piksel (%3 x %4 mm)"
 
 #: mouse.pm:70
 #, fuzzy, c-format
 msgid "MM HitTablet"
-msgstr "%1 x %2 Piksel (%3 x %4 mm)"
+msgstr "%s x %2 Piksel (%3 x %4 mm)"
 
 #: mouse.pm:71
 #, fuzzy, c-format
@@ -8774,7 +8774,7 @@ msgstr "Protokol"
 #: network/netconnect.pm:116 standalone/drakconnect:541
 #, fuzzy, c-format
 msgid "European protocol (EDSS1)"
-msgstr "<tr><td><i>Protokol</i></td>%1</tr>"
+msgstr "<tr><td><i>Protokol</i></td>%s</tr>"
 
 #: network/netconnect.pm:117 standalone/drakconnect:542
 #, fuzzy, c-format
@@ -8896,7 +8896,7 @@ msgstr "Name=Internet & Jaringan"
 #: network/netconnect.pm:244
 #, fuzzy, c-format
 msgid "(detected on port %s)"
-msgstr "Menawarkan sambungan jauh pada liang %1..."
+msgstr "Menawarkan sambungan jauh pada liang %s..."
 
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
 #: network/netconnect.pm:246
@@ -9964,7 +9964,7 @@ msgstr ""
 
 #: pkgs.pm:474
 #, fuzzy, c-format
-msgid "Downloading file %1..."
+msgid "Downloading file %s..."
 msgstr "Ke Fail"
 
 #: printer/cups.pm:103
@@ -10111,7 +10111,7 @@ msgstr "pagination tidak disokong pada hos ini"
 #: printer/main.pm:355 printer/printerdrake.pm:1175
 #, fuzzy, c-format
 msgid " on parallel port #%s"
-msgstr "Menawarkan sambungan jauh pada liang %1..."
+msgstr "Menawarkan sambungan jauh pada liang %s..."
 
 #: printer/main.pm:358 printer/printerdrake.pm:1178
 #, fuzzy, c-format
@@ -10126,7 +10126,7 @@ msgstr "Pencetak Tidak Diketahui"
 #: printer/main.pm:364
 #, fuzzy, c-format
 msgid ", HP printer on a parallel port"
-msgstr "Menawarkan sambungan jauh pada liang %1..."
+msgstr "Menawarkan sambungan jauh pada liang %s..."
 
 #: printer/main.pm:366
 #, fuzzy, c-format
@@ -10217,7 +10217,7 @@ msgstr "Pencetak Tidak Diketahui"
 #: printer/main.pm:432
 #, fuzzy, c-format
 msgid "HP printer on a parallel port"
-msgstr "Menawarkan sambungan jauh pada liang %1..."
+msgstr "Menawarkan sambungan jauh pada liang %s..."
 
 #: printer/main.pm:434
 #, fuzzy, c-format
@@ -10381,7 +10381,7 @@ msgstr "Status konfigurasi bagi %s %s\n"
 #: standalone/scannerdrake:610
 #, fuzzy, c-format
 msgid "No remote machines"
-msgstr "Sambungan jauh ke %1:%2..."
+msgstr "Sambungan jauh ke %s:%2..."
 
 #: printer/printerdrake.pm:94
 #, fuzzy, c-format
@@ -11041,7 +11041,7 @@ msgstr ""
 #: printer/printerdrake.pm:1238
 #, fuzzy, c-format
 msgid "Printer on parallel port #%s"
-msgstr "Menawarkan sambungan jauh pada liang %1..."
+msgstr "Menawarkan sambungan jauh pada liang %s..."
 
 #: printer/printerdrake.pm:1199
 #, fuzzy, c-format
@@ -11182,7 +11182,7 @@ msgstr ""
 #: printer/printerdrake.pm:1996 printer/printerdrake.pm:2007
 #, fuzzy, c-format
 msgid "Aborting"
-msgstr "ralat memuatkan %1, berhenti\n"
+msgstr "ralat memuatkan %s, berhenti\n"
 
 #: printer/printerdrake.pm:1410
 #, fuzzy, c-format
@@ -12714,7 +12714,7 @@ msgstr "Ralat adalah tidak boleh dipulihkan: keluar sekarang"
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr ""
 "<qt>Anda pasti untuk padam\n"
-" <b>%1'</b>?</qt>"
+" <b>%s'</b>?</qt>"
 
 #: printer/printerdrake.pm:5187
 #, fuzzy, c-format
@@ -13453,7 +13453,7 @@ msgstr "Ko&leksi Peringkat"
 #: security/level.pm:62
 #, fuzzy, c-format
 msgid "Use libsafe for servers"
-msgstr "Gunakan tetapan '%1' untuk kumpulan"
+msgstr "Gunakan tetapan '%s' untuk kumpulan"
 
 #: security/level.pm:63
 #, fuzzy, c-format
@@ -13806,7 +13806,7 @@ msgstr "Henti"
 #: share/advertising/01.pl:13
 #, fuzzy, c-format
 msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<p><b>Apakah ini?</b></p><p>%1</p>"
+msgstr "<p><b>Apakah ini?</b></p><p>%s</p>"
 
 #: share/advertising/01.pl:15
 #, c-format
@@ -14223,7 +14223,7 @@ msgstr ""
 #: share/advertising/16.pl:18
 #, fuzzy, c-format
 msgid "\t* <b>Transfer</b> files with KBear."
-msgstr "Membandingkan fail dalam %1 dengan fail dalam %2"
+msgstr "Membandingkan fail dalam %s dengan fail dalam %2"
 
 #: share/advertising/16.pl:19 share/advertising/17.pl:19
 #: share/advertising/18.pl:22
@@ -14405,7 +14405,7 @@ msgstr ""
 #: share/advertising/21.pl:23 share/advertising/28.pl:22
 #, fuzzy, c-format
 msgid "\t* And many more."
-msgstr "dan <A HREF=\"%1\">banyak lagi...</A>"
+msgstr "dan <A HREF=\"%s\">banyak lagi...</A>"
 
 #: share/advertising/22.pl:13
 #, fuzzy, c-format
@@ -15802,7 +15802,7 @@ msgstr ""
 #: standalone/drakTermServ:1483
 #, fuzzy, c-format
 msgid "No floppy drive available!"
-msgstr "Tiada penyelarasan untuk %1"
+msgstr "Tiada penyelarasan untuk %s"
 
 #: standalone/drakTermServ:1488
 #, fuzzy, c-format
@@ -15887,7 +15887,7 @@ msgstr "fail."
 #: standalone/drakautoinst:41
 #, fuzzy, c-format
 msgid "Auto Install Configurator"
-msgstr "Tidak dapat pasang %1:%2"
+msgstr "Tidak dapat pasang %s:%2"
 
 #: standalone/drakautoinst:42
 #, fuzzy, c-format
@@ -16791,7 +16791,7 @@ msgstr "Padam Pemacu fail."
 #: standalone/drakbackup:2262
 #, fuzzy, c-format
 msgid "What"
-msgstr "<p><b>Apa yang saya boleh tolong?</b></p><p>%1</p>"
+msgstr "<p><b>Apa yang saya boleh tolong?</b></p><p>%s</p>"
 
 #: standalone/drakbackup:2267
 #, fuzzy, c-format
@@ -17362,7 +17362,7 @@ msgstr "Name=Maklumat Katalog"
 #: standalone/drakbackup:3807
 #, fuzzy, c-format
 msgid "Unable to find backups to restore...\n"
-msgstr "Gagal mencari arkib tema ikon %1."
+msgstr "Gagal mencari arkib tema ikon %s."
 
 #: standalone/drakbackup:3808
 #, c-format
@@ -17600,7 +17600,7 @@ msgstr ""
 #: standalone/drakbug:41
 #, fuzzy, c-format
 msgid "Mandrakelinux Bug Report Tool"
-msgstr "Lapor Pepijat untuk Modul %1..."
+msgstr "Lapor Pepijat untuk Modul %s..."
 
 #: standalone/drakbug:46
 #, c-format
@@ -17713,7 +17713,7 @@ msgstr "Laporan"
 #: standalone/drakbug:163
 #, fuzzy, c-format
 msgid "Not installed"
-msgstr "%1:%2 sudah dipasang!"
+msgstr "%s:%2 sudah dipasang!"
 
 #: standalone/drakbug:175
 #, fuzzy, c-format
@@ -17758,7 +17758,7 @@ msgstr "Perkakasan"
 #: standalone/drakclock:75
 #, fuzzy, c-format
 msgid "Network Time Protocol"
-msgstr "<tr><td><i>Protokol</i></td>%1</tr>"
+msgstr "<tr><td><i>Protokol</i></td>%s</tr>"
 
 #: standalone/drakclock:77
 #, c-format
@@ -19338,7 +19338,7 @@ msgstr ""
 msgid ""
 "Description of the fields:\n"
 "\n"
-msgstr "<p><b> Keterangan Ringkas </b></p><p>%1</p>"
+msgstr "<p><b> Keterangan Ringkas </b></p><p>%s</p>"
 
 #: standalone/draksec:168
 #, fuzzy, c-format
@@ -20456,7 +20456,7 @@ msgstr ""
 #: standalone/drakvpn:941
 #, fuzzy, c-format
 msgid "Sainfo source protocol"
-msgstr "<tr><td><i>Protokol</i></td>%1</tr>"
+msgstr "<tr><td><i>Protokol</i></td>%s</tr>"
 
 #: standalone/drakvpn:942
 #, c-format
@@ -20509,7 +20509,7 @@ msgstr ""
 #: standalone/drakvpn:974
 #, fuzzy, c-format
 msgid "Sainfo destination protocol"
-msgstr "<tr><td><i>Protokol</i></td>%1</tr>"
+msgstr "<tr><td><i>Protokol</i></td>%s</tr>"
 
 #: standalone/drakvpn:975
 #, c-format
@@ -20831,7 +20831,7 @@ msgstr "Julat akhir tidak sah"
 #: standalone/drakvpn:1136
 #, fuzzy, c-format
 msgid "Upper-layer protocol"
-msgstr "<tr><td><i>Protokol</i></td>%1</tr>"
+msgstr "<tr><td><i>Protokol</i></td>%s</tr>"
 
 #: standalone/drakvpn:1136 standalone/drakvpn:1143
 #, fuzzy, c-format
@@ -21197,7 +21197,7 @@ msgstr "Nombor beranti berbeza"
 #: standalone/harddrake2:55
 #, fuzzy, c-format
 msgid "PCI function #"
-msgstr "Panggil Fungsi %1"
+msgstr "Panggil Fungsi %s"
 
 #: standalone/harddrake2:55
 #, fuzzy, c-format
@@ -21227,7 +21227,7 @@ msgstr "Fail \"%s\" adalah sebuah fail peranti"
 #: standalone/harddrake2:58
 #, fuzzy, c-format
 msgid "Sub vendor ID"
-msgstr "<tr><td><i>ID Pengeluar</i></td><td>0x%1</td></tr>"
+msgstr "<tr><td><i>ID Pengeluar</i></td><td>0x%s</td></tr>"
 
 #: standalone/harddrake2:58
 #, c-format
@@ -21311,7 +21311,7 @@ msgstr ""
 #: standalone/harddrake2:71
 #, fuzzy, c-format
 msgid "Frequency (MHz)"
-msgstr "CPU %1: %2, %3 MHz"
+msgstr "CPU %s: %2, %3 MHz"
 
 #: standalone/harddrake2:71
 #, fuzzy, c-format
@@ -21389,7 +21389,7 @@ msgstr ""
 #: standalone/harddrake2:80
 #, fuzzy, c-format
 msgid "sub generation of the cpu"
-msgstr "CPU %1: %2, kelajuan tidak diketahui"
+msgstr "CPU %s: %2, kelajuan tidak diketahui"
 
 #: standalone/harddrake2:81
 #, c-format
@@ -21675,7 +21675,7 @@ msgstr "/_Keluar"
 #: standalone/harddrake2:199
 #, fuzzy, c-format
 msgid "/_Fields description"
-msgstr "<p><b> Keterangan Ringkas </b></p><p>%1</p>"
+msgstr "<p><b> Keterangan Ringkas </b></p><p>%s</p>"
 
 #: standalone/harddrake2:201
 #, fuzzy, c-format
@@ -22466,7 +22466,7 @@ msgstr "Tambah Pencetak"
 #: standalone/printerdrake:226
 #, fuzzy, c-format
 msgid "Add a new printer to the system"
-msgstr "Tambah sambungan web baru \"%1\" kepada papan sisi anda?"
+msgstr "Tambah sambungan web baru \"%s\" kepada papan sisi anda?"
 
 #. -PO: "Set as default" is a button text and the translation has to be AS SHORT AS POSSIBLE
 #: standalone/printerdrake:229
@@ -22537,7 +22537,7 @@ msgstr ""
 #: standalone/scannerdrake:55
 #, fuzzy, c-format
 msgid "Aborting Scannerdrake."
-msgstr "ralat memuatkan %1, berhenti\n"
+msgstr "ralat memuatkan %s, berhenti\n"
 
 #: standalone/scannerdrake:60
 #, c-format
@@ -22548,7 +22548,7 @@ msgstr ""
 #: standalone/scannerdrake:61
 #, fuzzy, c-format
 msgid "Scannerdrake will not be started now."
-msgstr "Papan dock aplet tidak dapat dimulakan: %1"
+msgstr "Papan dock aplet tidak dapat dimulakan: %s"
 
 #: standalone/scannerdrake:67 standalone/scannerdrake:491
 #, fuzzy, c-format
@@ -22841,7 +22841,7 @@ msgstr "Perkongsian Fail"
 #: standalone/scannerdrake:530 standalone/scannerdrake:695
 #, fuzzy, c-format
 msgid "All remote machines"
-msgstr "Sambungan jauh ke %1:%2..."
+msgstr "Sambungan jauh ke %s:%2..."
 
 #: standalone/scannerdrake:542 standalone/scannerdrake:845
 #, fuzzy, c-format
@@ -22936,7 +22936,7 @@ msgstr "dalam"
 #: standalone/scannerdrake:782
 #, fuzzy, c-format
 msgid "Usage of remote scanners"
-msgstr "Sambungan jauh ke %1:%2..."
+msgstr "Sambungan jauh ke %s:%2..."
 
 #: standalone/scannerdrake:783
 #, c-format
@@ -23014,7 +23014,7 @@ msgstr "cipta pautan keras %s ke %s"
 #: steps.pm:18
 #, fuzzy, c-format
 msgid "Select installation class"
-msgstr "<tr><td><i>Kelas</i>%1</td></tr>"
+msgstr "<tr><td><i>Kelas</i>%s</td></tr>"
 
 #: steps.pm:19
 #, fuzzy, c-format
@@ -23064,7 +23064,7 @@ msgstr "Pasan&g yang Ditanda"
 #: steps.pm:29
 #, fuzzy, c-format
 msgid "Configure X"
-msgstr "&Konfigurasikan.%1..."
+msgstr "&Konfigurasikan.%s..."
 
 #: steps.pm:31
 #, fuzzy, c-format
@@ -23084,7 +23084,7 @@ msgstr "Pasan&g yang Ditanda"
 #: ugtk2.pm:900
 #, fuzzy, c-format
 msgid "Is this correct?"
-msgstr "<p><b>Apakah ini?</b></p><p>%1</p>"
+msgstr "<p><b>Apakah ini?</b></p><p>%s</p>"
 
 #: ugtk2.pm:960
 #, fuzzy, c-format
@@ -23241,7 +23241,7 @@ msgstr "Instalasi gagal"
 
 #, fuzzy
 #~ msgid "Move"
-#~ msgstr "&Pindah %1"
+#~ msgstr "&Pindah %s"
 
 #, fuzzy
 #~ msgid "Moving"