Merge translation files from master branch.

1 files changed, 0 insertions, 41 deletions

diff --git a/tde-i18n-th/messages/tdenetwork/kopete.po b/tde-i18n-th/messages/tdenetwork/kopete.po
index f880fee5ba7..8bc1651eff4 100644
--- a/tde-i18n-th/messages/tdenetwork/kopete.po
+++ b/tde-i18n-th/messages/tdenetwork/kopete.po
@@ -2759,7 +2759,6 @@ msgstr ""
 
 #: plugins/netmeeting/netmeetinginvitation.cpp:68
 #, fuzzy
-#| msgid "&Refuse"
 msgid "Refuse"
 msgstr "&ปฏิเสธ"
 
@@ -5897,7 +5896,6 @@ msgstr "ไม่สามารถเปิดแฟ้ม \"%1\" เพื่�
 #: protocols/msn/outgoingtransfer.cpp:211
 #: protocols/msn/outgoingtransfer.cpp:318
 #, fuzzy
-#| msgid "File Transfer"
 msgid "File transfer canceled."
 msgstr "ถ่ายโอนแฟ้ม"
 
@@ -5907,13 +5905,11 @@ msgstr ""
 
 #: protocols/msn/msnaccount.cpp:84
 #, fuzzy
-#| msgid "Change A&lias..."
 msgid "&Change Display Name..."
 msgstr "เปลี่ยนชื่อที่แ&สดง..."
 
 #: protocols/msn/msnaccount.cpp:85
 #, fuzzy
-#| msgid "Start &Chat..."
 msgid "&Start Chat..."
 msgstr "เริ่&มคุย..."
 
@@ -6064,7 +6060,6 @@ msgstr ""
 
 #: protocols/msn/msnfiletransfersocket.cpp:44
 #, fuzzy
-#| msgid "File Transfer Settings"
 msgid "File Transfer - MSN Plugin"
 msgstr "ตั้งค่าการถ่ายโอนแฟ้ม"
 
@@ -6172,7 +6167,6 @@ msgstr ""
 
 #: protocols/msn/msnnotifysocket.cpp:905
 #, fuzzy
-#| msgid "More Information..."
 msgid "More Information"
 msgstr "ข้อมูลเพิ่มเติม..."
 
@@ -6186,7 +6180,6 @@ msgstr ""
 
 #: protocols/msn/msnprotocol.cpp:42
 #, fuzzy
-#| msgid "No Message"
 msgid "MSN Messenger"
 msgstr "ไม่มีข้อความ"
 
@@ -6210,7 +6203,6 @@ msgstr ""
 
 #: protocols/msn/msnprotocol.cpp:56
 #, fuzzy
-#| msgid "Private Phone"
 msgid "On the Phone"
 msgstr "โทรศัพท์ส่วนตัว"
 
@@ -6228,7 +6220,6 @@ msgstr ""
 
 #: protocols/msn/msnprotocol.cpp:58
 #, fuzzy
-#| msgid "Offline"
 msgid "&Offline"
 msgstr "ไม่อยู่ในสาย"
 
@@ -6238,13 +6229,11 @@ msgstr ""
 
 #: protocols/msn/msnprotocol.cpp:67
 #, fuzzy
-#| msgid "Remove Contact"
 msgid "Remote Client"
 msgstr "ลบรายชื่อติดต่อ"
 
 #: protocols/msn/msnprotocol.cpp:68
 #, fuzzy
-#| msgid "Contact ID:"
 msgid "Contact GUID"
 msgstr "ชื่อระบุตัว:"
 
@@ -6256,7 +6245,6 @@ msgstr ""
 
 #: protocols/msn/msnsocket.cpp:186
 #, fuzzy, c-format
-#| msgid "Unable to find the file %1."
 msgid "Unable to lookup %1"
 msgstr "ไม่เจอแฟ้ม %1"
 
@@ -6293,7 +6281,6 @@ msgstr ""
 
 #: protocols/msn/msnswitchboardsocket.cpp:126
 #, fuzzy
-#| msgid "User Defined"
 msgid "user never joined"
 msgstr "ผู้ใช้กำหนดเอง"
 
@@ -6321,7 +6308,6 @@ msgstr ""
 
 #: protocols/msn/msnswitchboardsocket.cpp:151
 #, fuzzy
-#| msgid "You have been disconnected."
 msgid "user disconnected"
 msgstr "คุณถูกตัดการเชื่อมต่อ"
 
@@ -6499,8 +6485,6 @@ msgstr ""
 
 #: protocols/oscar/aim/aimprotocol.cpp:192
 #, fuzzy
-#| msgid ""
-#| "Are you sure you want to remove the contact  '%1' from your contact list?"
 msgid "Do you want to add '%1' to your contact list?"
 msgstr "คุณแน่ใจหรือว่าต้องการลบรายชื่อติดต่อ '%1' ออกไปจากรายการติดต่อ?"
 
@@ -6530,7 +6514,6 @@ msgstr ""
 
 #: protocols/oscar/aim/aimprotocol.cpp:243
 #, fuzzy
-#| msgid "User Defined"
 msgid "User Profile"
 msgstr "ผู้ใช้กำหนดเอง"
 
@@ -6543,7 +6526,6 @@ msgstr ""
 #: protocols/oscar/aim/aimuserinfo.cpp:136
 #: protocols/oscar/aim/aimuserinfo.cpp:153
 #, fuzzy, c-format
-#| msgid "User Info for %1"
 msgid "User Information on %1"
 msgstr "ข้อมูลผู้ใช้สำหรับ %1"
 
@@ -6565,7 +6547,6 @@ msgstr ""
 
 #: protocols/oscar/aim/ui/aimaddcontactpage.cpp:66
 #, fuzzy
-#| msgid "Nick Name"
 msgid "No Screen Name"
 msgstr "ชื่อเล่น"
 
@@ -13829,13 +13810,11 @@ msgstr ""
 
 #: protocols/msn/config/msnprefs.ui:97
 #, fuzzy, no-c-format
-#| msgid "Away Message"
 msgid "Away Messages"
 msgstr "ข้อความเมื่อไม่อยู่"
 
 #: protocols/msn/config/msnprefs.ui:132
 #, fuzzy, no-c-format
-#| msgid "Away message:"
 msgid "Send &away messages"
 msgstr "ข้อความเมื่อไม่อยู่:"
 
@@ -13861,7 +13840,6 @@ msgstr ""
 
 #: protocols/msn/ui/msnadd.ui:47 protocols/msn/ui/msnadd.ui:58
 #, fuzzy, no-c-format
-#| msgid "The port on the server that you would like to connect to."
 msgid "The user ID of the MSN contact you would like to add."
 msgstr "พอร์ตบนเซิร์ฟเวอร์ที่คุณต้องการจะติดต่อด้วย"
 
@@ -13894,13 +13872,11 @@ msgstr ""
 
 #: protocols/msn/ui/msndebugrawcommand_base.ui:73
 #, fuzzy, no-c-format
-#| msgid "&Online"
 msgid "Add &new line"
 msgstr "อยู่ใน&สาย"
 
 #: protocols/msn/ui/msndebugrawcommand_base.ui:92
 #, fuzzy, no-c-format
-#| msgid "No Message"
 msgid "Message:"
 msgstr "ไม่มีข้อความ"
 
@@ -13920,7 +13896,6 @@ msgstr ""
 #: protocols/msn/ui/msneditaccountui.ui:156
 #: protocols/msn/ui/msneditaccountui.ui:170
 #, fuzzy, no-c-format
-#| msgid "The port on the server that you would like to connect to."
 msgid "The user ID of the MSN contact you would like to use."
 msgstr "พอร์ตบนเซิร์ฟเวอร์ที่คุณต้องการจะติดต่อด้วย"
 
@@ -14152,7 +14127,6 @@ msgstr ""
 
 #: protocols/msn/ui/msneditaccountui.ui:693
 #, fuzzy, no-c-format
-#| msgid "&Send Single Message..."
 msgid "&Select Image..."
 msgstr "ส่&งข้อความเดี่ยวๆ..."
 
@@ -14177,7 +14151,6 @@ msgstr ""
 
 #: protocols/msn/ui/msneditaccountui.ui:876
 #, fuzzy, no-c-format
-#| msgid "&Block Contact"
 msgid "Bloc&ked contacts:"
 msgstr "&บล็อครายชื่อติดต่อ"
 
@@ -14284,19 +14257,16 @@ msgstr ""
 
 #: protocols/msn/ui/msninfo.ui:46
 #, fuzzy, no-c-format
-#| msgid "Email Address"
 msgid "Email address:"
 msgstr "ที่อยู่อีเมล"
 
 #: protocols/msn/ui/msninfo.ui:112
 #, fuzzy, no-c-format
-#| msgid "Away message:"
 msgid "Personal message:"
 msgstr "ข้อความเมื่อไม่อยู่:"
 
 #: protocols/msn/ui/msninfo.ui:130
 #, fuzzy, no-c-format
-#| msgid "Phone:"
 msgid "Phones"
 msgstr "โทรศัพท์:"
 
@@ -14312,7 +14282,6 @@ msgstr ""
 
 #: protocols/msn/ui/msninfo.ui:194
 #, fuzzy, no-c-format
-#| msgid "Show or hide the contact list"
 msgid "Show whether you are on the contact list of this user"
 msgstr "แสดงหรือซ่อนรายการติดต่อ"
 
@@ -14375,17 +14344,12 @@ msgstr "ตั้งค่าบัญชีผู้ใช้ - Jabber"
 #: protocols/oscar/aim/ui/aimeditaccountui.ui:265
 #: protocols/oscar/aim/ui/aimeditaccountui.ui:282
 #, fuzzy, no-c-format
-#| msgid ""
-#| "The IP address or hostname of the server you would like to connect to."
 msgid "The IP address or hostmask of the AIM server you wish to connect to."
 msgstr "ที่อยู่ IP หรือชื่อโฮสต์ของเซิร์ฟเวอร์ที่คุณต้องการจะเชื่อมต่อด้วย"
 
 #: protocols/oscar/aim/ui/aimeditaccountui.ui:268
 #: protocols/oscar/aim/ui/aimeditaccountui.ui:285
 #, fuzzy, no-c-format
-#| msgid ""
-#| "The IP address or hostname of the server you would like to connect to "
-#| "(for example jabber.org)."
 msgid ""
 "The IP address or hostmask of the AIM server you wish to connect to.  "
 "Normally you will want the default (iwarg.ddns.net)."
@@ -14399,16 +14363,12 @@ msgstr ""
 #: protocols/oscar/aim/ui/aimeditaccountui.ui:302
 #: protocols/oscar/aim/ui/aimeditaccountui.ui:325
 #, fuzzy, no-c-format
-#| msgid "The port on the server that you would like to connect to."
 msgid "The port on the AIM server that you would like to connect to."
 msgstr "พอร์ตบนเซิร์ฟเวอร์ที่คุณต้องการจะติดต่อด้วย"
 
 #: protocols/oscar/aim/ui/aimeditaccountui.ui:305
 #: protocols/oscar/aim/ui/aimeditaccountui.ui:328
 #, fuzzy, no-c-format
-#| msgid ""
-#| "The port on the server that you would like to connect to (default is "
-#| "5222)."
 msgid ""
 "The port on the AIM server that you would like to connect to.  Normally this "
 "is 5190."
@@ -14477,7 +14437,6 @@ msgstr ""
 
 #: protocols/oscar/aim/ui/aimjoinchatbase.ui:69
 #, fuzzy, no-c-format
-#| msgid "Room:"
 msgid "Room &name:"
 msgstr "ห้อง:"