From eb4a3cb45a18a46649da9145cbe2fef73fd38ca6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 9 Jun 2022 02:11:47 +0000 Subject: 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" --- src/settings/kcm/kcmdolphinnavigation.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/settings/kcm/kcmdolphinnavigation.json') 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", -- cgit v1.3