diff options
| author | l10n daemon script <[email protected]> | 2022-11-06 01:51:33 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-11-06 01:51:33 +0000 |
| commit | 4f1d8fef9216d6ae7b5b9bd1fa5523103ccf419a (patch) | |
| tree | 6cc95efdd867c960936267a1c723349a3a3d138a /src/settings/kcm | |
| parent | 5ef1136ea3362a6722b6f4da020d44513f690b31 (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 | 2 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.json | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index bae037992..00890b763 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -16,6 +16,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[ie]": "Configurar li parametres del gerente de files", "Description[is]": "Sýsla með almennar stillingar skráastjóra", "Description[it]": "Configura le impostazioni generali del gestore dei file", "Description[ka]": "ფაილების მმართველის ზოგადი მორგება", @@ -53,6 +54,7 @@ "Name[fr]": "Général", "Name[ia]": "General", "Name[id]": "Umum", + "Name[ie]": "General", "Name[is]": "Almennt", "Name[it]": "Generale", "Name[ka]": "მთავარი", diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json index 0f8530b88..803735a2a 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -16,6 +16,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[ie]": "Configurar li navigation del gerente de files", "Description[is]": "Stilla flakkstýringar skráastjóra", "Description[it]": "Configura la navigazione col gestore dei file", "Description[ka]": "ფაილების მმართველის ნავიგაციის მორგება", @@ -59,6 +60,7 @@ "Name[hu]": "Navigálás", "Name[ia]": "Navigation", "Name[id]": "Navigasi", + "Name[ie]": "Navigation", "Name[is]": "Flakk", "Name[it]": "Navigazione", "Name[ja]": "ナビゲーション", diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index e77f4906d..7f330f398 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -16,6 +16,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[ie]": "Configurar li modes de vise del gerente de files", "Description[is]": "Stilla skoðunarhami í skráastjóra", "Description[it]": "Configura le viste del gestore dei file", "Description[ka]": "ფაილების მმართველის ხედის რეჟიმების მორგება", @@ -58,6 +59,7 @@ "Name[hu]": "Nézetmódok", "Name[ia]": "Modos de vista", "Name[id]": "Mode Tampilan", + "Name[ie]": "Modes de vise", "Name[is]": "Skoðunarhamir", "Name[it]": "Viste", "Name[ja]": "表示モード", |