Commit 3a8e2079 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 b54e5b05
......@@ -4,6 +4,7 @@ Type=Application
Version=1.0
Name=Kaidan
Name[ca]=Kaidan
Name[ca@valencia]=Kaidan
Name[et]=Kaidan
Name[fr]=Kaidan
Name[it]=Kaidan
......@@ -17,6 +18,7 @@ Name[x-test]=xxKaidanxx
Name[zh_TW]=Kaidan
GenericName=Jabber IM Client
GenericName[ca]=Client de MI per a Jabber
GenericName[ca@valencia]=Client de MI per a Jabber
GenericName[et]=Jabberi kiirsuhtlusklient
GenericName[fr]=Client de messagerie instantanée Jabber
GenericName[it]=Client IM per Jabber
......@@ -29,6 +31,7 @@ GenericName[x-test]=xxJabber IM Clientxx
GenericName[zh_TW]=Jabber 即時通訊用戶端
Comment=A QtQuick Jabber client
Comment[ca]=Un client en QtQuick per a Jabber
Comment[ca@valencia]=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
......@@ -41,6 +44,7 @@ Comment[x-test]=xxA QtQuick Jabber clientxx
Comment[zh_TW]=QtQuick Jabber 用戶端
Keywords=chat;messaging;im;jabber;xmpp;qt;network;
Keywords[ca]=xat;missatgeria;mi;jabber;xmpp;qt;xarxa;
Keywords[ca@valencia]=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;
......
......@@ -2,6 +2,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[ca@valencia]=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
......@@ -14,6 +15,7 @@ Comment[x-test]=xxA user-friendly XMPP client for every devicexx
Comment[zh_TW]=適合每一台裝置且使用者友好的 XMPP 用戶端
Name=Kaidan
Name[ca]=Kaidan
Name[ca@valencia]=Kaidan
Name[et]=Kaidan
Name[fr]=Kaidan
Name[it]=Kaidan
......@@ -29,6 +31,7 @@ Name[zh_TW]=Kaidan
[Event/new-message]
Name=New message
Name[ca]=Missatge nou
Name[ca@valencia]=Missatge nou
Name[et]=Uus sõnum
Name[fr]=Nouveau message
Name[it]=Nuovo messaggio
......@@ -42,6 +45,7 @@ Name[x-test]=xxNew messagexx
Name[zh_TW]=新訊息
Comment=You have received a new message
Comment[ca]=Heu rebut un missatge privat nou
Comment[ca@valencia]=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
......
......@@ -3,6 +3,7 @@ Type=Application
Version=1.0
Name=Kaidan
Name[ca]=Kaidan
Name[ca@valencia]=Kaidan
Name[et]=Kaidan
Name[fr]=Kaidan
Name[it]=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