diff options
| author | l10n daemon script <[email protected]> | 2022-05-16 01:50:33 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-05-16 01:50:33 +0000 |
| commit | 0b27270beec7a9b8309322b0c869e71dde30f3d2 (patch) | |
| tree | 00ec195e1694f13f14867e6b50f7b88400ebbe84 /src/settings | |
| parent | 2ceaa0ba1be1317b52a5a5d4439585b9af3bab2d (diff) | |
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"
Diffstat (limited to 'src/settings')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.json | 2 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinnavigation.json | 3 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.json | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index bb5b5d10b..8a4c602a1 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -11,6 +11,7 @@ "Description[it]": "Configura le impostazioni generali del gestore dei file", "Description[ko]": "일반 파일 관리자 설정", "Description[nl]": "Algemene bestandsbeheerderinstellingen configureren", + "Description[pl]": "Ustawienia ogólne zarządzania plikami", "Description[pt]": "Configurar as definições gerais do gestor de ficheiros", "Description[pt_BR]": "Configura as opções gerais do gerenciador de arquivos", "Description[ro]": "Configurează opțiuni generale ale gestionarului de fișiere", @@ -35,6 +36,7 @@ "Name[it]": "Generale", "Name[ko]": "일반", "Name[nl]": "Algemeen", + "Name[pl]": "Ogólne", "Name[pt]": "Geral", "Name[pt_BR]": "Geral", "Name[ro]": "Generale", 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", diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index 29460f2af..aa1fcd2e2 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -11,6 +11,7 @@ "Description[it]": "Configura le viste del gestore dei file", "Description[ko]": "파일 관리자 보기 모드 설정", "Description[nl]": "Bestandsbeheerderweergavemodussen configureren", + "Description[pl]": "Ustawienia trybów widoku zarządzania plikami", "Description[pt]": "Configurar os modos de visualização do gestor de ficheiros", "Description[pt_BR]": "Configura os modos de exibição do gerenciador de arquivos", "Description[ro]": "Configurează regimurile de vizualizare ale gestionarului de fișiere", |