From 517cc98e1574fdff4944f256d14ff10543b7c718 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 14 Dec 2024 01:47:37 +0000 Subject: 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" --- src/settings/kcm/kcmdolphingeneral.json | 1 + src/settings/kcm/kcmdolphinviewmodes.json | 1 + 2 files changed, 2 insertions(+) (limited to 'src/settings') diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index ba3228894..eec426486 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -41,6 +41,7 @@ "Name[pt_BR]": "Geral", "Name[ro]": "Generale", "Name[ru]": "Основные параметры", + "Name[sa]": "सामान्य", "Name[sk]": "Všeobecné", "Name[sl]": "Splošno", "Name[sv]": "Allmänt", diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index 7383193b9..4af7e5b2b 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -44,6 +44,7 @@ "Name[pt_BR]": "Modos de exibição", "Name[ro]": "Regimuri de vizualizare", "Name[ru]": "Режимы просмотра", + "Name[sa]": "दृश्यविधानानि", "Name[se]": "Čájehanmodusat", "Name[sk]": "Režimy zobrazenia", "Name[sl]": "Načini prikaza", -- cgit v1.3