From fd1f5e2e60481fdb61b69b792317796fba287155 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 28 Dec 2024 01:34:33 +0000 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" --- kcms/time/clockconfig_actions.actions | 2 +- quicksettings/record/plasma_mobile_quicksetting_record.notifyrc | 2 +- .../screenshot/plasma_mobile_quicksetting_screenshot.notifyrc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kcms/time/clockconfig_actions.actions b/kcms/time/clockconfig_actions.actions index 2857ed18..9e6abfce 100644 --- a/kcms/time/clockconfig_actions.actions +++ b/kcms/time/clockconfig_actions.actions @@ -75,7 +75,7 @@ Name[sk]=Uloženie nastavení dátumu a času Name[sl]=Shrani nastavitve datuma in časa Name[sv]=Spara datum- och tidsinställningar Name[ta]=தேதி மற்றும் நேர அமைப்புகளை சேமி -Name[tr]=Tarih ve saat ayarlarını kaydet +Name[tr]=Tarih ve Saat Ayarlarını Kaydet Name[uk]=Зберегти параметри дати/часу Name[x-test]=xxSave the date/time settingsxx Name[zh_CN]=保存日期/时间设置 diff --git a/quicksettings/record/plasma_mobile_quicksetting_record.notifyrc b/quicksettings/record/plasma_mobile_quicksetting_record.notifyrc index d6e7d322..d4032be1 100644 --- a/quicksettings/record/plasma_mobile_quicksetting_record.notifyrc +++ b/quicksettings/record/plasma_mobile_quicksetting_record.notifyrc @@ -125,7 +125,7 @@ Comment[sk]=Zachytené Comment[sl]=Zajeto Comment[sv]=Lagrad Comment[ta]=பிடிக்கப்பட்டது -Comment[tr]=Yakalanan +Comment[tr]=Yakalandı Comment[uk]=Захоплено Comment[x-test]=xxCapturedxx Comment[zh_CN]=已捕获 diff --git a/quicksettings/screenshot/plasma_mobile_quicksetting_screenshot.notifyrc b/quicksettings/screenshot/plasma_mobile_quicksetting_screenshot.notifyrc index d6e7d322..d4032be1 100644 --- a/quicksettings/screenshot/plasma_mobile_quicksetting_screenshot.notifyrc +++ b/quicksettings/screenshot/plasma_mobile_quicksetting_screenshot.notifyrc @@ -125,7 +125,7 @@ Comment[sk]=Zachytené Comment[sl]=Zajeto Comment[sv]=Lagrad Comment[ta]=பிடிக்கப்பட்டது -Comment[tr]=Yakalanan +Comment[tr]=Yakalandı Comment[uk]=Захоплено Comment[x-test]=xxCapturedxx Comment[zh_CN]=已捕获