Commit ee7e368e 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 87720efa
......@@ -2,7 +2,6 @@
Comment=Tea Cooker
Comment[ar]=طنجرة الشاي
Comment[bg]=Приготвяне на чай
Comment[bs]=Kuhač čaja
Comment[ca]=El cuiner de te
......@@ -57,7 +56,6 @@ Comment[zh_TW]=煮茶器
Name=Tea is ready
Name[ar]=الشاي جاهز
Name[ast]=El té ta tresnao
Name[be]=Гарбата гатова
Name[bg]=Чаят е готов
Name[bn]=চা প্রস্তুত
......@@ -125,7 +123,6 @@ Name[zh_CN]=茶沏好了
Comment=Tea is ready
Comment[ar]=الشاي جاهز
Comment[ast]=El té ta tresnao
Comment[be]=Гарбата гатова
Comment[bg]=Чаят е готов
Comment[bn]=অই চা গরমমম!!!
......@@ -198,7 +195,6 @@ Action=Sound
Name=Tea is getting lonely
Name[ar]=الشاي يشعر بالوحدة
Name[ast]=El té ta quedándose solo
Name[bg]=Чаят изстива
Name[bs]=Čaj postaje usamljen
Name[ca]=El te està quedant abandonat
......@@ -256,7 +252,6 @@ Name[zh_CN]=茶都凉了
Comment=Tea is getting lonely.
Comment[ar]=الشاي يشعر بالوحدة.
Comment[ast]=El té ta quedándose solo.
Comment[bg]=Чаят изстива...
Comment[bs]=Čaj postaje usamljen.
Comment[ca]=El te està quedant abandonat.
......@@ -68,7 +68,6 @@ Name[zh_CN]=KTeaTime
GenericName=Tea Cooker
GenericName[ar]=طنجرة الشاي
GenericName[be]=Прыгатаўленне гарбаты
GenericName[bg]=Приготвяне на чай
GenericName[bn]=চায়ের কেটলি
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