Commit e8b6bb35 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 a5fcbdd7
Pipeline #13206 passed with stages
in 25 minutes and 21 seconds
......@@ -4,6 +4,7 @@ Type=Application
Version=1.0
Name=Kaidan
Name[ca]=Kaidan
Name[it]=Kaidan
Name[nl]=Kaidan
Name[pt]=Kaidan
Name[sk]=Kaidan
......@@ -12,6 +13,7 @@ Name[uk]=Kaidan
Name[x-test]=xxKaidanxx
GenericName=Jabber IM Client
GenericName[ca]=Client de MI per a Jabber
GenericName[it]=Client IM per Jabber
GenericName[nl]=Jabber IM-client
GenericName[pt]=Cliente de MI em Jabber
GenericName[sv]=Jabber direktmeddelandeklient
......@@ -19,6 +21,7 @@ GenericName[uk]=Клієнт обміну повідомленнями у Jabber
GenericName[x-test]=xxJabber IM Clientxx
Comment=A QtQuick Jabber client
Comment[ca]=Un client en QtQuick per a Jabber
Comment[it]=Un client Jabber in QtQuick
Comment[nl]=Een QtQuick Jabber-client
Comment[pt]=Um cliente de Jabber em QtQuick
Comment[sv]=En QtQuick Jabberklient
......@@ -26,6 +29,7 @@ Comment[uk]=Клієнт Jabber на основі QtQuick
Comment[x-test]=xxA QtQuick Jabber clientxx
Keywords=chat;messaging;im;jabber;xmpp;qt;network;
Keywords[ca]=xat;missatgeria;mi;jabber;xmpp;qt;xarxa;
Keywords[it]=chat;messaging;im;jabber;xmpp;qt;network;
Keywords[nl]=chat;messaging;im;jabber;xmpp;qt;netwerk;
Keywords[pt]=conversação;mensagens;mi;jabber;xmpp;qt;rede;
Keywords[sv]=chatt;direktmeddelanden;jabber;xmpp;qt;nätverk
......
......@@ -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[it]=Un client XMPP per tutti i dispositivi facile da usare
Comment[nl]=Een gebruikersvriendelijke XMPP-client voor elk apparaat
Comment[pt]=Um cliente de XMPP amigável para todos os dispositivos
Comment[sv]=En användarvänlig XMPP-klient för alla enheter
......@@ -9,6 +10,7 @@ Comment[uk]=Зручний у користуванні клієнт XMPP для
Comment[x-test]=xxA user-friendly XMPP client for every devicexx
Name=Kaidan
Name[ca]=Kaidan
Name[it]=Kaidan
Name[nl]=Kaidan
Name[pt]=Kaidan
Name[sk]=Kaidan
......@@ -19,6 +21,7 @@ Name[x-test]=xxKaidanxx
[Event/new-message]
Name=New message
Name[ca]=Missatge nou
Name[it]=Nuovo messaggio
Name[nl]=Nieuw bericht
Name[pt]=Nova mensagem
Name[sk]=Nová správa
......@@ -27,6 +30,7 @@ Name[uk]=Нове повідомлення
Name[x-test]=xxNew messagexx
Comment=You have received a new message
Comment[ca]=Heu rebut un missatge privat nou
Comment[it]=Hai ricevuto un nuovo messaggio
Comment[nl]=U hebt een nieuw bericht ontvangen
Comment[pt]=Recebeu uma mensagem nova
Comment[sv]=Du har tagit emot ett nytt meddelande
......
......@@ -3,6 +3,7 @@ Type=Application
Version=1.0
Name=Kaidan
Name[ca]=Kaidan
Name[it]=Kaidan
Name[nl]=Kaidan
Name[pt]=Kaidan
Name[sk]=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