Commit 31530eb8 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 eb167cca
[Desktop Entry]
# ctxt: plasma runner
Name=Browser History
Name[ast]=Historial del restolador
Name[az]=Veb bələdçi tarixçəsi
Name[ca]=Historial del navegador
Name[en_GB]=Browser History
......
[Desktop Entry]
# ctxt: plasma runner
Name=Browser Tabs
Name[ast]=Llingüetes del restolador
Name[az]=Veb bələdçi Vərəqləri
Name[ca]=Pestanyes del navegador
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