diff options
| author | l10n daemon script <[email protected]> | 2022-05-22 01:44:35 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-05-22 01:44:35 +0000 |
| commit | 30b62a1c042c150daa5700bbd86bb14df80b7744 (patch) | |
| tree | 127fc64873850ef2dce86b785c48c3111c9dba68 /src/settings/kcm | |
| parent | 85083b209c5ac58be5e4b0a35dee54a5085a074c (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/kcm')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.json | 2 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinnavigation.json | 1 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.json | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index 9536dc751..74db701ed 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -12,6 +12,7 @@ "Description[it]": "Configura le impostazioni generali del gestore dei file", "Description[ko]": "일반 파일 관리자 설정", "Description[nl]": "Algemene bestandsbeheerderinstellingen configureren", + "Description[nn]": "Set opp generelle innstillingar for filhandsamaren", "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", @@ -38,6 +39,7 @@ "Name[it]": "Generale", "Name[ko]": "일반", "Name[nl]": "Algemeen", + "Name[nn]": "Generelt", "Name[pl]": "Ogólne", "Name[pt]": "Geral", "Name[pt_BR]": "Geral", diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json index 8d06ab13d..e3c340309 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -12,6 +12,7 @@ "Description[it]": "Configura la navigazione col gestore dei file", "Description[ko]": "파일 관리자 탐색 설정", "Description[nl]": "Bestandsbeheerdernavigatie configureren", + "Description[nn]": "Set opp navigasjonen i filhandsamaren", "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", diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index 9a59d84d6..77689a467 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -12,6 +12,7 @@ "Description[it]": "Configura le viste del gestore dei file", "Description[ko]": "파일 관리자 보기 모드 설정", "Description[nl]": "Bestandsbeheerderweergavemodussen configureren", + "Description[nn]": "Set opp visingsmodusane i filhandsamaren", "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", |