From 1eee8e5e8f425cfe7cdf7ce327d51069ed05b284 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 28 Jul 2023 02:22: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" --- .../record/plasma_mobile_quicksetting_record.notifyrc | 4 ++-- .../screenshot/plasma_mobile_quicksetting_screenshot.notifyrc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/quicksettings/record/plasma_mobile_quicksetting_record.notifyrc b/quicksettings/record/plasma_mobile_quicksetting_record.notifyrc index a6bf5cdc..e1b83f1c 100644 --- a/quicksettings/record/plasma_mobile_quicksetting_record.notifyrc +++ b/quicksettings/record/plasma_mobile_quicksetting_record.notifyrc @@ -64,7 +64,7 @@ Name[hu]=Rögzítve Name[ia]=Capturate Name[is]=Gripið Name[it]=Catturato -Name[ka]=დაჭერილია +Name[ka]=გადაღებულია Name[ko]=캡처됨 Name[nl]=Opgenomen Name[nn]=Opptak @@ -101,7 +101,7 @@ Comment[hu]=Rögzítve Comment[ia]=Capturate Comment[is]=Gripið Comment[it]=Catturato -Comment[ka]=დაჭერილია +Comment[ka]=გადაღებულია Comment[ko]=캡처됨 Comment[nl]=Opgenomen Comment[nn]=Opptak diff --git a/quicksettings/screenshot/plasma_mobile_quicksetting_screenshot.notifyrc b/quicksettings/screenshot/plasma_mobile_quicksetting_screenshot.notifyrc index a6bf5cdc..e1b83f1c 100644 --- a/quicksettings/screenshot/plasma_mobile_quicksetting_screenshot.notifyrc +++ b/quicksettings/screenshot/plasma_mobile_quicksetting_screenshot.notifyrc @@ -64,7 +64,7 @@ Name[hu]=Rögzítve Name[ia]=Capturate Name[is]=Gripið Name[it]=Catturato -Name[ka]=დაჭერილია +Name[ka]=გადაღებულია Name[ko]=캡처됨 Name[nl]=Opgenomen Name[nn]=Opptak @@ -101,7 +101,7 @@ Comment[hu]=Rögzítve Comment[ia]=Capturate Comment[is]=Gripið Comment[it]=Catturato -Comment[ka]=დაჭერილია +Comment[ka]=გადაღებულია Comment[ko]=캡처됨 Comment[nl]=Opgenomen Comment[nn]=Opptak