Commit 4bb02d1f 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 61f835c1
Pipeline #17082 passed with stages
in 57 minutes and 47 seconds
......@@ -5,6 +5,7 @@ Version=1.0
Name=Kaidan
Name[ca]=Kaidan
Name[ca@valencia]=Kaidan
Name[cs]=Kaidan
Name[es]=Kaidan
Name[et]=Kaidan
Name[fr]=Kaidan
......@@ -59,6 +60,7 @@ 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[pt_BR]=bate-papo;chat;mensagem;mi;im;jabber;xmpp;qt;rede;
Keywords[ru]=chat;messaging;im;jabber;xmpp;qt;network;чат;сообщения;сеть;
Keywords[sv]=chatt;direktmeddelanden;jabber;xmpp;qt;nätverk;
Keywords[uk]=chat;messaging;im;jabber;xmpp;qt;network;балачка;спілкування;обмін повідомленнями;миттєвий;джаббер;жабер;іксемпепе;к'ют;мережа;
Keywords[x-test]=xxchatxx;xxmessagingxx;xximxx;xxjabberxx;xxxmppxx;xxqtxx;xxnetworkxx;
......
......@@ -18,6 +18,7 @@ Comment[zh_TW]=適合每一台裝置且使用者友好的 XMPP 用戶端
Name=Kaidan
Name[ca]=Kaidan
Name[ca@valencia]=Kaidan
Name[cs]=Kaidan
Name[es]=Kaidan
Name[et]=Kaidan
Name[fr]=Kaidan
......@@ -37,6 +38,7 @@ Name[zh_TW]=Kaidan
Name=New message
Name[ca]=Missatge nou
Name[ca@valencia]=Missatge nou
Name[cs]=Nová zpráva
Name[et]=Uus sõnum
Name[fr]=Nouveau message
Name[it]=Nuovo messaggio
......
......@@ -4,6 +4,7 @@ Version=1.0
Name=Kaidan
Name[ca]=Kaidan
Name[ca@valencia]=Kaidan
Name[cs]=Kaidan
Name[es]=Kaidan
Name[et]=Kaidan
Name[fr]=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