From 4f1d8fef9216d6ae7b5b9bd1fa5523103ccf419a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 6 Nov 2022 01:51:33 +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/kcmdolphinnavigation.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/settings/kcm/kcmdolphinnavigation.json') diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json index 0f8530b88..803735a2a 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -16,6 +16,7 @@ "Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers", "Description[ia]": "Configura navigation del gerente de file", "Description[id]": "Konfigurasikan navigasi pengelola file", + "Description[ie]": "Configurar li navigation del gerente de files", "Description[is]": "Stilla flakkstýringar skráastjóra", "Description[it]": "Configura la navigazione col gestore dei file", "Description[ka]": "ფაილების მმართველის ნავიგაციის მორგება", @@ -59,6 +60,7 @@ "Name[hu]": "Navigálás", "Name[ia]": "Navigation", "Name[id]": "Navigasi", + "Name[ie]": "Navigation", "Name[is]": "Flakk", "Name[it]": "Navigazione", "Name[ja]": "ナビゲーション", -- cgit v1.3