From d185e218871f7fb8016291994564bf266dd5df70 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 12 Feb 2023 02:02:18 +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/kcmdolphinviewmodes.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/settings/kcm/kcmdolphinviewmodes.json') diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index 27fa2c528..3127f6dcd 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -12,6 +12,7 @@ "Description[de]": "Dateiverwaltungs-Ansichten einrichten", "Description[el]": "Διαμόρφωση των λειτουργιών προβολής του διαχειριστή αρχείων", "Description[en_GB]": "Configure file manager view modes", + "Description[eo]": "Agordi dosiermastrumajn vidreĝimojn", "Description[es]": "Configurar los modos de vistas del gestor de archivos", "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen ikuspegi moduak", "Description[fi]": "Tiedostonhallinnan näkymäasetukset", @@ -55,6 +56,7 @@ "Name[de]": "Ansichts-Modi", "Name[el]": "Λειτουργίες Προβολής", "Name[en_GB]": "View Modes", + "Name[eo]": "Vidreĝimoj", "Name[es]": "Modos de vistas", "Name[et]": "Vaaterežiimid", "Name[eu]": "Ikuspegi moduak", -- cgit v1.3