From c07009bc84b312e8733f4632c75186757078dc8c Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Thu, 22 Jan 2004 11:54:48 +0000
Subject: merge

---
 po/hi.po | 101 +++++++++++++++++++++++++--------------------------------------
 1 file changed, 40 insertions(+), 61 deletions(-)

(limited to 'po/hi.po')

diff --git a/po/hi.po b/po/hi.po
index f82ef18f..cb425355 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-hi\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-20 21:15+0530\n"
 "Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma) <dysxhi@yahoo.co.in>\n"
 "Language-Team: हिन्दी, भारत (Hindi, India) <dysxhi@yahoo.co.in>\n"
@@ -215,7 +215,7 @@ msgstr "स्वतःसत्रारम्भ"
 msgid "Backups"
 msgstr "बैक-अप"
 
-#: ../control-center:107
+#: ../control-center:107 ../drakxconf:32
 #, c-format
 msgid "Boot loader"
 msgstr "बूट लोडर"
@@ -230,7 +230,7 @@ msgstr "बूट थीम"
 msgid "Boot floppy"
 msgstr "बूट फ़्लापी"
 
-#: ../control-center:110
+#: ../control-center:110 ../drakxconf:34
 #, c-format
 msgid "Internet connection sharing"
 msgstr "इन्टरनेट संबंध सहभाजिता"
@@ -285,7 +285,7 @@ msgstr "फ़ान्ट"
 msgid "Graphical server"
 msgstr "ग्राफ़िक्ल सर्वर"
 
-#: ../control-center:122
+#: ../control-center:122 ../drakxconf:35
 #, c-format
 msgid "Partitions"
 msgstr "विभाजन"
@@ -300,7 +300,7 @@ msgstr "हार्डवेयर"
 msgid "Install"
 msgstr "संसाधन"
 
-#: ../control-center:125
+#: ../control-center:125 ../drakxconf:26
 #, c-format
 msgid "Keyboard"
 msgstr "की-बोर्ड"
@@ -325,7 +325,7 @@ msgstr "मीनू"
 msgid "Monitor"
 msgstr "मॉनीटर"
 
-#: ../control-center:130
+#: ../control-center:130 ../drakxconf:27
 #, c-format
 msgid "Mouse"
 msgstr "माउस"
@@ -390,7 +390,7 @@ msgstr "स्तर और जाँच"
 msgid "Permissions"
 msgstr "अनुमतियां"
 
-#: ../control-center:143
+#: ../control-center:143 ../drakxconf:30
 #, c-format
 msgid "Services"
 msgstr "सेवायें"
@@ -405,7 +405,7 @@ msgstr "मीडीया प्रबंधक"
 msgid "TV card"
 msgstr "टीवी कार्ड"
 
-#: ../control-center:146
+#: ../control-center:146 ../drakxconf:29
 #, c-format
 msgid "Users and groups"
 msgstr "उपयोगकर्ता और समूह"
@@ -664,7 +664,7 @@ msgstr ""
 "प्रोफ़ाइल का नाम जिसका निर्माण किया जाना है (नयी प्रोफ़ाइल का निर्माण वर्तमान "
 "प्रोफ़ाइल की एक प्रतिलिपि के रूप में होगा):"
 
-#: ../control-center:369 ../control-center:402 ../control-center:528
+#: ../control-center:369 ../control-center:402 ../control-center:527
 #, c-format
 msgid "Cancel"
 msgstr "निरस्त करें"
@@ -741,7 +741,7 @@ msgstr ""
 msgid "Please wait..."
 msgstr "कृपया प्रतिक्षा करें..."
 
-#: ../control-center:533 ../gecko.pm:56
+#: ../control-center:532
 #, c-format
 msgid "Previous"
 msgstr "पिछला"
@@ -864,70 +864,35 @@ msgid "Mandrake Control Center %s\n"
 msgstr "मैनड्रैक नियंत्रण केन्द्र %s\n"
 
 #: ../control-center:992
-#, c-format
-msgid "Copyright (C) 1999-2003 Mandrakesoft SA"
+#, fuzzy, c-format
+msgid "Copyright (C) 1999-2004 Mandrakesoft SA"
 msgstr "सर्वाधिकार © १९९९-२००३ मैनड्रैकसॉफ़ट एसऐ"
 
-#: ../control-center:996
+#: ../control-center:998
 #, c-format
 msgid "Authors"
 msgstr "लेखक"
 
-#: ../control-center:997
+#: ../control-center:999
 #, c-format
 msgid "Mandrake Linux Contributors"
 msgstr "मैनड्रैक लिनक्स के योगदानकर्ता"
 
 #: ../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 "सर्वर विन्यास"
+msgid "Display"
+msgstr "/रोज़नामचा दर्शन ( _L)"
 
 #: ../drakxconf:28
 #, fuzzy, 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 "सर्वर विन्यास"
-
 #: ../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"
@@ -941,16 +906,6 @@ msgstr ""
 "\n"
 "उस मीनू को चुनें, जिसे आप आकार देना चाहते है"
 
-#: ../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"
@@ -997,6 +952,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 "सर्वर विन्यास"
+
+#, fuzzy
+#~ msgid "Connection Sharing"
+#~ msgstr "इन्टरनेट संबंध सहभाजिता"
+
 #~ msgid "Bootstrapping"
 #~ msgstr "बूटस्ट्रैपिंग"
 
-- 
cgit v1.2.1