Commit a3921904 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 fce700be
......@@ -7,6 +7,7 @@ Name[ca]=Client LSP
Name[es]=Cliente LSP
Name[eu]=LSP bezeroa
Name[it]=Client LSP
Name[ko]=LSP 클라이언트
Name[nl]=LSP-client
Name[nn]=LSP-klient
Name[pl]=Klient LSP
......@@ -16,12 +17,14 @@ Name[sk]=LSP Client
Name[sv]=LSP-klient
Name[uk]=Клієнт LSP
Name[x-test]=xxLSP Clientxx
Name[zh_CN]=LSP 客户端
Name[zh_TW]=LSP 客戶端
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[it]=Client Language Server Protocol
Comment[ko]=언어 서버 프로토콜 클라이언트
Comment[nl]=Language Server Protocol Client
Comment[nn]=Klient for Language Server Protocol
Comment[pl]=Klient protokołu języka serwera
......@@ -31,4 +34,5 @@ Comment[sk]=Language Server Protocol Client
Comment[sv]=Klient för språkserverprotokollet (Language Server Protocol)
Comment[uk]=Клієнт протоколу сервера мов (LSP)
Comment[x-test]=xxLanguage Server Protocol Clientxx
Comment[zh_CN]=语言服务器协议客户端
Comment[zh_TW]=「語言伺服器協定」客戶端
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