Commit b031f05e 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 75d1f592
......@@ -6,6 +6,7 @@ Name=Document Tree View
Name[ast]=Vista n'árbole de documentos
Name[ca]=Vista en arbre de documents
Name[ca@valencia]=Vista en arbre de documents
Name[cs]=Pohled na Strom dokumentu
Name[el]=Προβολή δενδρικής δομής εγγράφων
Name[en_GB]=Document Tree View
......@@ -4,6 +4,7 @@ ServiceTypes=KTextEditor/Plugin
Name=LSP Client
Name[ca]=Client LSP
Name[cs]=Klient LSP
Name[el]=Πελάτης LSP
Name[en_GB]=LSP Client
......@@ -29,6 +30,7 @@ Name[zh_CN]=LSP 客户端
Name[zh_TW]=LSP 客戶端
Comment=Language Server Protocol Client
Comment[ca]=Client del protocol de servidor de llenguatge
Comment[cs]=Klient pro Language Server Protocol
Comment[el]=Πελάτης Πρωτοκόλλου γλωσσικού εξυπηρετητή
Comment[en_GB]=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