diff options
Diffstat (limited to 'kopete/kopete')
-rw-r--r-- | kopete/kopete/eventsrc | 175 | ||||
-rw-r--r-- | kopete/kopete/kimiface.h | 4 | ||||
-rw-r--r-- | kopete/kopete/kopeteiface.h | 4 | ||||
-rw-r--r-- | kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.cpp | 18 |
4 files changed, 6 insertions, 195 deletions
diff --git a/kopete/kopete/eventsrc b/kopete/kopete/eventsrc index 9d3cf2f7..8e3216cc 100644 --- a/kopete/kopete/eventsrc +++ b/kopete/kopete/eventsrc @@ -997,181 +997,6 @@ Comment[zh_HK]=您的 Yahoo 收件匣有新郵件 Comment[zh_TW]=新郵件送達您的 Yahoo 收件匣 default_presentation=16 -[msn_alert] -Name=MSN Alert -Name[bg]=MSN съобщение -Name[ca]=Alerta del MSN -Name[cs]=MSN upozornění -Name[da]=MSN-alarm -Name[de]=MSN-Warnung -Name[el]=Ειδοποίηση του MSN -Name[es]=Alerta MSN -Name[et]=MSN teade -Name[fa]=هشدار اماسان -Name[fi]=MSN-varoitus -Name[fr]=Alerte MSN -Name[he]=אזהרה של MSN -Name[hu]=MSN értesítő -Name[is]=MSN skeyti -Name[it]=Avviso MSN -Name[km]=សេចក្ដីជូនដំណឹង MSN -Name[lt]=MSN: „dėmesio!“ -Name[nb]=MSN-varsling -Name[nds]=MSN-Alarm -Name[ne]=एमएसएन सावधानी -Name[nl]=MSN-melding -Name[pa]=MSN ਚੇਤਾਵਨੀ -Name[pl]=Alarm MSN -Name[pt]=Alerta MSN -Name[pt_BR]=Alerta do MSN -Name[ru]=Предупреждение MSN -Name[sk]=MSN Upozornenie -Name[sl]=Alarm MSN -Name[sr]=MSN аларм -Name[sr@Latn]=MSN alarm -Name[sv]=MSN-larm -Name[tr]=MSN Uyarısı -Name[uk]=Сигнал MSN -Name[zh_CN]=MSN 提醒 -Name[zh_TW]=MSN 警告 -Comment=A new alert has been sent to you -Comment[bg]=Изпратено ви е ново съобщение -Comment[ca]=Se us ha enviat una nova alerta -Comment[cs]=Bylo vám doručeno nové upozornění -Comment[da]=En ny alarm er sendt til dig -Comment[de]=Sie haben eine neue Warnung erhalten -Comment[el]=Σας στάλθηκε μια νέα ειδοποίηση -Comment[es]=Se le ha enviado una nueva alerta -Comment[et]=Sulle saadeti uus teade -Comment[fa]=هشدار جدیدی برای شما ارسال شده است -Comment[fi]=Sinulle on lähetetty uusi varoitus -Comment[fr]=Une nouvelle alerte vous a été envoyée -Comment[he]=אזהרה חדשה נשלחה אליך -Comment[hu]=Új értesítőt küldtek Önnek -Comment[is]=Þér hefur verið sent nýtt skeyti -Comment[it]=Ti è stato inviato un avviso -Comment[ja]=新しいアラートを受信しました -Comment[km]=បានផ្ញើសេចក្ដីជូនដំណឹងទៅឲ្យអ្នក -Comment[lt]=Jums pasiųstas naujas „dėmesio!“ signalas -Comment[nb]=En ny varsling er sendt til deg -Comment[nds]=Een hett Di en niegen Alarm sendt -Comment[ne]=तपाईँलाई एउटा नयाँ सावधानी सन्देश पठाएको छ -Comment[nl]=U hebt een nieuwe melding ontvangen -Comment[pl]=Nowy alarm został wysłany do Ciebie -Comment[pt]=Foi enviada um novo alerta -Comment[pt_BR]=Um novo alerta foi enviado para você -Comment[ru]=Вам отправлено предупреждение -Comment[sk]=Bolo vám poslané nové upozornenie -Comment[sl]=Poslan vam je bil alarm -Comment[sr]=Послат вам је нови аларм -Comment[sr@Latn]=Poslat vam je novi alarm -Comment[sv]=Ett nytt larm har skickats till dig -Comment[tr]=Size yeni bir uyarı gönderildi -Comment[uk]=Вам було відіслано новий сигнал -Comment[zh_CN]=您收到了新提醒 -Comment[zh_TW]=一個新的警告已送達給您 -default_presentation=16 - -[msn_mail] -Name=MSN Mail -Name[ar]=بريد MSN -Name[be]=Пошта MSN -Name[bg]=Пристигна нова поща в MSN -Name[bn]=এমএসএন মেইল -Name[br]=Postel MSN -Name[bs]=MSN mail -Name[ca]=Correu de MSN -Name[cs]=MSN pošta -Name[da]=MSN-Mail -Name[de]=MSN-Mail -Name[es]=Correo MSN -Name[fa]=نامۀ اماسان -Name[fi]=MSN-sähköposti -Name[fr]=Courriel MSN -Name[gl]=Correo MSN -Name[he]=דוא"ל של MSN -Name[hi]=एमएसएन मेल -Name[hr]=MSN pošta -Name[hu]=MSN e-mail -Name[is]=MSN póstur -Name[it]=Posta MSN -Name[ja]=MSN メール -Name[ka]=MSN ფოსტა -Name[kk]=MSN поштасы -Name[km]=សំបុត្រ MSN -Name[lt]=MSN Paštas -Name[mk]=MSN-пошта -Name[nb]=MSN e-post -Name[nds]=MSN-Nettpost -Name[ne]=एमएसएन मेल -Name[nn]=MSN-e-post -Name[pa]=MSN ਮੇਲ -Name[pl]=Poczta MSN -Name[pt]=E-mail MSN -Name[ru]=Почта MSN -Name[sl]=E-pošta MSN -Name[sr]=MSN пошта -Name[sr@Latn]=MSN pošta -Name[sv]=MSN e-post -Name[ta]=MSN மின்னஞ்சல் -Name[tg]=Пости MSN -Name[tr]=MSN Posta -Name[uk]=Пошта MSN -Name[zh_CN]=MSN 邮件 -Comment=New email has arrived in your MSN inbox -Comment[be]=У вашай электроннай скрыні MSN новая пошта -Comment[bg]=Пристигна нова поща в MSN -Comment[bn]=আপনার এমএসএন ইনবক্সে নতুন ই-মেইল উপস্থিত হয়েছে -Comment[br]=Deuet eo ur postel nevez d'em voest degemer MSN -Comment[bs]=Stigla je nova pošta u vaš MSN sandučić -Comment[ca]=Ha arribat un nou correu a la vostra bústia de MSN -Comment[cs]=Přišla nová pošta do vaší MSN schránky -Comment[da]=Ny e-mail ankom til din MSN-indbakke -Comment[de]=Eine neue Nachricht befindet sich im MSN-Eingangsordner -Comment[el]=Μόλις έφτασε νέο e-mail στα εισερχόμενα του MSN σας -Comment[eo]=Nova poŝto ricevita -Comment[es]=Tiene correo nuevo en la cuenta de MSN -Comment[et]=Saabus uus kiri sinu MSN Inboxi -Comment[eu]=E-posta berri bat jaso da zure MSN-ko sarrerako ontzian -Comment[fa]=یک رایانامۀ جدید در دریافتی اماسان شما رسیده است -Comment[fi]=Uutta postia saapunut MSN-sähköpostilaatikkoon -Comment[fr]=Un nouveau message est arrivé dans votre boîte aux lettres MSN -Comment[gl]=Unha nova mensaxe chegou ao teu cartafol de entrada de MSN -Comment[he]=התקבל עבורך דואר חדש בתיבת הדוא"ל של MSN -Comment[hr]=Nova pošta je stigla u vaš MSN sandučić -Comment[hu]=Új levél érkezett az MSN postaládába -Comment[is]=Það er nýr póstur í MSN innhólfinu þínu -Comment[it]=È arrivata nuova posta nella tua casella MSN -Comment[ja]=MSN の受信箱に新しいメールが届きました -Comment[ka]=ახალი ელფოსტა მოვიდა MSN საფოსტო ყუთში -Comment[kk]=MSN пошта жәшігне хабарлама келді -Comment[km]=អ៊ីមែលថ្មីបានមកដល់ក្នុងប្រអប់ទទួល MSN របស់អ្នកហើយ -Comment[lt]=Į MSN pašto dėžutę gautas naujas laiškas -Comment[mk]=Пристигна нова пошта во вашето MSN-сандаче -Comment[nb]=Ny e-post er ankommet i MSN-innboksen -Comment[nds]=Du hest niege Nettpost in Dien MSN-Postingang -Comment[ne]=तपाईँको एमएसएन पत्रमञ्जूषामा नयाँ इमेल छ -Comment[nl]=Er is een nieuwe e-mail aangekomen in uw MSN-inbox -Comment[nn]=Ny e-post er komen til MSN-innboksen -Comment[pl]=Nadeszła nowa wiadomość do Twojej skrzynki odbiorczej w MSN -Comment[pt]=Chegou uma mensagem nova à sua caixa de correio do MSN -Comment[pt_BR]=chegou um novo e-mail em sua caixa de entrada MSN -Comment[ru]=Пришли новые письма в MSN -Comment[se]=Ođđa e-boasta lea boahtán du MSN-boastaboksii -Comment[sk]=Do vašej schránky MSN prišla nová správa -Comment[sl]=Nova e-pošta je prispela v vaš nabiralnik MSN -Comment[sr]=Нова порука је стигла у ваше MSN сандуче -Comment[sr@Latn]=Nova poruka je stigla u vaše MSN sanduče -Comment[sv]=Ett nytt brev har anlänt i din MSN-inkorg -Comment[ta]=உங்கள் எம்எஸ்என் அஞ்சல் பெட்டிக்கு புதிய மின்னஞ்சல் வந்துள்ளது -Comment[tg]=Ба қутии пости MSN-и шумо пайёми электронии нав омад -Comment[tr]=MSN gelen kutunuza yeni bir e-posta geldi -Comment[uk]=Прийшли нові листи у вашу скриньку MSN -Comment[zh_CN]=您的 MSN 收件箱中有新邮件到达 -Comment[zh_HK]=您的 MSN 收件匣有新郵件 -Comment[zh_TW]=新郵件送達您的 MSN 收件匣 -default_presentation=16 - [icq_authorization] Name=ICQ Authorization Name[be]=Спраўджванне асобы ICQ diff --git a/kopete/kopete/kimiface.h b/kopete/kopete/kimiface.h index 75ef7706..0af0cca6 100644 --- a/kopete/kopete/kimiface.h +++ b/kopete/kopete/kimiface.h @@ -107,7 +107,7 @@ k_dcop: * Get the KABC uid corresponding to the supplied IM address * Protocols should be * @param contactId the protocol specific identifier for the contact, eg UIN for ICQ, screenname for AIM, nick for IRC. - * @param protocol the protocol, eg one of "AIMProtocol", "MSNProtocol", "ICTQProtocol", + * @param protocol the protocol, eg one of "AIMProtocol", "ICTQProtocol", * @return a KABC uid or null if none found/ */ virtual TQString locate( const TQString & contactId, const TQString & protocol ) = 0; @@ -167,7 +167,7 @@ k_dcop: /** * Add a contact to the contact list * @param contactId the protocol specific identifier for the contact, eg UIN for ICQ, screenname for AIM, nick for IRC. - * @param protocol the protocol, eg one of "AIMProtocol", "MSNProtocol", "ICTQProtocol", ... + * @param protocol the protocol, eg one of "AIMProtocol", "ICTQProtocol", ... * @return whether the add succeeded. False may signal already present, protocol not supported, or add operation not supported. */ virtual bool addContact( const TQString &contactId, const TQString &protocol ) = 0; diff --git a/kopete/kopete/kopeteiface.h b/kopete/kopete/kopeteiface.h index f68c3c57..d715018e 100644 --- a/kopete/kopete/kopeteiface.h +++ b/kopete/kopete/kopeteiface.h @@ -105,13 +105,13 @@ k_dcop: /** * load a plugin - * the name is the name of the library: example: kopete_msn + * the name is the name of the library: example: kopete_icq * but you can ommit the kopete_ prefix */ bool loadPlugin( const TQString& name ); /** * unload a plugin - * the name is the name of the library: example: kopete_msn + * the name is the name of the library: example: kopete_icq * but you can ommit the kopete_ prefix */ bool unloadPlugin( const TQString& name ); diff --git a/kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.cpp b/kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.cpp index 42ba47f1..67b39ad8 100644 --- a/kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.cpp +++ b/kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.cpp @@ -55,7 +55,7 @@ void parseGroup( const TQString &group, const TQString &rawLine ) { // Groups that are converted can almost certainly be removed entirely - if ( group == "MSN" || group == "ICQ" || group == "Oscar" || group == "Gadu" || group == "Jabber" || group == "IRC" ) + if ( group == "ICQ" || group == "Oscar" || group == "Gadu" || group == "Jabber" || group == "IRC" ) { accountId = "EMPTY"; autoConnect = "true"; @@ -82,21 +82,7 @@ void parseGroup( const TQString &group, const TQString &rawLine ) void parseKey( const TQString &group, const TQString &key, const TQString &value, const TQString &rawLine ) { //qcerr << "*** group='" << group << "'" << endl; - if ( group == "MSN" ) - { - if ( key == "UserID" ) - accountId = value; - else if ( key == "Password" ) - password = value; - else if ( key == "AutoConnect" ) - autoConnect = value; - else if ( key == "Nick" ) - pluginData[ "displayName" ] = value; - - // All other keys are ignored for MSN, as these apply to stuff that's - // now in libkopete (and the main app) instead. - } - else if ( group == "ICQ" ) + if ( group == "ICQ" ) { if ( key == "UIN" ) accountId = value; |