diff options
| author | l10n daemon script <[email protected]> | 2024-07-19 01:21:28 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-07-19 01:21:28 +0000 |
| commit | 8560c73e677186572a134ba427443924eeda9646 (patch) | |
| tree | 1aaeb534d42c0e4ab6c0d1c684ce89bf64597e71 /src/settings | |
| parent | 8cea3f233687493640db9c10251ff1accd3d793c (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 | 1 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.json | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index 1805822e3..c2fd44577 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -10,6 +10,7 @@ "Name[cs]": "Obecné", "Name[da]": "Generelt", "Name[de]": "Allgemein", + "Name[el]": "Γενικά", "Name[eo]": "Ĝenerala", "Name[eu]": "Orokorra", "Name[fi]": "Perusasetukset", diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index 508bb908a..f02d99a09 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -11,6 +11,7 @@ "Name[cs]": "Režimy pohledu", "Name[da]": "Visningstilstande", "Name[de]": "Ansichts-Modi", + "Name[el]": "Λειτουργίες Προβολής", "Name[eo]": "Vidreĝimoj", "Name[es]": "Modos de vistas", "Name[et]": "Vaaterežiimid", |