merge

1 files changed, 39 insertions, 63 deletions

diff --git a/po/sr.po b/po/sr.po
index 5b104e19..de5075e9 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-21 18:52+0100\n"
+"POT-Creation-Date: 2004-01-22 12:55+0100\n"
 "PO-Revision-Date: 2003-07-27 09:50+0200\n"
 "Last-Translator: Toma Jankovic <tomaja@net.yu>\n"
 "Language-Team: serbian <i18n@mandrake.co.yu>\n"
@@ -205,7 +205,7 @@ msgstr ""
 msgid "Backups"
 msgstr ""
 
-#: ../control-center:107
+#: ../control-center:107 ../drakxconf:32
 #, c-format
 msgid "Boot loader"
 msgstr ""
@@ -220,7 +220,7 @@ msgstr "Још тема"
 msgid "Boot floppy"
 msgstr ""
 
-#: ../control-center:110
+#: ../control-center:110 ../drakxconf:34
 #, fuzzy, c-format
 msgid "Internet connection sharing"
 msgstr "Монитор: лажни опис"
@@ -275,7 +275,7 @@ msgstr "Фонтови"
 msgid "Graphical server"
 msgstr ""
 
-#: ../control-center:122
+#: ../control-center:122 ../drakxconf:35
 #, c-format
 msgid "Partitions"
 msgstr ""
@@ -290,7 +290,7 @@ msgstr "Хардвер"
 msgid "Install"
 msgstr "Ауто Инсталација"
 
-#: ../control-center:125
+#: ../control-center:125 ../drakxconf:26
 #, c-format
 msgid "Keyboard"
 msgstr "Тастатурa"
@@ -315,7 +315,7 @@ msgstr "Мениjи"
 msgid "Monitor"
 msgstr "Монитор"
 
-#: ../control-center:130
+#: ../control-center:130 ../drakxconf:27
 #, c-format
 msgid "Mouse"
 msgstr "Миш"
@@ -380,7 +380,7 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: ../control-center:143
+#: ../control-center:143 ../drakxconf:30
 #, c-format
 msgid "Services"
 msgstr "Сервиси"
@@ -395,7 +395,7 @@ msgstr ""
 msgid "TV card"
 msgstr ""
 
-#: ../control-center:146
+#: ../control-center:146 ../drakxconf:29
 #, c-format
 msgid "Users and groups"
 msgstr ""
@@ -652,7 +652,7 @@ msgid ""
 "current one):"
 msgstr ""
 
-#: ../control-center:369 ../control-center:402 ../control-center:528
+#: ../control-center:369 ../control-center:402 ../control-center:527
 #, c-format
 msgid "Cancel"
 msgstr "Поништи"
@@ -726,7 +726,7 @@ msgstr ""
 msgid "Please wait..."
 msgstr "Сaчекаjте моменат..."
 
-#: ../control-center:533 ../gecko.pm:56
+#: ../control-center:532
 #, c-format
 msgid "Previous"
 msgstr "ааАаЗаАаД"
@@ -853,66 +853,31 @@ msgstr "Mandrake Контролни Центар %s\n"
 msgid "Copyright (C) 1999-2004 Mandrakesoft SA"
 msgstr "Copyright (C) 1999-2004 Mandrakesoft SA"
 
-#: ../control-center:996
+#: ../control-center:998
 #, c-format
 msgid "Authors"
 msgstr "Аутори"
 
-#: ../control-center:997
+#: ../control-center:999
 #, fuzzy, c-format
 msgid "Mandrake Linux Contributors"
 msgstr "Mandrake Контролни Центар %s"
 
 #: ../drakxconf:25
-#, fuzzy, c-format
-msgid "Display Configuration"
-msgstr "Подешавање Сервера"
-
-#: ../drakxconf:26
-#, fuzzy, c-format
-msgid "KeyBoard Configuration"
-msgstr "Подешавање Сервера"
-
-#: ../drakxconf:27
-#, fuzzy, c-format
-msgid "Mouse Configuration"
-msgstr "Подешавање Сервера"
+#, c-format
+msgid "Display"
+msgstr "Дисплеj"
 
 #: ../drakxconf:28
 #, c-format
 msgid "Internet & Network"
 msgstr ""
 
-#: ../drakxconf:29
-#, c-format
-msgid "Add new users"
-msgstr ""
-
-#: ../drakxconf:30
-#, fuzzy, c-format
-msgid "Service Configuration"
-msgstr "Подешавање Сервера"
-
-#: ../drakxconf:32
-#, fuzzy, c-format
-msgid "Boot Configuration"
-msgstr "Boot конфигурациja"
-
 #: ../drakxconf:33
 #, fuzzy, c-format
 msgid "Auto Install"
 msgstr "Ауто Инсталација"
 
-#: ../drakxconf:34
-#, fuzzy, c-format
-msgid "Connection Sharing"
-msgstr "Монитор: лажни опис"
-
-#: ../drakxconf:35
-#, c-format
-msgid "Disk Partionning"
-msgstr ""
-
 #: ../drakxconf:38
 #, fuzzy, c-format
 msgid "Control Center"
@@ -926,16 +891,6 @@ msgstr ""
 "\n"
 "Изаберите мени коjи желите да подeситe"
 
-#: ../gecko.pm:52
-#, c-format
-msgid "Next"
-msgstr ""
-
-#: ../gecko.pm:60
-#, c-format
-msgid "Skip Wizard"
-msgstr ""
-
 #: ../menus_launcher.pl:19 ../menus_launcher.pl:41
 #, c-format
 msgid "Menu Configuration Center"
@@ -982,6 +937,30 @@ msgstr "Кликни овде за конфигурисање система за штампање"
 msgid "Done"
 msgstr "Завршено"
 
+#, fuzzy
+#~ msgid "Display Configuration"
+#~ msgstr "Подешавање Сервера"
+
+#, fuzzy
+#~ msgid "KeyBoard Configuration"
+#~ msgstr "Подешавање Сервера"
+
+#, fuzzy
+#~ msgid "Mouse Configuration"
+#~ msgstr "Подешавање Сервера"
+
+#, fuzzy
+#~ msgid "Service Configuration"
+#~ msgstr "Подешавање Сервера"
+
+#, fuzzy
+#~ msgid "Boot Configuration"
+#~ msgstr "Boot конфигурациja"
+
+#, fuzzy
+#~ msgid "Connection Sharing"
+#~ msgstr "Монитор: лажни опис"
+
 #~ msgid ""
 #~ "Mandrake Control Center is Mandrake Linux's main configuration\n"
 #~ "tool. It enables the system administrator to configure the hardware\n"
@@ -1486,9 +1465,6 @@ msgstr "Завршено"
 #~ msgid "/Themes"
 #~ msgstr "/Теме"
 
-#~ msgid "Display"
-#~ msgstr "Дисплеj"
-
 #~ msgid "DrakConf: error"
 #~ msgstr "DrakConf: грeшкa"