Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 9dec8ae4 authored by Script Kiddy's avatar Script Kiddy

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 114b4140
......@@ -5,6 +5,7 @@ Version=1.0
Name=Kaidan
Name[ca]=Kaidan
Name[et]=Kaidan
Name[fr]=Kaidan
Name[it]=Kaidan
Name[ko]=Kaidan
Name[nl]=Kaidan
......@@ -17,6 +18,7 @@ Name[zh_TW]=Kaidan
GenericName=Jabber IM Client
GenericName[ca]=Client de MI per a Jabber
GenericName[et]=Jabberi kiirsuhtlusklient
GenericName[fr]=Client de messagerie instantanée Jabber
GenericName[it]=Client IM per Jabber
GenericName[ko]=Jabber IM 클라이언트
GenericName[nl]=Jabber IM-client
......@@ -28,6 +30,7 @@ GenericName[zh_TW]=Jabber 即時通訊用戶端
Comment=A QtQuick Jabber client
Comment[ca]=Un client en QtQuick per a Jabber
Comment[et]=QtQuicki Jabberi klient
Comment[fr]=Un client Jabber QtQuick
Comment[it]=Un client Jabber in QtQuick
Comment[ko]=QtQuick Jabber 클라이언트
Comment[nl]=Een QtQuick Jabber-client
......@@ -39,6 +42,7 @@ Comment[zh_TW]=QtQuick Jabber 用戶端
Keywords=chat;messaging;im;jabber;xmpp;qt;network;
Keywords[ca]=xat;missatgeria;mi;jabber;xmpp;qt;xarxa;
Keywords[et]=vestlus;kiirsuhtlus;im;jabber;xmpp;qt;võrk;
Keywords[fr]=chat;messagerie;im;jabber;xmpp;qt;réseau;
Keywords[it]=chat;messaging;im;jabber;xmpp;qt;network;
Keywords[ko]=chat;messaging;im;jabber;xmpp;qt;network;채팅;메시지;메시징;네트워크;
Keywords[nl]=chat;messaging;im;jabber;xmpp;qt;netwerk;
......
......@@ -3,6 +3,7 @@ IconName=kaidan
Comment=A user-friendly XMPP client for every device
Comment[ca]=Un client d'XMPP fàcil d'emprar per a cada dispositiu
Comment[et]=Kasutajasõbralik XMPP klient kõigile seadmetele
Comment[fr]=Un client XMPP simple à utiliser pour tous vos appareils
Comment[it]=Un client XMPP per tutti i dispositivi facile da usare
Comment[ko]=모든 장치에서 사용할 수 있는 XMPP 클라이언트
Comment[nl]=Een gebruikersvriendelijke XMPP-client voor elk apparaat
......@@ -14,6 +15,7 @@ Comment[zh_TW]=適合每一台裝置且使用者友好的 XMPP 用戶端
Name=Kaidan
Name[ca]=Kaidan
Name[et]=Kaidan
Name[fr]=Kaidan
Name[it]=Kaidan
Name[ko]=Kaidan
Name[nl]=Kaidan
......@@ -28,6 +30,7 @@ Name[zh_TW]=Kaidan
Name=New message
Name[ca]=Missatge nou
Name[et]=Uus sõnum
Name[fr]=Nouveau message
Name[it]=Nuovo messaggio
Name[ko]=새 메시지
Name[nl]=Nieuw bericht
......@@ -40,6 +43,7 @@ Name[zh_TW]=新訊息
Comment=You have received a new message
Comment[ca]=Heu rebut un missatge privat nou
Comment[et]=Said uue sõnumi
Comment[fr]=Vous avez reçu un nouveau message
Comment[it]=Hai ricevuto un nuovo messaggio
Comment[ko]=새 메시지를 받음
Comment[nl]=U hebt een nieuw bericht ontvangen
......
......@@ -4,6 +4,7 @@ Version=1.0
Name=Kaidan
Name[ca]=Kaidan
Name[et]=Kaidan
Name[fr]=Kaidan
Name[it]=Kaidan
Name[ko]=Kaidan
Name[nl]=Kaidan
......
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