From fdb2974ce58c201a2da9c9c2f5f90f751a28f5c1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 18 Jun 2020 05:50:44 +0200 Subject: [PATCH] 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" --- src/kteatime.notifyrc | 7 +++++++ src/org.kde.kteatime.desktop | 2 ++ 2 files changed, 9 insertions(+) diff --git a/src/kteatime.notifyrc b/src/kteatime.notifyrc index 7056807..1c4b763 100644 --- a/src/kteatime.notifyrc +++ b/src/kteatime.notifyrc @@ -50,6 +50,7 @@ Comment[tr]=Çaycı Comment[ug]=چايچى Comment[uk]=Приготування чаю Comment[wa]=Fijheu d' té +Comment[x-test]=xxTea Cookerxx Comment[zh_CN]=煮茶器 Comment[zh_TW]=煮茶器 @@ -119,6 +120,7 @@ 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 @@ -187,6 +189,7 @@ 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 @@ -247,6 +250,7 @@ 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. @@ -303,6 +307,7 @@ 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 @@ -335,6 +340,7 @@ Name[sk]=Varič čaju Name[sl]=Kuhalnik čaja Name[sv]=Tekokaren Name[uk]=Приготування чаю +Name[x-test]=xxThe Tea Cookerxx Name[zh_CN]=煮茶器 Name[zh_TW]=煮茶器 Comment=The Tea Cooker @@ -363,6 +369,7 @@ Comment[sk]=Varič čaju Comment[sl]=Kuhalnik čaja Comment[sv]=Tekokaren Comment[uk]=Приготування чаю +Comment[x-test]=xxThe Tea Cookerxx Comment[zh_CN]=煮茶器 Comment[zh_TW]=煮茶器 Action=Popup diff --git a/src/org.kde.kteatime.desktop b/src/org.kde.kteatime.desktop index e503ef4..2b1dd8c 100755 --- a/src/org.kde.kteatime.desktop +++ b/src/org.kde.kteatime.desktop @@ -63,6 +63,7 @@ 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 @@ -129,6 +130,7 @@ 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 -- GitLab