Merge translation files from master branch.

1 files changed, 0 insertions, 60 deletions

diff --git a/tde-i18n-uz@cyrillic/messages/tdenetwork/kopete.po b/tde-i18n-uz@cyrillic/messages/tdenetwork/kopete.po
index 7701d7e6442..b47ea736c61 100644
--- a/tde-i18n-uz@cyrillic/messages/tdenetwork/kopete.po
+++ b/tde-i18n-uz@cyrillic/messages/tdenetwork/kopete.po
@@ -5926,31 +5926,26 @@ msgstr "Почта қутисини &очиш"
 
 #: protocols/msn/msnaccount.cpp:84
 #, fuzzy
-#| msgid "Display Name"
 msgid "&Change Display Name..."
 msgstr "Кўринадиган исм"
 
 #: protocols/msn/msnaccount.cpp:85
 #, fuzzy
-#| msgid "Start &Chat..."
 msgid "&Start Chat..."
 msgstr "Суҳбатни &бошлаш"
 
 #: protocols/msn/msnaccount.cpp:271 protocols/msn/msnchatsession.cpp:82
 #, fuzzy
-#| msgid "Send Email..."
 msgid "Send Raw C&ommand..."
 msgstr "Хат жўнатиш"
 
 #: protocols/msn/msnaccount.cpp:332
 #, fuzzy
-#| msgid "MSN Plugin"
 msgid "Start Chat - MSN Plugin"
 msgstr "MSN плагини"
 
 #: protocols/msn/msnaccount.cpp:333
 #, fuzzy
-#| msgid "Please enter the name of the chat room you wish to join."
 msgid ""
 "Please enter the email address of the person with whom you want to chat:"
 msgstr "Қўшилмоқчи бўлган чат хонасининг номини киритинг."
@@ -5959,7 +5954,6 @@ msgstr "Қўшилмоқчи бўлган чат хонасининг номин
 #: protocols/msn/msnchatsession.cpp:365
 #: protocols/msn/ui/msneditaccountwidget.cpp:278
 #, fuzzy
-#| msgid "<qt>You must enter a valid password.</qt>"
 msgid "<qt>You must enter a valid email address.</qt>"
 msgstr "<qt>Тўғри махфий сўзини киритиш керак.</qt>"
 
@@ -5988,13 +5982,11 @@ msgstr ""
 
 #: protocols/msn/msnaccount.cpp:436
 #, fuzzy
-#| msgid "Connection Lost."
 msgid "Connection Lost - MSN Plugin"
 msgstr "Алоқа узилди."
 
 #: protocols/msn/msnchatsession.cpp:86
 #, fuzzy
-#| msgid "&Send Message"
 msgid "Send Nudge"
 msgstr "Хабар &жўнатиш"
 
@@ -6008,14 +6000,12 @@ msgstr ""
 
 #: protocols/msn/msnchatsession.cpp:98
 #, fuzzy
-#| msgid "Display Picture"
 msgid "Request Display Picture"
 msgstr "Кўрсатиладиган расм"
 
 #: protocols/msn/msnchatsession.cpp:105
 #: protocols/msn/ui/msneditaccountwidget.cpp:330
 #, fuzzy
-#| msgid "Display Picture"
 msgid "MSN Display Picture"
 msgstr "Кўрсатиладиган расм"
 
@@ -6025,13 +6015,11 @@ msgstr "Алоқа узилди"
 
 #: protocols/msn/msnchatsession.cpp:327
 #, fuzzy
-#| msgid "&Other..."
 msgid "Other..."
 msgstr "&Бошқа..."
 
 #: protocols/msn/msnchatsession.cpp:357
 #, fuzzy
-#| msgid "Please enter the name of the chat room you wish to join."
 msgid "Please enter the email address of the person you want to invite:"
 msgstr "Қўшилмоқчи бўлган чат хонасининг номини киритинг."
 
@@ -6080,19 +6068,16 @@ msgstr ""
 
 #: protocols/msn/msncontact.cpp:315
 #, fuzzy
-#| msgid "Read Message"
 msgid "Web Messenger"
 msgstr "Хабарни ўқиш"
 
 #: protocols/msn/msncontact.cpp:317
 #, fuzzy
-#| msgid "Windows-1255 Hebrew"
 msgid "Windows Mobile"
 msgstr "Windows-1255 Яҳудийча"
 
 #: protocols/msn/msncontact.cpp:319
 #, fuzzy
-#| msgid "Mobile:"
 msgid "MSN Mobile"
 msgstr "Уяли:"
 
@@ -6102,7 +6087,6 @@ msgstr ""
 
 #: protocols/msn/msnfiletransfersocket.cpp:44
 #, fuzzy
-#| msgid "File Transfer Settings"
 msgid "File Transfer - MSN Plugin"
 msgstr "Файл узатиш мосламалари"
 
@@ -6115,7 +6099,6 @@ msgstr "Номаълум хато рўй берди"
 
 #: protocols/msn/msnfiletransfersocket.cpp:225
 #, fuzzy
-#| msgid "Connection timed out."
 msgid "Connection timed out"
 msgstr "Алоқа ўрнатиш учун вақт тугади."
 
@@ -6211,13 +6194,11 @@ msgstr ""
 
 #: protocols/msn/msnnotifysocket.cpp:905
 #, fuzzy
-#| msgid "More Information..."
 msgid "More Information"
 msgstr "Кўпроқ маълумот"
 
 #: protocols/msn/msnnotifysocket.cpp:908
 #, fuzzy
-#| msgid "Description"
 msgid "Manage Subscription"
 msgstr "Таърифи"
 
@@ -6227,7 +6208,6 @@ msgstr ""
 
 #: protocols/msn/msnprotocol.cpp:42
 #, fuzzy
-#| msgid "No Message"
 msgid "MSN Messenger"
 msgstr "Хабарсиз"
 
@@ -6239,13 +6219,11 @@ msgstr "Он&лайн"
 
 #: protocols/msn/msnprotocol.cpp:54
 #, fuzzy
-#| msgid "Be right back"
 msgid "Be Right Back"
 msgstr "Тезда келаман"
 
 #: protocols/msn/msnprotocol.cpp:54
 #, fuzzy
-#| msgid "Be right back"
 msgid "Be &Right Back"
 msgstr "Тезда келаман"
 
@@ -6279,13 +6257,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 "Алоқа ID:"
 
@@ -6297,7 +6273,6 @@ msgstr ""
 
 #: protocols/msn/msnsocket.cpp:186
 #, fuzzy, c-format
-#| msgid "Unable to Connect '%1'"
 msgid "Unable to lookup %1"
 msgstr "'%1' билан боғланиб бўлмади"
 
@@ -6334,13 +6309,11 @@ msgstr ""
 
 #: protocols/msn/msnswitchboardsocket.cpp:126
 #, fuzzy
-#| msgid "User Defined"
 msgid "user never joined"
 msgstr "Фойдаланувчи аниқлаган"
 
 #: protocols/msn/msnswitchboardsocket.cpp:131
 #, fuzzy
-#| msgid "The resource is already in use."
 msgid "The user %1 is already in this chat."
 msgstr "Манба аллақачон ишлатилмоқда."
 
@@ -6363,7 +6336,6 @@ msgstr ""
 
 #: protocols/msn/msnswitchboardsocket.cpp:151
 #, fuzzy
-#| msgid "You have been disconnected"
 msgid "user disconnected"
 msgstr "Алоқа узилди"
 
@@ -6392,7 +6364,6 @@ msgstr ""
 
 #: protocols/msn/msnswitchboardsocket.cpp:843
 #, fuzzy
-#| msgid "Connection closed"
 msgid "connection closed"
 msgstr "Алоқа узилди"
 
@@ -6409,7 +6380,6 @@ msgstr ""
 
 #: protocols/msn/ui/msneditaccountwidget.cpp:322
 #, fuzzy
-#| msgid "The contact XXX added you in his contactlist"
 msgid "Here you can see a list of contacts who added you to their contact list"
 msgstr "XXX сизни ўз рўйхатига қўшди"
 
@@ -6437,7 +6407,6 @@ msgstr ""
 
 #: protocols/msn/webcam.cpp:91
 #, fuzzy
-#| msgid "&Decline"
 msgid "Decline"
 msgstr "Рад &этиш"
 
@@ -6455,7 +6424,6 @@ msgstr ""
 
 #: protocols/oscar/aim/aimaccount.cpp:325
 #, fuzzy
-#| msgid "Start &Chat..."
 msgid "Join Chat..."
 msgstr "Суҳбатни &бошлаш"
 
@@ -6545,8 +6513,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' рўйхатдан олиб ташлашга ишончингиз комилми?"
 
@@ -6558,13 +6524,11 @@ msgstr ""
 
 #: protocols/oscar/aim/aimprotocol.cpp:236
 #, fuzzy
-#| msgid "Mobile:"
 msgid "Mobile"
 msgstr "Уяли:"
 
 #: protocols/oscar/aim/aimprotocol.cpp:239
 #, fuzzy
-#| msgid "Mobile:"
 msgid "Mobile Away"
 msgstr "Уяли:"
 
@@ -6580,7 +6544,6 @@ msgstr ""
 
 #: protocols/oscar/aim/aimprotocol.cpp:243
 #, fuzzy
-#| msgid "Profile:"
 msgid "User Profile"
 msgstr "Профил:"
 
@@ -6593,13 +6556,11 @@ msgstr ""
 #: protocols/oscar/aim/aimuserinfo.cpp:136
 #: protocols/oscar/aim/aimuserinfo.cpp:153
 #, fuzzy, c-format
-#| msgid "User Information"
 msgid "User Information on %1"
 msgstr "Фойдаланувчи ҳақида маълумот"
 
 #: protocols/oscar/aim/aimuserinfo.cpp:90
 #, fuzzy
-#| msgid "Profile:"
 msgid "&Save Profile"
 msgstr "Профил:"
 
@@ -6617,7 +6578,6 @@ msgstr ""
 
 #: protocols/oscar/aim/ui/aimaddcontactpage.cpp:66
 #, fuzzy
-#| msgid "Screen name:"
 msgid "No Screen Name"
 msgstr "Фойдаланувчи:"
 
@@ -7463,7 +7423,6 @@ msgstr ""
 
 #: protocols/oscar/oscaraccount.cpp:810
 #, fuzzy
-#| msgid "AIM screen name:"
 msgid ""
 "_: AIM user id\n"
 "screen name"
@@ -13930,7 +13889,6 @@ msgstr ""
 
 #: protocols/msn/ui/msnadd.ui:47 protocols/msn/ui/msnadd.ui:58
 #, fuzzy, no-c-format
-#| msgid "The delivery service that you would like to use."
 msgid "The user ID of the MSN contact you would like to add."
 msgstr "Қўлламоқчи бўлган SMS жўнатиш хизмати."
 
@@ -13978,10 +13936,6 @@ msgstr "Ҳисоб мосламалари - MSN"
 
 #: protocols/msn/ui/msneditaccountui.ui:102
 #, fuzzy, no-c-format
-#| msgid ""
-#| "To connect to the ICQ network, you will need an ICQ account.<br><br>\n"
-#| "If you do not currently have an ICQ account, please click the button to "
-#| "create one."
 msgid ""
 "To connect to the Microsoft network, you will need a Microsoft Passport."
 "<br><br>If you do not currently have a Passport, please click the button to "
@@ -13994,7 +13948,6 @@ msgstr ""
 #: protocols/msn/ui/msneditaccountui.ui:156
 #: protocols/msn/ui/msneditaccountui.ui:170
 #, fuzzy, no-c-format
-#| msgid "The delivery service that you would like to use."
 msgid "The user ID of the MSN contact you would like to use."
 msgstr "Қўлламоқчи бўлган SMS жўнатиш хизмати."
 
@@ -14125,7 +14078,6 @@ msgstr "Шахсий маълумот"
 
 #: protocols/msn/ui/msneditaccountui.ui:377
 #, fuzzy, no-c-format
-#| msgid "General information"
 msgid "Send client information"
 msgstr "Умумий маълумот"
 
@@ -14146,7 +14098,6 @@ msgstr ""
 
 #: protocols/msn/ui/msneditaccountui.ui:397
 #, fuzzy, no-c-format
-#| msgid "Always send not&ifications"
 msgid "Send &typing notifications"
 msgstr "Доим ог&оҳлантириш жўнатиш"
 
@@ -14255,7 +14206,6 @@ msgstr ""
 
 #: protocols/msn/ui/msneditaccountui.ui:876
 #, fuzzy, no-c-format
-#| msgid "Allo&wed contacts:"
 msgid "Bloc&ked contacts:"
 msgstr "Рухсат бери&лган алоқалар:"
 
@@ -14294,7 +14244,6 @@ msgstr "&Тескари рўйхатни кўрсатиш"
 #: protocols/msn/ui/msneditaccountui.ui:1042
 #: protocols/msn/ui/msneditaccountui.ui:1045
 #, fuzzy, no-c-format
-#| msgid "The contact XXX added you in his contactlist"
 msgid ""
 "The reverse list is the list of contacts who added you to their own contact "
 "list."
@@ -14390,7 +14339,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 "Алоқалар рўйхатини кўрсатиш ёки бекитиш"
 
@@ -14438,10 +14386,6 @@ msgstr ""
 
 #: protocols/oscar/aim/ui/aimeditaccountui.ui:175
 #, fuzzy, no-c-format
-#| msgid ""
-#| "To connect to the ICQ network, you will need an ICQ account.<br><br>\n"
-#| "If you do not currently have an ICQ account, please click the button to "
-#| "create one."
 msgid ""
 "To connect to the AOL Instant Messaging network, you will need to use a "
 "screen name from AIM, AOL, or .Mac.<br><br>If you do not currently have an "
@@ -14479,7 +14423,6 @@ msgstr ""
 #: protocols/oscar/aim/ui/aimeditaccountui.ui:302
 #: protocols/oscar/aim/ui/aimeditaccountui.ui:325
 #, fuzzy, no-c-format
-#| msgid "The delivery service that you would like to use."
 msgid "The port on the AIM server that you would like to connect to."
 msgstr "Қўлламоқчи бўлган SMS жўнатиш хизмати."
 
@@ -14499,7 +14442,6 @@ msgstr ""
 
 #: protocols/oscar/aim/ui/aimeditaccountui.ui:392
 #, fuzzy, no-c-format
-#| msgid "Video Settings"
 msgid "Visibility settings"
 msgstr "Видео мосламалари"
 
@@ -14530,7 +14472,6 @@ msgstr ""
 
 #: protocols/oscar/aim/ui/aimeditaccountui.ui:443
 #, fuzzy, no-c-format
-#| msgid "Not in your contact list"
 msgid "Allow only contact list's users"
 msgstr "Алоқалар рўйхатида эмас"
 
@@ -14561,7 +14502,6 @@ msgstr "Хонанинг &номи:"
 
 #: protocols/oscar/aim/ui/aimjoinchatbase.ui:80
 #, fuzzy, no-c-format
-#| msgid "C&hange..."
 msgid "E&xchange:"
 msgstr "Ўз&гартириш"