Commit fc37ce3e 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 de6ac8e8
[Desktop Entry]
Name=Battery and Brightness
Name[ar]=البطّاريّة والسّطوع
Name[ast]=Batería y brilléu
Name[ast]=Batería y brillu
Name[az]=Batareya və Parlaqlıq
Name[ca]=Bateria i lluminositat
Name[ca@valencia]=Bateria i brillantor
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