Commit 44cf1b34 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 f4412cf5
...@@ -112,6 +112,7 @@ Name[zh_TW]=音效調整_KMix ...@@ -112,6 +112,7 @@ Name[zh_TW]=音效調整_KMix
Comment=Control sound volumes Comment=Control sound volumes
Comment[ca]=Controla els volums del so Comment[ca]=Controla els volums del so
Comment[ca@valencia]=Controla els volums del so Comment[ca@valencia]=Controla els volums del so
Comment[cs]=Ovládejte hlasitosti zvuků
Comment[en_GB]=Control sound volumes Comment[en_GB]=Control sound volumes
Comment[es]=Control del volumen de los sonidos Comment[es]=Control del volumen de los sonidos
Comment[fr]=Volumes de contrôles de sons Comment[fr]=Volumes de contrôles de sons
......
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