Commit 74abdd09 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 4e61d360
......@@ -6,6 +6,7 @@ Name=Kaidan
Name[ca]=Kaidan
Name[et]=Kaidan
Name[it]=Kaidan
Name[ko]=Kaidan
Name[nl]=Kaidan
Name[pt]=Kaidan
Name[sk]=Kaidan
......@@ -17,6 +18,7 @@ GenericName=Jabber IM Client
GenericName[ca]=Client de MI per a Jabber
GenericName[et]=Jabberi kiirsuhtlusklient
GenericName[it]=Client IM per Jabber
GenericName[ko]=Jabber IM 클라이언트
GenericName[nl]=Jabber IM-client
GenericName[pt]=Cliente de MI em Jabber
GenericName[sv]=Jabber direktmeddelandeklient
......@@ -27,6 +29,7 @@ Comment=A QtQuick Jabber client
Comment[ca]=Un client en QtQuick per a Jabber
Comment[et]=QtQuicki Jabberi klient
Comment[it]=Un client Jabber in QtQuick
Comment[ko]=QtQuick Jabber 클라이언트
Comment[nl]=Een QtQuick Jabber-client
Comment[pt]=Um cliente de Jabber em QtQuick
Comment[sv]=En QtQuick Jabberklient
......@@ -37,6 +40,7 @@ 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[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;
Keywords[pt]=conversação;mensagens;mi;jabber;xmpp;qt;rede;
Keywords[sv]=chatt;direktmeddelanden;jabber;xmpp;qt;nätverk;
......
......@@ -4,6 +4,7 @@ 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[it]=Un client XMPP per tutti i dispositivi facile da usare
Comment[ko]=모든 장치에서 사용할 수 있는 XMPP 클라이언트
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
......@@ -14,6 +15,7 @@ Name=Kaidan
Name[ca]=Kaidan
Name[et]=Kaidan
Name[it]=Kaidan
Name[ko]=Kaidan
Name[nl]=Kaidan
Name[pt]=Kaidan
Name[sk]=Kaidan
......@@ -27,6 +29,7 @@ Name=New message
Name[ca]=Missatge nou
Name[et]=Uus sõnum
Name[it]=Nuovo messaggio
Name[ko]=새 메시지
Name[nl]=Nieuw bericht
Name[pt]=Nova mensagem
Name[sk]=Nová správa
......@@ -38,6 +41,7 @@ Comment=You have received a new message
Comment[ca]=Heu rebut un missatge privat nou
Comment[et]=Said uue sõnumi
Comment[it]=Hai ricevuto un nuovo messaggio
Comment[ko]=새 메시지를 받음
Comment[nl]=U hebt een nieuw bericht ontvangen
Comment[pt]=Recebeu uma mensagem nova
Comment[sv]=Du har tagit emot ett nytt meddelande
......
......@@ -5,6 +5,7 @@ Name=Kaidan
Name[ca]=Kaidan
Name[et]=Kaidan
Name[it]=Kaidan
Name[ko]=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