Commit 9173cba5 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 a3921904
......@@ -6,6 +6,7 @@ Name=LSP Client
Name[ca]=Client LSP
Name[es]=Cliente LSP
Name[eu]=LSP bezeroa
Name[fr]=Client LSP
Name[it]=Client LSP
Name[ko]=LSP 클라이언트
......@@ -23,6 +24,7 @@ Comment=Language Server Protocol Client
Comment[ca]=Client del protocol de servidor de llenguatge
Comment[es]=Cliente del protocolo de servidor de lenguaje
Comment[eu]=Lengoaia Zerbitzari Protokolo bezeroa
Comment[fr]=Client Language Server Protocol
Comment[it]=Client Language Server Protocol
Comment[ko]=언어 서버 프로토콜 클라이언트
Comment[nl]=Language Server Protocol Client
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment