diff options
| author | l10n daemon script <[email protected]> | 2023-01-02 02:34:18 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-01-02 02:34:18 +0000 |
| commit | d11d4781487243dddc3a3899bd65d21542a93383 (patch) | |
| tree | e4221185daeb79c8b8c944576bbc6ce5c6ebdcde /src/settings | |
| parent | dccd8c4899e2811960f60c825ddf433ce174b372 (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 | 4 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.json | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index e8fc86d07..835310b85 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -19,7 +19,7 @@ "Description[ia]": "Configura preferentias del gerente general de file", "Description[id]": "Konfigurasikan pengaturan pengelola file umum", "Description[ie]": "Configurar li parametres del gerente de files", - "Description[is]": "Sýsla með almennar stillingar skráastjóra", + "Description[is]": "Grunnstilla almennar stillingar skráastjóra", "Description[it]": "Configura le impostazioni generali del gestore dei file", "Description[ka]": "ფაილების მმართველის ზოგადი მორგება", "Description[ko]": "일반 파일 관리자 설정", diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json index 08d591d8b..d7607fa30 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -19,7 +19,7 @@ "Description[ia]": "Configura navigation del gerente de file", "Description[id]": "Konfigurasikan navigasi pengelola file", "Description[ie]": "Configurar li navigation del gerente de files", - "Description[is]": "Stilla flakkstýringar skráastjóra", + "Description[is]": "Grunnstilla flakk um skráakerfi", "Description[it]": "Configura la navigazione col gestore dei file", "Description[ka]": "ფაილების მმართველის ნავიგაციის მორგება", "Description[ko]": "파일 관리자 탐색 설정", @@ -65,7 +65,7 @@ "Name[ia]": "Navigation", "Name[id]": "Navigasi", "Name[ie]": "Navigation", - "Name[is]": "Flakk", + "Name[is]": "Skoðun", "Name[it]": "Navigazione", "Name[ja]": "ナビゲーション", "Name[ka]": "ნავიგაცია", diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index 4feceab15..0ce917ad8 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -19,7 +19,7 @@ "Description[ia]": "Configura le modos de vista del gerente de file", "Description[id]": "Konfigurasikan mode tampilan pengelola file", "Description[ie]": "Configurar li modes de vise del gerente de files", - "Description[is]": "Stilla skoðunarhami í skráastjóra", + "Description[is]": "Grunnstilla yfirlitssnið í skráastjóra", "Description[it]": "Configura le viste del gestore dei file", "Description[ka]": "ფაილების მმართველის ხედის რეჟიმების მორგება", "Description[ko]": "파일 관리자 보기 모드 설정", @@ -64,7 +64,7 @@ "Name[ia]": "Modos de vista", "Name[id]": "Mode Tampilan", "Name[ie]": "Modes de vise", - "Name[is]": "Skoðunarhamir", + "Name[is]": "Yfirlitssnið", "Name[it]": "Viste", "Name[ja]": "表示モード", "Name[ka]": "ნახვის რეჟიმები", |