From 6d02a24dd441ee928a31edd94c2d964795a3596f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 1 Jun 2025 01:35:38 +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" --- quicksettings/autohidepanels/metadata.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/quicksettings/autohidepanels/metadata.json b/quicksettings/autohidepanels/metadata.json index ebaa22f4..5cdb8a00 100644 --- a/quicksettings/autohidepanels/metadata.json +++ b/quicksettings/autohidepanels/metadata.json @@ -17,8 +17,10 @@ "Name[ia]": "Micah Stanley", "Name[it]": "Micah Stanley", "Name[ka]": "Micah Stanley", + "Name[lv]": "Micah Stanley", "Name[nl]": "Micah Stanley", "Name[sl]": "Micah Stanley", + "Name[sv]": "Micah Stanley", "Name[tr]": "Micah Stanley", "Name[uk]": "Micah Stanley", "Name[x-test]": "xxMicah Stanleyxx", @@ -38,8 +40,10 @@ "Description[ia]": "Auto Cela Pannellos Preferentia rapide per Plasma Mobile", "Description[it]": "Impostazione rapida Nascondi automaticamente i pannelli per Plasma Mobile", "Description[ka]": "პანელების ავტოდამალვის სწრაფად დაყენება Plasma Mobile-სთვის", + "Description[lv]": "„Plasma Mobile“ paneļu automātiskās slēpšanas ātrais iestatījumus", "Description[nl]": "Snelle instelling van automatisch panelen verbergen voor Plasma Mobile", "Description[sl]": "Hitre nastavitve samodejnega skrivanja plošč za Plasma Mobile", + "Description[sv]": "Dölj panelernas snabbinställningar automatiskt för Plasma mobil", "Description[tr]": "Plasma Cep panelleri kendiliğinden gizleme tez ayarı", "Description[uk]": "Пункт швидкого приховування панелей для Мобільної Плазми", "Description[x-test]": "xxAuto Hide Panels quick setting for Plasma Mobilexx", @@ -60,8 +64,10 @@ "Name[ia]": "Auto-Cela Pannellos", "Name[it]": "Nascondi automaticamente i pannelli", "Name[ka]": "პანელების ავტომატური დამალვა", + "Name[lv]": "Automātiski slēpt paneļus", "Name[nl]": "Panelen automatisch verbergen", "Name[sl]": "Samodejno skrij plošče", + "Name[sv]": "Dölj paneler automatiskt", "Name[tr]": "Panelleri Kendiliğinden Gizle", "Name[uk]": "Автоматично ховати панелі", "Name[x-test]": "xxAuto Hide Panelsxx",