Merge translation files from master branch.

1 files changed, 0 insertions, 52 deletions

diff --git a/tde-i18n-mk/messages/tdenetwork/kopete.po b/tde-i18n-mk/messages/tdenetwork/kopete.po
index 3440d1a1078..6f99b6ba462 100644
--- a/tde-i18n-mk/messages/tdenetwork/kopete.po
+++ b/tde-i18n-mk/messages/tdenetwork/kopete.po
@@ -6076,7 +6076,6 @@ msgstr "Не можев да ја отворам „%1“ за отпакува�
 #: protocols/msn/outgoingtransfer.cpp:211
 #: protocols/msn/outgoingtransfer.cpp:318
 #, fuzzy
-#| msgid "File transfers"
 msgid "File transfer canceled."
 msgstr "Преноси на датотеки"
 
@@ -6091,13 +6090,11 @@ 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 "Испрати е-пошта..."
 
@@ -6114,7 +6111,6 @@ msgstr ""
 #: protocols/msn/msnchatsession.cpp:365
 #: protocols/msn/ui/msneditaccountwidget.cpp:278
 #, fuzzy
-#| msgid "<qt>You must enter a nickname.</qt>"
 msgid "<qt>You must enter a valid email address.</qt>"
 msgstr "<qt>Мора да внесете прекар.</qt>"
 
@@ -6162,14 +6158,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 "Слика за прикажување"
 
@@ -6237,7 +6231,6 @@ msgstr "Непрочитана порака"
 
 #: protocols/msn/msncontact.cpp:317
 #, fuzzy
-#| msgid "Windows-1255 Hebrew"
 msgid "Windows Mobile"
 msgstr "Windows-1255 Еврејски"
 
@@ -6252,7 +6245,6 @@ msgstr ""
 
 #: protocols/msn/msnfiletransfersocket.cpp:44
 #, fuzzy
-#| msgid "File Transfer Settings"
 msgid "File Transfer - MSN Plugin"
 msgstr "Поставувања за пренос на датотеки"
 
@@ -6264,7 +6256,6 @@ msgstr "Настана непозната грешка"
 
 #: protocols/msn/msnfiletransfersocket.cpp:225
 #, fuzzy
-#| msgid "Connection timed out."
 msgid "Connection timed out"
 msgstr "Времето за врска истече."
 
@@ -6345,9 +6336,6 @@ msgstr ""
 
 #: protocols/msn/msnnotifysocket.cpp:757
 #, fuzzy, c-format
-#| msgid ""
-#| "_n: You have one unread message in your MSN inbox.\n"
-#| "You have %n unread messages in your MSN inbox."
 msgid ""
 "_n: You have one unread message in your MSN inbox.\n"
 "You have %n unread messages in your MSN inbox."
@@ -6358,7 +6346,6 @@ msgstr ""
 
 #: protocols/msn/msnnotifysocket.cpp:757 protocols/msn/msnnotifysocket.cpp:779
 #, fuzzy
-#| msgid "Open &Addressbook..."
 msgid "Open Inbox..."
 msgstr "Отвори &адресар..."
 
@@ -6382,7 +6369,6 @@ msgstr ""
 
 #: protocols/msn/msnprotocol.cpp:42
 #, fuzzy
-#| msgid "No Message"
 msgid "MSN Messenger"
 msgstr "Нема порака"
 
@@ -6410,7 +6396,6 @@ msgstr "На телефон"
 
 #: protocols/msn/msnprotocol.cpp:56
 #, fuzzy
-#| msgid "On the Phone"
 msgid "On The &Phone"
 msgstr "На телефон"
 
@@ -6432,13 +6417,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 "Ид. на контакт:"
 
@@ -6450,7 +6433,6 @@ msgstr ""
 
 #: protocols/msn/msnsocket.cpp:186
 #, fuzzy, c-format
-#| msgid "Unable to find the file %1."
 msgid "Unable to lookup %1"
 msgstr "Не можам да ја најдам датотеката %1."
 
@@ -6487,13 +6469,11 @@ msgstr ""
 
 #: protocols/msn/msnswitchboardsocket.cpp:126
 #, fuzzy
-#| msgid "User Defined"
 msgid "user never joined"
 msgstr "Кориснички дефинирано"
 
 #: protocols/msn/msnswitchboardsocket.cpp:131
 #, fuzzy
-#| msgid "The nickname %1 is already in use"
 msgid "The user %1 is already in this chat."
 msgstr "Прекарот %1 веќе се користи"
 
@@ -6517,7 +6497,6 @@ msgstr ""
 
 #: protocols/msn/msnswitchboardsocket.cpp:151
 #, fuzzy
-#| msgid "You have been disconnected"
 msgid "user disconnected"
 msgstr "Ве исклучија"
 
@@ -6542,7 +6521,6 @@ msgstr ""
 
 #: protocols/msn/msnswitchboardsocket.cpp:772
 #, fuzzy
-#| msgid "Message too long."
 msgid "Message too big - MSN Plugin"
 msgstr "Пораката е предолга."
 
@@ -6741,7 +6719,6 @@ 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 "Информации за корисникот"
 
@@ -6759,7 +6736,6 @@ msgstr ""
 
 #: protocols/oscar/aim/ui/aimaddcontactpage.cpp:43
 #, fuzzy
-#| msgid "Connect to the Jabber network and try again."
 msgid "Connect to the AIM network and try again."
 msgstr "Поврзете се на Џабер-мрежата и обидете се повторно."
 
@@ -14155,7 +14131,6 @@ msgstr "ID:"
 
 #: protocols/msn/ui/msnadd.ui:47 protocols/msn/ui/msnadd.ui:58
 #, fuzzy, no-c-format
-#| msgid "The Jabber ID for the account you would like to add."
 msgid "The user ID of the MSN contact you would like to add."
 msgstr "Jabber-идентитетот на сметката што сакате да ја додадете."
 
@@ -14198,16 +14173,11 @@ msgstr "Порака:"
 
 #: protocols/msn/ui/msneditaccountui.ui:17
 #, fuzzy, no-c-format
-#| msgid "A&ccount Preferences"
 msgid "Account Preferences - MSN"
 msgstr "Параметри на &сметка"
 
 #: 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 "
@@ -14219,7 +14189,6 @@ msgstr ""
 #: protocols/msn/ui/msneditaccountui.ui:156
 #: protocols/msn/ui/msneditaccountui.ui:170
 #, fuzzy, no-c-format
-#| msgid "The Jabber ID for the account you would like to use."
 msgid "The user ID of the MSN contact you would like to use."
 msgstr "Jabber-идентитетот на сметката што сакате да ја користите."
 
@@ -14369,7 +14338,6 @@ msgstr ""
 
 #: protocols/msn/ui/msneditaccountui.ui:397
 #, fuzzy, no-c-format
-#| msgid "Always send not&ifications"
 msgid "Send &typing notifications"
 msgstr "Секогаш испраќај &известувања"
 
@@ -14442,7 +14410,6 @@ msgstr "Слика за прикажување"
 
 #: protocols/msn/ui/msneditaccountui.ui:652
 #, fuzzy, no-c-format
-#| msgid "Display Picture"
 msgid "E&xport a display picture"
 msgstr "Слика за прикажување"
 
@@ -14519,8 +14486,6 @@ msgstr ""
 #: protocols/msn/ui/msneditaccountui.ui:1042
 #: protocols/msn/ui/msneditaccountui.ui:1045
 #, fuzzy, no-c-format
-#| msgid ""
-#| "Here you can see a list of contacts who added you to their contact list"
 msgid ""
 "The reverse list is the list of contacts who added you to their own contact "
 "list."
@@ -14639,7 +14604,6 @@ msgstr "Моминско име:"
 
 #: protocols/oscar/aim/ui/aimeditaccountui.ui:24
 #, fuzzy, no-c-format
-#| msgid "A&ccount Preferences"
 msgid "Account Preferences - AIM"
 msgstr "Параметри на &сметка"
 
@@ -14664,10 +14628,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 "
@@ -14685,17 +14645,12 @@ msgstr "П&араметри на сметка"
 #: 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)."
@@ -14711,16 +14666,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."
@@ -14774,7 +14725,6 @@ msgstr "Моминско име:"
 
 #: protocols/oscar/aim/ui/aiminfobase.ui:122
 #, fuzzy, no-c-format
-#| msgid "minutes"
 msgid "Idle minutes:"
 msgstr "минути"
 
@@ -14785,13 +14735,11 @@ msgstr "Профил:"
 
 #: protocols/oscar/aim/ui/aimjoinchatbase.ui:27
 #, fuzzy, no-c-format
-#| msgid "Please enter the name for the new group:"
 msgid "Please enter the name of the chat room you wish to join."
 msgstr "Внесете го името за новата група:"
 
 #: protocols/oscar/aim/ui/aimjoinchatbase.ui:69
 #, fuzzy, no-c-format
-#| msgid "Hos&tname:"
 msgid "Room &name:"
 msgstr "Име на сер&вер:"