diff options
| author | l10n daemon script <[email protected]> | 2022-12-30 02:12:34 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-12-30 02:12:34 +0000 |
| commit | 36fda229fef526ae306c6efbaa5b26ec5e8dcfce (patch) | |
| tree | 27305498dbe311b49514376d4d867d44cf8549ee /src/settings | |
| parent | 88c504b38119fe76230630b276d078d636855153 (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 | 1 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.json | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index 9d9902e8c..e8fc86d07 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -10,6 +10,7 @@ "Description[cs]": "Obecné nastavení správce souborů", "Description[da]": "Konfiguration af generelle indstillinger for filhåndtering", "Description[de]": "Allgemeine Einstellungen an der Dateiverwaltung vornehmen", + "Description[el]": "Διαμόρφωση γενικών ρυθμίσεων διαχείρισης αρχείων", "Description[en_GB]": "Configure general file manager settings", "Description[es]": "Configurar las preferencias generales del gestor de archivos", "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen ezarpen orokorrak", @@ -50,6 +51,7 @@ "Name[cs]": "Obecné", "Name[da]": "Generelt", "Name[de]": "Allgemein", + "Name[el]": "Γενικά", "Name[en_GB]": "General", "Name[es]": "General", "Name[eu]": "Orokorra", diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json index 596624f5f..08d591d8b 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -10,6 +10,7 @@ "Description[cs]": "Nastavení navigace správce souborů", "Description[da]": "Indstil navigation i filhåndtering", "Description[de]": "Einstellungen zur Navigation mit der Dateiverwaltung", + "Description[el]": "Διαμόρφωση πλοήγησης του διαχειριστή αρχείων", "Description[en_GB]": "Configure file manager navigation", "Description[es]": "Configurar la navegación del gestor de archivos", "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen nabigatzea", diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index 3bd1b82fc..4feceab15 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -10,6 +10,7 @@ "Description[cs]": "Nastavení režimů pohledu správce souborů", "Description[da]": "Indstil filhåndteringens visningstilstande", "Description[de]": "Dateiverwaltungs-Ansichten einrichten", + "Description[el]": "Διαμόρφωση των λειτουργιών προβολής του διαχειριστή αρχείων", "Description[en_GB]": "Configure file manager view modes", "Description[es]": "Configurar los modos de vistas del gestor de archivos", "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen ikuspegi moduak", |