Commit f406e726 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 082bdb2f
......@@ -50,7 +50,6 @@ Comment[tr]=Çaycı
Comment[ug]=چايچى
Comment[uk]=Приготування чаю
Comment[wa]=Fijheu d' té
Comment[x-test]=xxTea Cookerxx
Comment[zh_CN]=煮茶器
Comment[zh_TW]=煮茶器
......@@ -120,7 +119,6 @@ Name[uk]=Чай готовий
Name[uz]=Choy tayyor
Name[uz@cyrillic]=Чой тайёр
Name[wa]=Li té est presse
Name[x-test]=xxTea is readyxx
Name[zh_CN]=茶沏好了
Name[zh_TW]=茶煮好了
Comment=Tea is ready
......@@ -189,7 +187,6 @@ Comment[uk]=Чай готовий
Comment[uz]=Choy tayyor
Comment[uz@cyrillic]=Чой тайёр
Comment[wa]=Li té est presse
Comment[x-test]=xxTea is readyxx
Comment[zh_CN]=茶沏好了
Comment[zh_TW]=茶煮好了
Sound=Oxygen-Sys-App-Message.ogg
......@@ -250,7 +247,6 @@ Name[th]=น้ำชากำลังโดดเดี่ยว
Name[tr]=Çay yalnızlaşıyor
Name[ug]=چاي سوۋۇپ قالدى
Name[uk]=Час остигає
Name[x-test]=xxTea is getting lonelyxx
Name[zh_CN]=茶要凉了
Name[zh_TW]=茶煮好了,怎麼沒人喝
Comment=Tea is getting lonely.
......@@ -307,7 +303,6 @@ Comment[th]=น้ำชากำลังโดดเดี่ยว
Comment[tr]=Çay yalnızlaşıyor.
Comment[ug]=چاي سوۋۇپ قالدى.
Comment[uk]=Час остигає.
Comment[x-test]=xxTea is getting lonely.xx
Comment[zh_CN]=茶都凉了。
Comment[zh_TW]=茶煮好了,怎麼沒人喝。
Sound=Oxygen-Sys-App-Special.ogg
......@@ -339,7 +334,6 @@ Name[ru]=Помощник в приготовлении чая
Name[sk]=Varič čaju
Name[sv]=Tekokaren
Name[uk]=Приготування чаю
Name[x-test]=xxThe Tea Cookerxx
Name[zh_CN]=煮茶器
Name[zh_TW]=煮茶器
Comment=The Tea Cooker
......@@ -367,7 +361,6 @@ Comment[ru]=Помощник в приготовлении чая
Comment[sk]=Varič čaju
Comment[sv]=Tekokaren
Comment[uk]=Приготування чаю
Comment[x-test]=xxThe Tea Cookerxx
Comment[zh_CN]=煮茶器
Comment[zh_TW]=煮茶器
Action=Popup
......@@ -63,7 +63,6 @@ Name[tr]=KTeaTime
Name[ug]=KTeaTime
Name[uk]=KTeaTime
Name[wa]=KTeaTime
Name[x-test]=xxKTeaTimexx
Name[zh_CN]=KTeaTime
Name[zh_TW]=KTeaTime
GenericName=Tea Cooker
......@@ -130,7 +129,6 @@ GenericName[tr]=Çaycı
GenericName[ug]=چايچى
GenericName[uk]=Приготування чаю
GenericName[wa]=Fijheu d' té
GenericName[x-test]=xxTea Cookerxx
GenericName[zh_CN]=煮茶器
GenericName[zh_TW]=煮茶器
Exec=kteatime
......
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