merge

1 files changed, 38 insertions, 59 deletions

diff --git a/po/sl.po b/po/sl.po
index 5bb22178..12db95fb 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-sl_BEST\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: 2004-01-19 10:34+0100\n"
 "Last-Translator: Gregor Pirnaver <gregor.pirnaver@siol.net>\n"
 "Language-Team: Slovenščina <lugos-slo@lugos.si>\n"
@@ -225,7 +225,7 @@ msgstr "Samodejna prijava"
 msgid "Backups"
 msgstr "Varnostne kopije"
 
-#: ../control-center:107
+#: ../control-center:107 ../drakxconf:32
 #, c-format
 msgid "Boot loader"
 msgstr ""
@@ -240,7 +240,7 @@ msgstr "Zagonska tema"
 msgid "Boot floppy"
 msgstr "Zagonska disketa"
 
-#: ../control-center:110
+#: ../control-center:110 ../drakxconf:34
 #, c-format
 msgid "Internet connection sharing"
 msgstr "Souporaba internetne povezave"
@@ -295,7 +295,7 @@ msgstr "Pisave"
 msgid "Graphical server"
 msgstr "Grafični strežnik"
 
-#: ../control-center:122
+#: ../control-center:122 ../drakxconf:35
 #, c-format
 msgid "Partitions"
 msgstr "Razdelki"
@@ -310,7 +310,7 @@ msgstr "Strojna oprema"
 msgid "Install"
 msgstr "Namesti"
 
-#: ../control-center:125
+#: ../control-center:125 ../drakxconf:26
 #, c-format
 msgid "Keyboard"
 msgstr "Tipkovnica"
@@ -335,7 +335,7 @@ msgstr "Meniji"
 msgid "Monitor"
 msgstr "Zaslon"
 
-#: ../control-center:130
+#: ../control-center:130 ../drakxconf:27
 #, c-format
 msgid "Mouse"
 msgstr "Miška"
@@ -400,7 +400,7 @@ msgstr "Nivo in preverbe"
 msgid "Permissions"
 msgstr "Dovoljenja"
 
-#: ../control-center:143
+#: ../control-center:143 ../drakxconf:30
 #, c-format
 msgid "Services"
 msgstr "Storitve"
@@ -415,7 +415,7 @@ msgstr "Upravnik medijev"
 msgid "TV card"
 msgstr "TV kartica"
 
-#: ../control-center:146
+#: ../control-center:146 ../drakxconf:29
 #, c-format
 msgid "Users and groups"
 msgstr "Uporabniki in skupine"
@@ -673,7 +673,7 @@ msgid ""
 msgstr ""
 "Ime profila, ki naj se ustvari (nov profil je narejen kot kopija trenutnega):"
 
-#: ../control-center:369 ../control-center:402 ../control-center:528
+#: ../control-center:369 ../control-center:402 ../control-center:527
 #, c-format
 msgid "Cancel"
 msgstr "Prekliči"
@@ -750,7 +750,7 @@ msgstr ""
 msgid "Please wait..."
 msgstr "Prosim počakajte ..."
 
-#: ../control-center:533 ../gecko.pm:56
+#: ../control-center:532
 #, c-format
 msgid "Previous"
 msgstr "Predhodni"
@@ -878,66 +878,31 @@ msgstr "Nadzorno središče 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 "Avtorji"
 
-#: ../control-center:997
+#: ../control-center:999
 #, c-format
 msgid "Mandrake Linux Contributors"
 msgstr "Sodelavci Mandrake Linux"
 
 #: ../drakxconf:25
 #, fuzzy, c-format
-msgid "Display Configuration"
-msgstr "Nastavitve tiskanja"
-
-#: ../drakxconf:26
-#, fuzzy, c-format
-msgid "KeyBoard Configuration"
-msgstr "Nastavitveno središče menijev"
-
-#: ../drakxconf:27
-#, fuzzy, c-format
-msgid "Mouse Configuration"
-msgstr "Nastavitveno središče menijev"
+msgid "Display"
+msgstr "/Prikaži _Dnevnike"
 
 #: ../drakxconf:28
 #, fuzzy, c-format
 msgid "Internet & Network"
 msgstr "Dostop do interneta"
 
-#: ../drakxconf:29
-#, c-format
-msgid "Add new users"
-msgstr ""
-
-#: ../drakxconf:30
-#, fuzzy, c-format
-msgid "Service Configuration"
-msgstr "Nastavitve tiskanja"
-
-#: ../drakxconf:32
-#, fuzzy, c-format
-msgid "Boot Configuration"
-msgstr "Nastavitve tiskanja"
-
 #: ../drakxconf:33
 #, fuzzy, c-format
 msgid "Auto Install"
 msgstr "Disketa samodejne namestitve"
 
-#: ../drakxconf:34
-#, fuzzy, c-format
-msgid "Connection Sharing"
-msgstr "Souporaba internetne povezave"
-
-#: ../drakxconf:35
-#, c-format
-msgid "Disk Partionning"
-msgstr ""
-
 #: ../drakxconf:38
 #, fuzzy, c-format
 msgid "Control Center"
@@ -951,16 +916,6 @@ msgstr ""
 "\n"
 "Izberite meni, ki ga želite urediti"
 
-#: ../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"
@@ -1007,5 +962,29 @@ msgstr "Kliknite sem, da nastavite sistem za tiskanje"
 msgid "Done"
 msgstr "Opravljeno"
 
+#, fuzzy
+#~ msgid "Display Configuration"
+#~ msgstr "Nastavitve tiskanja"
+
+#, fuzzy
+#~ msgid "KeyBoard Configuration"
+#~ msgstr "Nastavitveno središče menijev"
+
+#, fuzzy
+#~ msgid "Mouse Configuration"
+#~ msgstr "Nastavitveno središče menijev"
+
+#, fuzzy
+#~ msgid "Service Configuration"
+#~ msgstr "Nastavitve tiskanja"
+
+#, fuzzy
+#~ msgid "Boot Configuration"
+#~ msgstr "Nastavitve tiskanja"
+
+#, fuzzy
+#~ msgid "Connection Sharing"
+#~ msgstr "Souporaba internetne povezave"
+
 #~ msgid "Bootstrapping"
 #~ msgstr "Začetno nalaganje"