From 76e63f700027bb8fdf2974cdb3e2e4bc0faf0143 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 16 Sep 2022 01:46:01 +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" --- containments/homescreens/folio/package/metadata.json | 1 + quicksettings/donotdisturb/metadata.json | 1 + 2 files changed, 2 insertions(+) diff --git a/containments/homescreens/folio/package/metadata.json b/containments/homescreens/folio/package/metadata.json index c7e14d2e..b2de171a 100644 --- a/containments/homescreens/folio/package/metadata.json +++ b/containments/homescreens/folio/package/metadata.json @@ -52,6 +52,7 @@ "Name[es]": "Folio", "Name[eu]": "Folio", "Name[fr]": "Porte-feuille", + "Name[ka]": "ფოლიო", "Name[nl]": "Folio", "Name[pt]": "Folio", "Name[sl]": "Folio", diff --git a/quicksettings/donotdisturb/metadata.json b/quicksettings/donotdisturb/metadata.json index 41975346..95d51480 100644 --- a/quicksettings/donotdisturb/metadata.json +++ b/quicksettings/donotdisturb/metadata.json @@ -50,6 +50,7 @@ "Name[es]": "No molestar", "Name[eu]": "Zatarik ez", "Name[fr]": "Ne pas déranger", + "Name[ka]": "არ შემაწუხო", "Name[nl]": "Niet storen", "Name[pt]": "Não Incomodar", "Name[sl]": "Ne moti",