automerging

8 files changed, 25 insertions, 33 deletions

diff --git a/po/bg.po b/po/bg.po
index 1671ebcd..4dbffd2c 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -673,9 +673,9 @@ msgid "Choose the display manager that enable to select which user to log in"
 msgstr ""
 
 #: ../control-center:274
-#, fuzzy, c-format
+#, c-format
 msgid "Fax"
-msgstr "KФакс"
+msgstr "Факс"
 
 #: ../control-center:275
 #, fuzzy, c-format
@@ -1060,7 +1060,7 @@ msgstr "Телевизионни карти"
 #: ../control-center:655
 #, c-format
 msgid "UPS"
-msgstr ""
+msgstr "UPS"
 
 #. -PO: here power means electrical power
 #: ../control-center:658
@@ -1101,9 +1101,9 @@ msgid "Server wizards"
 msgstr "Помощници за настройка на сървър"
 
 #: ../control-center:723
-#, fuzzy, c-format
+#, c-format
 msgid "Sharing"
-msgstr "Споделяне на файлове"
+msgstr "Споделяне"
 
 #: ../control-center:726
 #, c-format
@@ -1745,9 +1745,8 @@ msgid "Hard Drives"
 msgstr "Твърди дискове"
 
 #: data/proxy.desktop.in.h:1
-#, fuzzy
 msgid "Proxy Configuration"
-msgstr "Настройка на proc"
+msgstr "Настройка на сървър посредник"
 
 #: data/removable.desktop.in.h:1
 #, fuzzy
@@ -1765,7 +1764,6 @@ msgid "System Settings"
 msgstr "Системни настройки"
 
 #: data/userdrake.desktop.in.h:1
-#, fuzzy
 msgid "Users and Groups"
 msgstr "Потребители и групи"
 
diff --git a/po/el.po b/po/el.po
index d5188f23..2cae7831 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1103,9 +1103,9 @@ msgid "Server wizards"
 msgstr "Οδηγοί εξυπηρετητή"
 
 #: ../control-center:723
-#, fuzzy, c-format
+#, c-format
 msgid "Sharing"
-msgstr "Κοινή χρήση αρχείων"
+msgstr "Κοινή χρήση"
 
 #: ../control-center:726
 #, c-format
diff --git a/po/hr.po b/po/hr.po
index b954cc51..22d86c28 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -1747,9 +1747,8 @@ msgid "System Settings"
 msgstr "Proizvoljno particioniranje diska"
 
 #: data/userdrake.desktop.in.h:1
-#, fuzzy
 msgid "Users and Groups"
-msgstr ", korištenjem komande %s"
+msgstr "Korisnici i grupe"
 
 #: data/XFDrake-Resolution.desktop.in.h:1
 msgid "Screen Resolution"
diff --git a/po/sr.po b/po/sr.po
index 6329ddcc..73a5d172 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -676,9 +676,9 @@ msgid "Choose the display manager that enable to select which user to log in"
 msgstr ""
 
 #: ../control-center:274
-#, fuzzy, c-format
+#, c-format
 msgid "Fax"
-msgstr "KFax"
+msgstr "Факс"
 
 #: ../control-center:275
 #, c-format
@@ -1063,7 +1063,7 @@ msgstr "ТВ картица"
 #: ../control-center:655
 #, c-format
 msgid "UPS"
-msgstr ""
+msgstr "UPS"
 
 #. -PO: here power means electrical power
 #: ../control-center:658
@@ -1769,7 +1769,6 @@ msgid "System Settings"
 msgstr "Custom диск партиционирање"
 
 #: data/userdrake.desktop.in.h:1
-#, fuzzy
 msgid "Users and Groups"
 msgstr "Корисници и групе"
 
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 6b40f76d..ef632f48 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -676,9 +676,9 @@ msgid "Choose the display manager that enable to select which user to log in"
 msgstr ""
 
 #: ../control-center:274
-#, fuzzy, c-format
+#, c-format
 msgid "Fax"
-msgstr "KFax"
+msgstr "Faks"
 
 #: ../control-center:275
 #, c-format
@@ -1064,7 +1064,7 @@ msgstr "TV kartica"
 #: ../control-center:655
 #, c-format
 msgid "UPS"
-msgstr ""
+msgstr "UPS"
 
 #. -PO: here power means electrical power
 #: ../control-center:658
@@ -1770,7 +1770,6 @@ msgid "System Settings"
 msgstr "Custom disk particioniranje"
 
 #: data/userdrake.desktop.in.h:1
-#, fuzzy
 msgid "Users and Groups"
 msgstr "Korisnici i grupe"
 
diff --git a/po/ta.po b/po/ta.po
index 7c0e65a6..aa60f66d 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -1763,9 +1763,8 @@ msgid "System Settings"
 msgstr "வகிர்தலை தனிப்பயனாக்கு"
 
 #: data/userdrake.desktop.in.h:1
-#, fuzzy
 msgid "Users and Groups"
-msgstr "பயனர்களும் குழுக்களும்"
+msgstr "பயனீட்டாளர்கள் மற்றும் குழுக்கள்"
 
 #: data/XFDrake-Resolution.desktop.in.h:1
 msgid "Screen Resolution"
diff --git a/po/th.po b/po/th.po
index 23cdb033..ab4901d4 100644
--- a/po/th.po
+++ b/po/th.po
@@ -660,9 +660,9 @@ msgid "Choose the display manager that enable to select which user to log in"
 msgstr ""
 
 #: ../control-center:274
-#, fuzzy, c-format
+#, c-format
 msgid "Fax"
-msgstr "โทรสาร - K"
+msgstr "โทรสาร"
 
 #: ../control-center:275
 #, c-format
@@ -999,9 +999,9 @@ msgid "Set the system security level and the periodic security audit"
 msgstr ""
 
 #: ../control-center:614
-#, fuzzy, c-format
+#, c-format
 msgid "Permissions"
-msgstr "เวอร์ชั่น: %s\n"
+msgstr "สิทธิ์"
 
 #: ../control-center:615
 #, c-format
@@ -1254,7 +1254,7 @@ msgstr ""
 #: ../control-center:813
 #, c-format
 msgid "Remote administration"
-msgstr ""
+msgstr "การดูแลระบบระยะไกล"
 
 #: ../control-center:814
 #, c-format
@@ -1723,9 +1723,8 @@ msgid "Hard Drives"
 msgstr "ฮาร์ดไดร์"
 
 #: data/proxy.desktop.in.h:1
-#, fuzzy
 msgid "Proxy Configuration"
-msgstr "Proc Configuration"
+msgstr "ตั้งค่าพร็อกซี"
 
 #: data/removable.desktop.in.h:1
 #, fuzzy
@@ -1743,9 +1742,8 @@ msgid "System Settings"
 msgstr "กำลังพาร์ติชั่น Custom disk"
 
 #: data/userdrake.desktop.in.h:1
-#, fuzzy
 msgid "Users and Groups"
-msgstr "เพิ่มหรือลบโปรแกรม"
+msgstr "ผู้ใช้และกลุ่มผู้ใช้"
 
 #: data/XFDrake-Resolution.desktop.in.h:1
 msgid "Screen Resolution"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 082744c3..4efae9b7 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -681,9 +681,9 @@ msgid "Fax"
 msgstr "傳真"
 
 #: ../control-center:275
-#, fuzzy, c-format
+#, c-format
 msgid "Configure a fax server"
-msgstr "設定 web"
+msgstr "設定傳真伺服器"
 
 #: ../control-center:284 ../drakxconf:31
 #, c-format