Commit 17db0c8f 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 636af882
...@@ -24,6 +24,7 @@ Name[zh_CN]=LSP 客户端 ...@@ -24,6 +24,7 @@ Name[zh_CN]=LSP 客户端
Name[zh_TW]=LSP 客戶端 Name[zh_TW]=LSP 客戶端
Comment=Language Server Protocol Client Comment=Language Server Protocol Client
Comment[ca]=Client del protocol de servidor de llenguatge Comment[ca]=Client del protocol de servidor de llenguatge
Comment[de]=Sprachserverprotokoll-Client
Comment[en_GB]=Language Server Protocol Client Comment[en_GB]=Language Server Protocol Client
Comment[es]=Cliente del protocolo de servidor de lenguaje Comment[es]=Cliente del protocolo de servidor de lenguaje
Comment[eu]=Lengoaia Zerbitzari Protokolo bezeroa Comment[eu]=Lengoaia Zerbitzari Protokolo bezeroa
......
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