diff options
| author | l10n daemon script <[email protected]> | 2022-05-18 01:44:40 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-05-18 01:44:40 +0000 |
| commit | b700c94d3eab387cfdef5aea5460fde5d2efa5bd (patch) | |
| tree | ef592033f8d3662ebe6379a762e7308ea2d28f4e /src/settings | |
| parent | e34eba7e0fe1720830fd410e4df42205d28f355a (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 | 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 8a4c602a1..9536dc751 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -7,6 +7,7 @@ "Description[ca]": "Configura les opcions generals del gestor de fitxers", "Description[es]": "Configurar las preferencias generales del gestor de archivos", "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[it]": "Configura le impostazioni generali del gestore dei file", "Description[ko]": "일반 파일 관리자 설정", @@ -32,6 +33,7 @@ "Name[cs]": "Obecné", "Name[es]": "General", "Name[fr]": "Général", + "Name[ia]": "General", "Name[id]": "Umum", "Name[it]": "Generale", "Name[ko]": "일반", diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json index 71b507874..8d06ab13d 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -7,6 +7,7 @@ "Description[ca]": "Configura la navegació del gestor de fitxers", "Description[es]": "Configurar la navegación del gestor de archivos", "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[it]": "Configura la navigazione col gestore dei file", "Description[ko]": "파일 관리자 탐색 설정", diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index aa1fcd2e2..9a59d84d6 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -7,6 +7,7 @@ "Description[ca]": "Configura els modes de vista del gestor de fitxers", "Description[es]": "Configurar los modos de vistas del gestor de archivos", "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[it]": "Configura le viste del gestore dei file", "Description[ko]": "파일 관리자 보기 모드 설정", |