diff options
| author | l10n daemon script <[email protected]> | 2022-06-09 02:11:47 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-06-09 02:11:47 +0000 |
| commit | eb4a3cb45a18a46649da9145cbe2fef73fd38ca6 (patch) | |
| tree | 884b87e68483be712ec2e546451938b7cf723701 /src/settings | |
| parent | 3207ed3b97b8394192e58b89731b975d4230096f (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 1deb158cf..11b41a7a1 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 fichers", + "Description[ca@valencia]": "Configura les opcions generals del gestor de fitxers", "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 c1b782247..3e85eb8be 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 fichers", + "Description[ca@valencia]": "Configura la navegació del gestor de fitxers", "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 0d88fcee1..a0713967c 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 fichers", + "Description[ca@valencia]": "Configura els modos de vista del gestor de fitxers", "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", |