Commit df3eaaa0 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 07c2bf0c
[Desktop Entry]
Encoding=UTF-8
Name=Application Menu Bar
Name[ca]=Barra de menú de l'aplicació
Name[ca@valencia]=Barra de menú de l'aplicació
Name[ca]=Barra de menús de l'aplicació
Name[ca@valencia]=Barra de menús de l'aplicació
Name[cs]=Pruh s nabídkou aplikace
Name[da]=Menulinje til programmer
Name[de]=Anwendungsmenüleiste
......
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