From 6adbb73b992c6196e4c46023aafcf245574702e7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 2 Mar 2023 02:25:05 +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 | 1 + 1 file changed, 1 insertion(+) (limited to 'src/settings/kcm/kcmdolphinnavigation.json') diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json index 68a7b2905..9999e6f85 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -17,6 +17,7 @@ "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen nabigatzea", "Description[fi]": "Tiedostonhallinnan selausasetukset", "Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers", + "Description[hi]": "फ़ाइल प्रबंधक संचालन विन्यस्त करें", "Description[ia]": "Configura navigation del gerente de file", "Description[id]": "Konfigurasikan navigasi pengelola file", "Description[ie]": "Configurar li navigation del gerente de files", -- cgit v1.3