diff options
| author | l10n daemon script <[email protected]> | 2024-06-28 01:27:14 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-06-28 01:27:14 +0000 |
| commit | 08347a59c0a442c42b6c97c692b6d4aabb2e70df (patch) | |
| tree | 079bd612ebaee083b7d2109bf066e04564ff1d9d /src/dolphinpart.json.in | |
| parent | 3a54a369d9115fa66ed474c4eee3ef51b300db3c (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 d6928ef5e..15ef97633 100644 --- a/src/dolphinpart.json.in +++ b/src/dolphinpart.json.in @@ -16,7 +16,6 @@ "Name[cs]": "Pohled Dolphin", "Name[da]": "Dolphin-visning", "Name[de]": "Dolphin-Ansicht", - "Name[en_GB]": "Dolphin View", "Name[eo]": "Dolfin-Vido", "Name[es]": "Vista de Dolphin", "Name[et]": "Dolphini vaade", |