Commit f41217b1 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 987c9b09
......@@ -134,6 +134,7 @@ Comment[eu]=Konektatu RDP edo VNC bidez beste ordenagailu batera
Comment[fi]=Yhdistä RDP:llä tai VNC:llä toiseen tietokoneeseen
Comment[fr]=Se connecter à un autre ordinateur avec RDP ou VNC
Comment[gl]=Conectarse por RDP ou VNC a outro computador.
Comment[ia]=Connecte con RDP o VNC a un altere computator
Comment[it]=Connessione via RDP o VNC ad un altro computer
Comment[ko]=다른 컴퓨터에 RDP나 VNC로 연결
Comment[nl]=Met RDP of VNC naar een andere computer verbinden
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