merge

1 files changed, 35 insertions, 60 deletions

diff --git a/po/br.po b/po/br.po
index 66bfc214..b70500d2 100644
--- a/po/br.po
+++ b/po/br.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf 0.96\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-17 21:37-0500\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: Brezhoneg <LL@li.org>\n"
@@ -202,7 +202,7 @@ msgstr "Mont tre"
 msgid "Backups"
 msgstr "Dielloù"
 
-#: ../control-center:107
+#: ../control-center:107 ../drakxconf:32
 #, c-format
 msgid "Boot loader"
 msgstr "C'Harger loc'hañ"
@@ -217,7 +217,7 @@ msgstr ""
 msgid "Boot floppy"
 msgstr "Bladennig loc'h"
 
-#: ../control-center:110
+#: ../control-center:110 ../drakxconf:34
 #, c-format
 msgid "Internet connection sharing"
 msgstr ""
@@ -272,7 +272,7 @@ msgstr ""
 msgid "Graphical server"
 msgstr ""
 
-#: ../control-center:122
+#: ../control-center:122 ../drakxconf:35
 #, c-format
 msgid "Partitions"
 msgstr "Parzhadurioù"
@@ -287,7 +287,7 @@ msgstr "Periantel"
 msgid "Install"
 msgstr "Stalien"
 
-#: ../control-center:125
+#: ../control-center:125 ../drakxconf:26
 #, c-format
 msgid "Keyboard"
 msgstr "Stokellaoueg"
@@ -312,7 +312,7 @@ msgstr "Meuziadoù"
 msgid "Monitor"
 msgstr "Skramm"
 
-#: ../control-center:130
+#: ../control-center:130 ../drakxconf:27
 #, c-format
 msgid "Mouse"
 msgstr "Logodenn"
@@ -377,7 +377,7 @@ msgstr "Live hag avetroù"
 msgid "Permissions"
 msgstr "Reizhan"
 
-#: ../control-center:143
+#: ../control-center:143 ../drakxconf:30
 #, c-format
 msgid "Services"
 msgstr "Servijerioù"
@@ -392,7 +392,7 @@ msgstr ""
 msgid "TV card"
 msgstr ""
 
-#: ../control-center:146
+#: ../control-center:146 ../drakxconf:29
 #, c-format
 msgid "Users and groups"
 msgstr "Tud ha strolladoù"
@@ -647,7 +647,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 "Nullañ"
@@ -721,7 +721,7 @@ msgstr ""
 msgid "Please wait..."
 msgstr "Gortozit mar plij..."
 
-#: ../control-center:533 ../gecko.pm:56
+#: ../control-center:532
 #, c-format
 msgid "Previous"
 msgstr "Diaraog"
@@ -848,66 +848,31 @@ msgstr "Mandrake Control Center %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 "Obererour"
 
-#: ../control-center:997
+#: ../control-center:999
 #, c-format
 msgid "Mandrake Linux Contributors"
 msgstr "Mignonez ar Mandrake Control Center"
 
 #: ../drakxconf:25
-#, fuzzy, c-format
-msgid "Display Configuration"
-msgstr "Kefluniadur ar servijer"
-
-#: ../drakxconf:26
-#, fuzzy, c-format
-msgid "KeyBoard Configuration"
-msgstr "Kefluniadur ar servijer"
-
-#: ../drakxconf:27
-#, fuzzy, c-format
-msgid "Mouse Configuration"
-msgstr "Kefluniadur ar servijer"
-
-#: ../drakxconf:28
 #, c-format
-msgid "Internet & Network"
+msgid "Display"
 msgstr ""
 
-#: ../drakxconf:29
+#: ../drakxconf:28
 #, c-format
-msgid "Add new users"
+msgid "Internet & Network"
 msgstr ""
 
-#: ../drakxconf:30
-#, fuzzy, c-format
-msgid "Service Configuration"
-msgstr "Kefluniadur ar servijer"
-
-#: ../drakxconf:32
-#, fuzzy, c-format
-msgid "Boot Configuration"
-msgstr "Kefluniadur loc'hañ"
-
 #: ../drakxconf:33
 #, fuzzy, c-format
 msgid "Auto Install"
 msgstr "Stalien"
 
-#: ../drakxconf:34
-#, c-format
-msgid "Connection Sharing"
-msgstr ""
-
-#: ../drakxconf:35
-#, c-format
-msgid "Disk Partionning"
-msgstr ""
-
 #: ../drakxconf:38
 #, fuzzy, c-format
 msgid "Control Center"
@@ -918,16 +883,6 @@ msgstr "Mandrake Control Center"
 msgid "Choose the tool you want to use"
 msgstr ""
 
-#: ../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"
@@ -971,6 +926,26 @@ msgstr ""
 msgid "Done"
 msgstr "Echu"
 
+#, fuzzy
+#~ msgid "Display Configuration"
+#~ msgstr "Kefluniadur ar servijer"
+
+#, fuzzy
+#~ msgid "KeyBoard Configuration"
+#~ msgstr "Kefluniadur ar servijer"
+
+#, fuzzy
+#~ msgid "Mouse Configuration"
+#~ msgstr "Kefluniadur ar servijer"
+
+#, fuzzy
+#~ msgid "Service Configuration"
+#~ msgstr "Kefluniadur ar servijer"
+
+#, fuzzy
+#~ msgid "Boot Configuration"
+#~ msgstr "Kefluniadur loc'hañ"
+
 #~ msgid "Bootstrapping"
 #~ msgstr "Loc'hañ"