diff options
| author | l10n daemon script <[email protected]> | 2022-08-03 01:49:02 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-08-03 01:49:02 +0000 |
| commit | 86c103e765231f1d4daa0507698548af035d0048 (patch) | |
| tree | 96518c7b37956a3fc5ac3c5d4b9020556c1cb023 /src/settings/kcm | |
| parent | 227ccfdd3d745906d9a29144e4423f62073dd0cf (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 | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index 8a068751c..fb440b7a2 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -15,6 +15,7 @@ "Description[fr]": "Configurer les paramètres généraux pour le gestionnaire de fichiers", "Description[ia]": "Configura preferentias del gerente general de file", "Description[id]": "Konfigurasikan pengaturan pengelola file umum", + "Description[is]": "Sýsla með almennar stillingar skráastjóra", "Description[it]": "Configura le impostazioni generali del gestore dei file", "Description[ko]": "일반 파일 관리자 설정", "Description[nl]": "Algemene bestandsbeheerderinstellingen configureren", @@ -49,6 +50,7 @@ "Name[fr]": "Général", "Name[ia]": "General", "Name[id]": "Umum", + "Name[is]": "Almennt", "Name[it]": "Generale", "Name[ko]": "일반", "Name[nl]": "Algemeen", diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json index 337932850..b747cc8da 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -15,6 +15,7 @@ "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[is]": "Stilla flakkstýringar skráastjóra", "Description[it]": "Configura la navigazione col gestore dei file", "Description[ko]": "파일 관리자 탐색 설정", "Description[nl]": "Bestandsbeheerdernavigatie configureren", diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index c4cc111ba..dacd44c73 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -15,6 +15,7 @@ "Description[fr]": "Configurer les modes d'affichage du gestionnaire de fichiers", "Description[ia]": "Configura le modos de vista del gerente de file", "Description[id]": "Konfigurasikan mode tampilan pengelola file", + "Description[is]": "Stilla skoðunarhami í skráastjóra", "Description[it]": "Configura le viste del gestore dei file", "Description[ko]": "파일 관리자 보기 모드 설정", "Description[nl]": "Bestandsbeheerderweergavemodussen configureren", @@ -56,7 +57,7 @@ "Name[hu]": "Nézetmódok", "Name[ia]": "Modos de vista", "Name[id]": "Mode Tampilan", - "Name[is]": "Skoðunarhamur", + "Name[is]": "Skoðunarhamir", "Name[it]": "Viste", "Name[ja]": "表示モード", "Name[ko]": "보기 모드", |