Commit 7da517c6 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 b5cbc3d9
......@@ -16,6 +16,7 @@ Name[en_GB]=External Tools
Name[es]=Herramientas externas
Name[et]=Välised tööriistad
Name[eu]=Kanpoko tresnak
Name[fi]=Ulkoiset työkalut
Name[fr]=Outils externes
Name[ga]=Uirlisí Seachtracha
Name[gl]=Ferramentas externas
......@@ -64,6 +65,7 @@ Comment[en_GB]=External Tools
Comment[es]=Herramientas externas
Comment[et]=Välised tööriistad
Comment[eu]=Kanpoko tresnak
Comment[fi]=Ulkoiset työkalut
Comment[fr]=Outils externes
Comment[ga]=Uirlisí Seachtracha
Comment[gl]=Ferramentas externas
......@@ -12,6 +12,7 @@ Name[en_GB]=LSP Client
Name[es]=Cliente LSP
Name[et]=LSP klient
Name[eu]=LSP bezeroa
Name[fr]=Client LSP
Name[gl]=Cliente de LSP
Name[ia]=Cliente LSP
......@@ -41,6 +42,7 @@ Comment[en_GB]=Language Server Protocol Client
Comment[es]=Cliente del protocolo de servidor de lenguaje
Comment[et]=Keeleserveri protokolli klient
Comment[eu]=Lengoaia Zerbitzari Protokolo bezeroa
Comment[fi]=LSP-asiakas (Language Server Protocol)
Comment[fr]=Client Language Server Protocol
Comment[gl]=Cliente do protocolo de servidor de linguaxes
Comment[ia]=Language Server Protocol Client (Cliente de protocollo de servitor de linguage)
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