From b700c94d3eab387cfdef5aea5460fde5d2efa5bd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 18 May 2022 01:44:40 +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 71b507874..8d06ab13d 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -7,6 +7,7 @@ "Description[ca]": "Configura la navegació del gestor de fitxers", "Description[es]": "Configurar la navegación del gestor de archivos", "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[it]": "Configura la navigazione col gestore dei file", "Description[ko]": "파일 관리자 탐색 설정", -- cgit v1.3