From b1eb12e03ac0206c463c95b207209f5e181f3d71 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 9 Jul 2022 01:52:00 +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/kcmdolphingeneral.json | 1 + src/settings/kcm/kcmdolphinnavigation.json | 1 + src/settings/kcm/kcmdolphinviewmodes.json | 1 + 3 files changed, 3 insertions(+) (limited to 'src/settings') diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index 6f48717d8..954fb1f72 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -6,6 +6,7 @@ "Description[bg]": "Конфигуриране на общите настройки на файловия мениджър", "Description[ca@valencia]": "Configura les opcions generals del gestor de fitxers", "Description[ca]": "Configura les opcions generals del gestor de fitxers", + "Description[cs]": "Obecné nastavení správce souborů", "Description[de]": "Allgemeine Einstellungen an der Dateiverwaltung vornehmen", "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 d75414e60..ddc5d19e6 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -6,6 +6,7 @@ "Description[bg]": "Конфигуриране на настройките за навигация на файловия мениджър", "Description[ca@valencia]": "Configura la navegació del gestor de fitxers", "Description[ca]": "Configura la navegació del gestor de fitxers", + "Description[cs]": "Nastavení navigace správce souborů", "Description[de]": "Einstellungen zur Navigation mit der Dateiverwaltung", "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 e754cf03f..f5ef43c14 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -6,6 +6,7 @@ "Description[bg]": "Конфигуриране на режимите за изглед на файловия мениджър", "Description[ca@valencia]": "Configura els modes de vista del gestor de fitxers", "Description[ca]": "Configura els modes de vista del gestor de fitxers", + "Description[cs]": "Nastavení režimů pohledu správce souborů", "Description[de]": "Dateiverwaltungs-Ansichten einrichten", "Description[es]": "Configurar los modos de vistas del gestor de archivos", "Description[fr]": "Configurer les modes d'affichage du gestionnaire de fichiers", -- cgit v1.3