Commit 33545505 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 73616e78
[Desktop Entry]
Name=Recent Files
Name[ca]=Fitxers recents
Name[nl]=Recente bestanden
Name[pt]=Ficheiros Recentes
Name[pt_BR]=Arquivos recentes
Name[x-test]=xxRecent Filesxx
Icon=document-open-recent
X-KDE-ServiceTypes=Plasma/Runner
......
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