Commit c81c2e12 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 057a65d3
......@@ -25,6 +25,7 @@ Name[zh_CN]=LSP 客户端
Name[zh_TW]=LSP 客戶端
Comment=Language Server Protocol Client
Comment[ca]=Client del protocol de servidor de llenguatge
Comment[de]=Sprachserverprotokoll-Client
Comment[el]=Πελάτης Πρωτοκόλλου γλωσσικού εξυπηρετητή
Comment[en_GB]=Language Server Protocol Client
Comment[es]=Cliente del protocolo de servidor de lenguaje
......
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