Merge branch 'master' of git://git.mageia.org/software/drakx

1 files changed, 25 insertions, 41 deletions

diff --git a/perl-install/share/po/uz@cyrillic.po b/perl-install/share/po/uz@cyrillic.po
index f494a3bed..e6e0cf77f 100644
--- a/perl-install/share/po/uz@cyrillic.po
+++ b/perl-install/share/po/uz@cyrillic.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2013-09-30 21:17+0200\n"
+"POT-Creation-Date: 2013-11-30 19:21+0100\n"
 "PO-Revision-Date: 2010-01-15 08:03+0500\n"
 "Last-Translator: Nurali Abdurahmonov <mavnur@gmail.com>\n"
 "Language-Team: Uzbek (Cyrillic) <mavnur@gmail.com>\n"
@@ -209,11 +209,6 @@ msgstr "Махфий сўздан %s билан фойдалана олмайс�
 msgid "Password (again)"
 msgstr "Махфий сўз (яна)"
 
-#: any.pm:449
-#, c-format
-msgid "Clean /tmp at each boot"
-msgstr "Тизимни юклашда /tmp директориясини тозалаш"
-
 #: any.pm:459
 #, c-format
 msgid "Init Message"
@@ -3170,7 +3165,17 @@ msgstr "процессор # "
 msgid "Please Wait... Applying the configuration"
 msgstr "Илтимос кутиб туринг... Мосламалар қўлланилмоқда"
 
-#: harddrake/sound.pm:331
+#: harddrake/sound.pm:133
+#, c-format
+msgid "No known driver"
+msgstr "Маълум бўлган драйвер йўқ"
+
+#: harddrake/sound.pm:134
+#, c-format
+msgid "There's no known driver for your sound card (%s)"
+msgstr "Сизнинг \"%s\" товуш картангиз учун маълум бўлган драйвер мавжуд эмас."
+
+#: harddrake/sound.pm:166
 #, c-format
 msgid "Enable PulseAudio"
 msgstr "PulseAudio'ни ёқиш"
@@ -3259,39 +3264,7 @@ msgstr ""
 msgid "Driver:"
 msgstr "Драйвер:"
 
-#: harddrake/sound.pm:399
-#, c-format
-msgid ""
-"The old \"%s\" driver is blacklisted.\n"
-"\n"
-"It has been reported to oops the kernel on unloading.\n"
-"\n"
-"The new \"%s\" driver will only be used on next bootstrap."
-msgstr ""
-
-#: harddrake/sound.pm:407
-#, c-format
-msgid "No open source driver"
-msgstr "Очиқ кодли драйвер мавжуд эмас"
-
-#: harddrake/sound.pm:408
-#, c-format
-msgid ""
-"There's no free driver for your sound card (%s), but there's a proprietary "
-"driver at \"%s\"."
-msgstr ""
-
-#: harddrake/sound.pm:411
-#, c-format
-msgid "No known driver"
-msgstr "Маълум бўлган драйвер йўқ"
-
-#: harddrake/sound.pm:412
-#, c-format
-msgid "There's no known driver for your sound card (%s)"
-msgstr "Сизнинг \"%s\" товуш картангиз учун маълум бўлган драйвер мавжуд эмас."
-
-#: harddrake/sound.pm:427
+#: harddrake/sound.pm:243
 #, c-format
 msgid "Sound troubleshooting"
 msgstr "Товуш носозликларини топиш ва бартараф қилиш"
@@ -6051,11 +6024,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack"
 msgstr ""
 
 #: services.pm:26
+#, fuzzy, c-format
+msgid "An NTP client/server"
+msgstr "NTP сервери"
+
+#: services.pm:27
 #, c-format
 msgid "Set CPU frequency settings"
 msgstr ""
 
-#: services.pm:27
+#: services.pm:28
 #, c-format
 msgid ""
 "cron is a standard UNIX program that runs user-specified programs\n"
@@ -6787,6 +6765,12 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Ўрнатиш муваффақиятсиз тугади"
 
+#~ msgid "Clean /tmp at each boot"
+#~ msgstr "Тизимни юклашда /tmp директориясини тозалаш"
+
+#~ msgid "No open source driver"
+#~ msgstr "Очиқ кодли драйвер мавжуд эмас"
+
 #~ msgid "command %s missing"
 #~ msgstr "%s буйруғи етишмаяпти"