Commit 7b6dc09c 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 589e82d8
Pipeline #16622 passed with stages
in 46 minutes and 15 seconds
......@@ -59,7 +59,6 @@ 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;
......
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