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

1 files changed, 26 insertions, 41 deletions

diff --git a/perl-install/share/po/am.po b/perl-install/share/po/am.po
index 59f74414e..2973ffa54 100644
--- a/perl-install/share/po/am.po
+++ b/perl-install/share/po/am.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2013-09-30 21:17+0200\n"
+"POT-Creation-Date: 2013-11-30 19:21+0100\n"
 "PO-Revision-Date: 2004-06-01 03:36+0100\n"
 "Last-Translator: Alemayehu <alemayehu@gmx.at>\n"
 "Language-Team: Amharic <am-translate@geez.org>\n"
@@ -186,11 +186,6 @@ msgstr ""
 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"
@@ -3008,7 +3003,17 @@ msgstr "ሲፒዩ #"
 msgid "Please Wait... Applying the configuration"
 msgstr "እባክዎ ይጠብቁ... ምርጫውን በስራ ላይ አያዋለ ነው"
 
-#: harddrake/sound.pm:331
+#: harddrake/sound.pm:133
+#, fuzzy, 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 ""
+
+#: harddrake/sound.pm:166
 #, c-format
 msgid "Enable PulseAudio"
 msgstr ""
@@ -3089,39 +3094,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
-#, fuzzy, 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
-#, fuzzy, 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 ""
-
-#: harddrake/sound.pm:427
+#: harddrake/sound.pm:243
 #, c-format
 msgid "Sound troubleshooting"
 msgstr ""
@@ -5741,11 +5714,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"
@@ -6465,6 +6443,13 @@ msgstr ""
 msgid "Installation failed"
 msgstr "%s አልተገኘም"
 
+#~ msgid "Clean /tmp at each boot"
+#~ msgstr "በየጅማሬው /tmpን አጽዳ"
+
+#, fuzzy
+#~ msgid "No open source driver"
+#~ msgstr "ስለ የነፃው ሶፍትዌር መረጃ አሳይ"
+
 #~ msgid "File sharing"
 #~ msgstr "ሰነድ መጋራት"