Commit a9d4f381 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 05cc6208
...@@ -4,6 +4,7 @@ Name[ar]=ألسنة المتصفّح ...@@ -4,6 +4,7 @@ Name[ar]=ألسنة المتصفّح
Name[ca]=Pestanyes del navegador Name[ca]=Pestanyes del navegador
Name[ca@valencia]=Pestanyes del navegador Name[ca@valencia]=Pestanyes del navegador
Name[cs]=Karty prohlížeče Name[cs]=Karty prohlížeče
Name[de]=Browser-Unterfenster Name[de]=Browser-Unterfenster
Name[el]=Καρτέλες περιηγητή Name[el]=Καρτέλες περιηγητή
Name[en_GB]=Browser Tabs Name[en_GB]=Browser Tabs
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