From 9b692c6ef676e8427de30a25924e3ce2c39652ef Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 19 Sep 2022 01:47:55 +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 | 2 ++ 2 files changed, 3 insertions(+) diff --git a/containments/homescreens/folio/package/metadata.json b/containments/homescreens/folio/package/metadata.json index b2de171a..b90a8616 100644 --- a/containments/homescreens/folio/package/metadata.json +++ b/containments/homescreens/folio/package/metadata.json @@ -49,6 +49,7 @@ "Name": "Folio", "Name[ca@valencia]": "Folio", "Name[ca]": "Folio", + "Name[en_GB]": "Folio", "Name[es]": "Folio", "Name[eu]": "Folio", "Name[fr]": "Porte-feuille", diff --git a/quicksettings/donotdisturb/metadata.json b/quicksettings/donotdisturb/metadata.json index 95d51480..7af6c543 100644 --- a/quicksettings/donotdisturb/metadata.json +++ b/quicksettings/donotdisturb/metadata.json @@ -31,6 +31,7 @@ "Description": "Quick setting to toggle do not disturb mode", "Description[ca@valencia]": "Configuració ràpida per a canviar el mode no destorbar", "Description[ca]": "Configuració ràpida per canviar el mode no destorbar", + "Description[en_GB]": "Quick setting to toggle do not disturb mode", "Description[es]": "Ajuste rápido para cambiar el modo «no molestar»", "Description[eu]": "Zaratarik ez modua txandakatzeko ezarpen azkarra", "Description[fr]": "Configuration rapide pour basculer ou non en mode « Ne pas déranger »", @@ -47,6 +48,7 @@ "Name": "Do Not Disturb", "Name[ca@valencia]": "No destorbar", "Name[ca]": "No destorbar", + "Name[en_GB]": "Do Not Disturb", "Name[es]": "No molestar", "Name[eu]": "Zatarik ez", "Name[fr]": "Ne pas déranger",