Commit 9ca27c66 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 76297196
......@@ -12,6 +12,7 @@ X-KDE-PluginKeyword=kwinactions
Name=Window Actions
Name[ca]=Accions de la finestra
Name[cs]=Činnosti oken
Name[da]=Vindueshandlinger
Name[de]=Fensteraktionen
Name[en_GB]=Window Actions
Name[es]=Acciones de ventanas
......
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