merge and translate for fr

1 files changed, 26 insertions, 27 deletions

diff --git a/po/uz@Cyrl.pom b/po/uz@Cyrl.pom
index 276ef8b2..11f933e3 100644
--- a/po/uz@Cyrl.pom
+++ b/po/uz@Cyrl.pom
@@ -1,7 +1,7 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Workstation"
-msgstr ""
+msgstr "Иш станцияси"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -21,7 +21,7 @@ msgstr "Сервер"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Office Workstation"
-msgstr ""
+msgstr "Идора станцияси"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -33,7 +33,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Game station"
-msgstr ""
+msgstr "Ўйин станцияси"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -43,17 +43,17 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Multimedia station"
-msgstr ""
+msgstr "Мултимедиа станцияси"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Sound and video playing/editing programs"
-msgstr ""
+msgstr "Товушни ва видеони ўйнатиш/тузатиш дастурлари"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Internet station"
-msgstr ""
+msgstr "Интернет станция"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -70,7 +70,7 @@ msgstr "Тармоқдаги компютер (клиент)"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Clients for different protocols including ssh"
-msgstr ""
+msgstr "Турли протоколлар шу жумладан ssh учун клиентлар"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -85,17 +85,17 @@ msgstr "Компютерингизни мослашни енгиллаштири
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Scientific Workstation"
-msgstr ""
+msgstr "Илмий иш станцияси"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Scientific applications such as gnuplot"
-msgstr "Гнуплот'га ўхшаган илмий дастурлар"
+msgstr "Gnuplot'га ўхшаган илмий дастурлар"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Console Tools"
-msgstr ""
+msgstr "Консол асбоблари"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -105,7 +105,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "KDE Workstation"
-msgstr ""
+msgstr "KDE иш станцияси"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -117,7 +117,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Gnome Workstation"
-msgstr ""
+msgstr "Gnome иш станцияси"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -129,12 +129,12 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Other Graphical Desktops"
-msgstr "Бошқа график муҳитлар"
+msgstr "Бошқа график иш столлари"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Икевм, Виндов Макер, Енлигҳтенмент, Фввм, ва ҳоказо"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ва ҳоказо"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -149,12 +149,12 @@ msgstr "Қўлланмалар"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Books and Howto's on Linux and Free Software"
-msgstr "Линух ва Фрее Софтваре бўйича китоблар ва Ҳовтўлар"
+msgstr "Linux ва бепул дастурлар бўйича китоблар ва Howto'лар"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "LSB"
-msgstr "ЛСБ"
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -164,38 +164,37 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Web/FTP"
-msgstr "Веб/ФТП"
+msgstr "Веб/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Apache, Pro-ftpd"
-msgstr "Апаче, Про-фтпд"
+msgstr "Апачи, Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Mail"
-msgstr ""
+msgstr "Хат-хабар"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
 msgid "Postfix mail server"
-msgstr "Х сервер"
+msgstr "Postfix хат-хабар сервери"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Database"
-msgstr "М'лумот базаси"
+msgstr "Мълумотлар базаси"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "PostgreSQL or MySQL database server"
-msgstr "ПостгреСҚЛ ёки МйСҚЛ маълумот базасининг сервери"
+msgstr "PostgreSQL ёки MySQL маълумотлар базасининг сервери"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Firewall/Router"
-msgstr ""
+msgstr "Файервол/Рутер"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -205,12 +204,12 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "DNS/NIS "
-msgstr "ДНС/НИС "
+msgstr "DNS/NIS "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Domain Name and Network Information Server"
-msgstr "ДНС ва НИС"
+msgstr "DNS ва NIS"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -220,7 +219,7 @@ msgstr "Тармоқдаги компютер (сервер)"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "НФС сервер, СМБ сервер, Прокси сервер, СШ сервер"
+msgstr "NFS сервери, SMB сервери, Прокси сервери, SSH сервери"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999