Commit 7e21998d authored by Script Kiddy's avatar Script Kiddy

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 7a65e983
...@@ -250,7 +250,7 @@ Name[tr]=Çay yalnızlaşıyor ...@@ -250,7 +250,7 @@ Name[tr]=Çay yalnızlaşıyor
Name[ug]=چاي سوۋۇپ قالدى Name[ug]=چاي سوۋۇپ قالدى
Name[uk]=Час остигає Name[uk]=Час остигає
Name[x-test]=xxTea is getting lonelyxx Name[x-test]=xxTea is getting lonelyxx
Name[zh_CN]=茶凉了 Name[zh_CN]=茶凉了
Name[zh_TW]=茶煮好了,怎麼沒人喝 Name[zh_TW]=茶煮好了,怎麼沒人喝
Comment=Tea is getting lonely. Comment=Tea is getting lonely.
Comment[ar]=الشاي يشعر بالوحدة. Comment[ar]=الشاي يشعر بالوحدة.
...@@ -307,7 +307,7 @@ Comment[tr]=Çay yalnızlaşıyor. ...@@ -307,7 +307,7 @@ Comment[tr]=Çay yalnızlaşıyor.
Comment[ug]=چاي سوۋۇپ قالدى. Comment[ug]=چاي سوۋۇپ قالدى.
Comment[uk]=Час остигає. Comment[uk]=Час остигає.
Comment[x-test]=xxTea is getting lonely.xx Comment[x-test]=xxTea is getting lonely.xx
Comment[zh_CN]=茶都凉了 Comment[zh_CN]=茶都凉了
Comment[zh_TW]=茶煮好了,怎麼沒人喝。 Comment[zh_TW]=茶煮好了,怎麼沒人喝。
Sound=Oxygen-Sys-App-Special.ogg Sound=Oxygen-Sys-App-Special.ogg
Action=Sound Action=Sound
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