diff options
| author | l10n daemon script <[email protected]> | 2022-06-07 02:25:10 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-06-07 02:25:10 +0000 |
| commit | e406bc197fc0116d7fd8bb62086b41c52417c948 (patch) | |
| tree | d4fc3528974379f8c6b6837b1fbadf4c7d8025cc /src/settings | |
| parent | ee76ae866ecebe22667ac8227853ca711be5c2c7 (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 | 2 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.json | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index 11b41a7a1..1deb158cf 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -3,7 +3,7 @@ "Description": "Configure general file manager settings", "Description[ar]": "اضبط إعدادات مدير الملفّات العامّة", "Description[az]": "Əsas fayl meneceri ayarlarını tənzimləyin", - "Description[ca@valencia]": "Configura les opcions generals del gestor de fitxers", + "Description[ca@valencia]": "Configura les opcions generals del gestor de fichers", "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", diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json index 3e85eb8be..c1b782247 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -3,7 +3,7 @@ "Description": "Configure file manager navigation", "Description[ar]": "اضبط التّنقّل في مدير الملفّات", "Description[az]": "Fayl meneceri naviqasiyasını tənzimləyin", - "Description[ca@valencia]": "Configura la navegació del gestor de fitxers", + "Description[ca@valencia]": "Configura la navegació del gestor de fichers", "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", diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index a0713967c..0d88fcee1 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -3,7 +3,7 @@ "Description": "Configure file manager view modes", "Description[ar]": "اضبط أوضاع العرض في مدير الملفّات", "Description[az]": "Fayl meneceri baxış rejimlərini tənzimləyin", - "Description[ca@valencia]": "Configura els modos de vista del gestor de fitxers", + "Description[ca@valencia]": "Configura els modos de vista del gestor de fichers", "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", |