Commit f2fa2a1f 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 761f15de
......@@ -18,6 +18,7 @@ Name[nn]=LSP-klient
Name[pl]=Klient LSP
Name[pt]=Cliente de LSP
Name[pt_BR]=Cliente LSP
Name[ru]=Клиент LSP
Name[sk]=LSP Client
Name[sv]=LSP-klient
Name[uk]=Клієнт LSP
......@@ -39,6 +40,7 @@ Comment[nn]=Klient for Language Server Protocol
Comment[pl]=Klient protokołu języka serwera
Comment[pt]=Cliente de Language Server Protocol (LSP)
Comment[pt_BR]=Cliente de Language Server Protocol (LSP)
Comment[ru]=Поддержка Language Server Protocol
Comment[sk]=Language Server Protocol Client
Comment[sv]=Klient för språkserverprotokollet (Language Server Protocol)
Comment[uk]=Клієнт протоколу сервера мов (LSP)
......
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