Commit 9b9e80a5 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 a65fcacb
......@@ -38,7 +38,7 @@ Name[hr]=Sistemski blok
Name[hsb]=Systemowa wotkładka
Name[hu]=Paneltálca
Name[ia]=Tabuliero de systema
Name[id]=Baki Sistem
Name[id]=System Tray
Name[is]=Kerfisbakki
Name[it]=Vassoio di sistema
Name[ja]=システムトレイ
......
......@@ -38,7 +38,7 @@ Name[hr]=Sistemski blok
Name[hsb]=Systemowa wotkładka
Name[hu]=Paneltálca
Name[ia]=Tabuliero de systema
Name[id]=Baki Sistem
Name[id]=System Tray
Name[is]=Kerfisbakki
Name[it]=Vassoio di sistema
Name[ja]=システムトレイ
......
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