From 0b27270beec7a9b8309322b0c869e71dde30f3d2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 16 May 2022 01:50: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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/settings/kcm/kcmdolphinnavigation.json') diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json index c18d56242..71b507874 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -11,6 +11,7 @@ "Description[it]": "Configura la navigazione col gestore dei file", "Description[ko]": "파일 관리자 탐색 설정", "Description[nl]": "Bestandsbeheerdernavigatie configureren", + "Description[pl]": "Ustawienia poruszania się przy zarządzaniu plikami", "Description[pt]": "Configurar a navegação do gestor de ficheiros", "Description[pt_BR]": "Configura a navegação do gerenciador de arquivos", "Description[ro]": "Configurează navigarea cu gestionarul de fișiere", @@ -57,7 +58,7 @@ "Name[nl]": "Navigatie", "Name[nn]": "Navigasjon", "Name[pa]": "ਨੇਵੀਗੇਸ਼ਨ", - "Name[pl]": "Nawigacja", + "Name[pl]": "Poruszanie się", "Name[pt]": "Navegação", "Name[pt_BR]": "Navegação", "Name[ro]": "Navigare", -- cgit v1.3