Commit deae9bbf authored by Script Kiddy's avatar Script Kiddy
Browse files

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
parent 2914eef8
......@@ -3,7 +3,6 @@ Type=ServiceType
X-KDE-ServiceType=KContacts/IMProtocol
X-KDE-KAddressBook-CEWVersion=1
Name=KAddressbook Instant Messaging Protocol
Name[ast]=Protocolu de mensaxería nel intre KAddressbook
Name[bs]=Protokol brzih poruka K adresara
Name[ca]=Protocol de missatgeria instantània del KAddressbook
Name[ca@valencia]=Protocol de missatgeria instantània del KAddressbook
......
......@@ -6,7 +6,6 @@ X-KDE-InstantMessagingKABCField=messaging/aim
X-KDE-InstantMessagingKContactField=aim
Comment=AIM Protocol
Comment[ar]=ميفاق AIM
Comment[ast]=Protocolu AIM
Comment[bs]=AIM Protokol
Comment[ca]=Protocol AIM
Comment[ca@valencia]=Protocol AIM
......
......@@ -5,7 +5,6 @@ X-KDE-ServiceTypes=KContacts/IMProtocol,KPluginInfo
X-KDE-InstantMessagingKContactField=facebook
X-KDE-InstantMessagingKABCField=messaging/facebook
Comment=Facebook Protocol
Comment[ast]=Protocolu Facebook
Comment[ca]=Protocol Facebook
Comment[ca@valencia]=Protocol Facebook
Comment[cs]=Protokol Facebook
......@@ -35,7 +34,6 @@ Comment[uk]=Протокол Facebook
Comment[x-test]=xxFacebook Protocolxx
Comment[zh_CN]=Facebook 协议
Name=Facebook
Name[ast]=Facebook
Name[ca]=Facebook
Name[ca@valencia]=Facebook
Name[cs]=Facebook
......
......@@ -6,7 +6,6 @@ X-KDE-InstantMessagingKABCField=messaging/gadu
X-KDE-InstantMessagingKContactField=gadugadu
Comment=Gadu-Gadu Protocol
Comment[ar]=ميفاق غادو-غادو
Comment[ast]=Protocolu Gadu-Gadu
Comment[bs]=Gadu-Gadu Protokol
Comment[ca]=Protocol Gadu-Gadu
Comment[ca@valencia]=Protocol Gadu-Gadu
......@@ -57,7 +56,6 @@ Comment[zh_CN]=Gadu-Gadu 协议
Comment[zh_TW]=Gadu-Gadu 協定
Name=Gadu-Gadu
Name[ar]=غادو-غادو
Name[ast]=Gadu-Gadu
Name[bs]=Gadu-Gadu
Name[ca]=Gadu-Gadu
Name[ca@valencia]=Gadu-Gadu
......
......@@ -6,7 +6,6 @@ X-KDE-InstantMessagingKABCField=messaging/googletalk
X-KDE-InstantMessagingKContactField=googletalk
Comment=Google Talk
Comment[ar]=غوغل توك
Comment[ast]=Google Talk
Comment[bs]=Google Talk
Comment[ca]=Google Talk
Comment[ca@valencia]=Google Talk
......@@ -49,7 +48,6 @@ Comment[zh_CN]=Google Talk
Comment[zh_TW]=Google Talk
Name=Google Talk
Name[ar]=غوغل توك
Name[ast]=Google Talk
Name[bs]=Google Talk
Name[ca]=Google Talk
Name[ca@valencia]=Google Talk
......
......@@ -6,7 +6,6 @@ X-KDE-InstantMessagingKABCField=messaging/groupwise
Comment=Novell GroupWise Messenger
Comment[ar]=مرسالة نوفل GroupWise
Comment[ast]=Novell GroupWise Messenger
Comment[bs]=Novell GroupWise mesendžer
Comment[ca]=Novell GroupWise Messenger
Comment[ca@valencia]=Novell GroupWise Messenger
......@@ -56,7 +55,6 @@ Comment[x-test]=xxNovell GroupWise Messengerxx
Comment[zh_CN]=Novell GroupWise Messenger
Comment[zh_TW]=Novell GroupWise 即時訊息
Name=GroupWise
Name[ast]=GroupWise
Name[bs]=GroupWise
Name[ca]=GroupWise
Name[ca@valencia]=GroupWise
......
......@@ -6,7 +6,6 @@ X-KDE-InstantMessagingKABCField=messaging/icq
X-KDE-InstantMessagingKContactField=icq
Comment=ICQ Protocol
Comment[ar]=ميفاق ICQ
Comment[ast]=Protocolu ICQ
Comment[bs]=ICQ Protokol
Comment[ca]=Protocol ICQ
Comment[ca@valencia]=Protocol ICQ
......@@ -56,7 +55,6 @@ Comment[x-test]=xxICQ Protocolxx
Comment[zh_CN]=ICQ 协议
Comment[zh_TW]=ICQ 協定
Name=ICQ
Name[ast]=ICQ
Name[bs]=ICQ
Name[ca]=ICQ
Name[ca@valencia]=ICQ
......
......@@ -5,7 +5,6 @@ X-KDE-ServiceTypes=KContacts/IMProtocol,KPluginInfo
X-KDE-InstantMessagingKABCField=messaging/irc
Comment=Internet Relay Chat
Comment[ar]=المحادثة المنقولة بالشّابكة
Comment[ast]=Internet Relay Chat
Comment[bs]=Ćaskanje putem Interneta
Comment[ca]=Internet Relay Chat
Comment[ca@valencia]=Internet Relay Chat
......@@ -55,7 +54,6 @@ Comment[zh_CN]=IRC
Comment[zh_TW]=IRC
Name=IRC
Name[ar]=آي​آر​سي
Name[ast]=IRC
Name[bs]=IRC
Name[ca]=IRC
Name[ca@valencia]=IRC
......
......@@ -6,7 +6,6 @@ X-KDE-InstantMessagingKABCField=messaging/xmpp
X-KDE-InstantMessagingKContactField=jabber
Comment=Jabber Protocol
Comment[ar]=ميفاق جابر
Comment[ast]=Protocolu Jabber
Comment[bs]=Jabber Protokol
Comment[ca]=Protocol Jabber
Comment[ca@valencia]=Protocol Jabber
......@@ -57,7 +56,6 @@ Comment[zh_CN]=Jabber 协议
Comment[zh_TW]=Jabber 協定
Name=Jabber
Name[ar]=جابر
Name[ast]=Jabber
Name[bs]=Jabber
Name[ca]=Jabber
Name[ca@valencia]=Jabber
......
......@@ -4,7 +4,6 @@ Icon=im-meanwhile
X-KDE-ServiceTypes=KContacts/IMProtocol,KPluginInfo
X-KDE-InstantMessagingKABCField=messaging/meanwhile
Comment=Meanwhile Protocol
Comment[ast]=Protocolu Meanwhile
Comment[bs]=Meanwhile Protokol
Comment[ca]=Protocol Meanwhile
Comment[ca@valencia]=Protocol Meanwhile
......@@ -54,7 +53,6 @@ Comment[x-test]=xxMeanwhile Protocolxx
Comment[zh_CN]=Meanwhile 协议
Comment[zh_TW]=Meanwhile 協定
Name=Meanwhile
Name[ast]=Meanwhile
Name[bs]=Meanwhile
Name[ca]=Meanwhile
Name[ca@valencia]=Meanwhile
......
......@@ -6,7 +6,6 @@ X-KDE-InstantMessagingKABCField=messaging/msn
X-KDE-InstantMessagingKContactField=msn
Comment=MSN Messenger
Comment[ar]=مرسال MSN
Comment[ast]=MSN Messenger
Comment[bs]=MSN Mesendžer
Comment[ca]=MSN Messenger
Comment[ca@valencia]=MSN Messenger
......@@ -57,7 +56,6 @@ Comment[zh_CN]=MSN Messenger
Comment[zh_TW]=MSN
Name=MSN Messenger
Name[ar]=مرسال MSN
Name[ast]=MSN Messenger
Name[bs]=MSN Mesendžer
Name[ca]=MSN Messenger
Name[ca@valencia]=MSN Messenger
......
......@@ -5,7 +5,6 @@ X-KDE-ServiceTypes=KContacts/IMProtocol,KPluginInfo
X-KDE-InstantMessagingKABCField=messaging/skype
X-KDE-InstantMessagingKContactField=skype
Comment=Skype Internet Telephony
Comment[ast]=Telefonía d'internet Skype
Comment[bs]=Skype (Skajp) internet tehnologija
Comment[ca]=Telefonia d'Internet Skype
Comment[ca@valencia]=Telefonia d'Internet Skype
......@@ -55,7 +54,6 @@ Comment[zh_CN]=Skype 互联网电话
Comment[zh_TW]=Skype 網路電話
Name=Skype
Name[ar]=سكايب
Name[ast]=Skype
Name[bs]=Skype (Skajp)
Name[ca]=Skype
Name[ca@valencia]=Skype
......
......@@ -5,7 +5,6 @@ X-KDE-ServiceTypes=KContacts/IMProtocol,KPluginInfo
X-KDE-InstantMessagingKABCField=messaging/sms
Comment=SMS Protocol
Comment[ar]=ميفاق SMS
Comment[ast]=Protocolu SMS
Comment[bs]=SMS Protokol
Comment[ca]=Protocol SMS
Comment[ca@valencia]=Protocol SMS
......@@ -55,7 +54,6 @@ Comment[x-test]=xxSMS Protocolxx
Comment[zh_CN]=短消息协议
Comment[zh_TW]=SMS 協定
Name=SMS
Name[ast]=SMS
Name[bs]=SMS
Name[ca]=SMS
Name[ca@valencia]=SMS
......
......@@ -5,7 +5,6 @@ X-KDE-ServiceTypes=KContacts/IMProtocol,KPluginInfo
X-KDE-InstantMessagingKContactField=twitter
X-KDE-InstantMessagingKABCField=messaging/twitter
Comment=Twitter Protocol
Comment[ast]=Protocolu Twitter
Comment[ca]=Protocol Twitter
Comment[ca@valencia]=Protocol Twitter
Comment[cs]=Protokol Twitter
......@@ -35,7 +34,6 @@ Comment[uk]=Протокол Twitter
Comment[x-test]=xxTwitter Protocolxx
Comment[zh_CN]=Twitter 协议
Name=Twitter
Name[ast]=Twitter
Name[ca]=Twitter
Name[ca@valencia]=Twitter
Name[cs]=Twitter
......
......@@ -6,7 +6,6 @@ X-KDE-InstantMessagingKABCField=messaging/yahoo
X-KDE-InstantMessagingKContactField=yahoo
Comment=Yahoo Protocol
Comment[ar]=ميفاق ياهو
Comment[ast]=Protocolu Yahoo
Comment[bs]=Yahoo Protokol
Comment[ca]=Protocol Yahoo
Comment[ca@valencia]=Protocol Yahoo
......@@ -57,7 +56,6 @@ Comment[zh_CN]=Yahoo 协议
Comment[zh_TW]=Yahoo 協定
Name=Yahoo
Name[ar]=ياهو
Name[ast]=Yahoo
Name[bs]=Yahoo
Name[ca]=Yahoo
Name[ca@valencia]=Yahoo
......
......@@ -11,7 +11,6 @@ X-KDE-Weight=200
Name=Contact Actions
Name[ar]=إجراءات المتراسل
Name[ast]=Aiciones de contautu
Name[bs]=Radnje sa kontaktima
Name[ca]=Accions del contacte
Name[ca@valencia]=Accions del contacte
......@@ -64,7 +63,6 @@ Name[zh_CN]=联系人动作
Name[zh_TW]=聯絡人動作
Comment=Configure the Contact Actions
Comment[ar]=اضبط إجراءات المتراسل
Comment[ast]=Configura les aiciones de contautu
Comment[bs]=Podesite radnje sa kontaktima
Comment[ca]=Configura les accions del contacte
Comment[ca@valencia]=Configura les accions del contacte
......@@ -116,7 +114,6 @@ Comment[zh_CN]=配置联系人动作
Comment[zh_TW]=設定聯絡人動作
X-KDE-Keywords=kaddressbook, configure, settings, contact, actions
X-KDE-Keywords[ar]=دفتر, عناوين, اضبط, إعدادات, متراسل, إجراء
X-KDE-Keywords[ast]=kaddressbook, configurar, axustes, contautu, aiciones
X-KDE-Keywords[bs]=kaddressbook, configure, settings, contact, actions, adresar, konfiguracija, postavke, akcije
X-KDE-Keywords[ca]=kaddressbook, configuració, arranjament, contacte, accions
X-KDE-Keywords[ca@valencia]=kaddressbook, configuració, arranjament, contacte, accions
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment