diff options
| author | l10n daemon script <[email protected]> | 2023-07-28 01:43:52 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-07-28 01:43:52 +0000 |
| commit | 2f0369b333ac5c714d59b74665e76a41a5936042 (patch) | |
| tree | 77c8d763534e86031195fd3b20745f47118c4693 /src/dolphinpart.json.in | |
| parent | 3123c086a77c28730866e848178c7e2d9a9006cb (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/dolphinpart.json.in')
| -rw-r--r-- | src/dolphinpart.json.in | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in index 59be51716..e8c87b8f2 100644 --- a/src/dolphinpart.json.in +++ b/src/dolphinpart.json.in @@ -17,7 +17,6 @@ "Name[cs]": "Pohled Dolphin", "Name[da]": "Dolphin-visning", "Name[de]": "Dolphin-Ansicht", - "Name[el]": "Dolphin View", "Name[en_GB]": "Dolphin View", "Name[eo]": "Dolfin-Vido", "Name[es]": "Vista de Dolphin", |