diff options
| author | l10n daemon script <[email protected]> | 2024-08-28 01:32:24 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-08-28 01:32:24 +0000 |
| commit | 6b1a5a2779f404165fd1e0b117fdac6dbdf75cc5 (patch) | |
| tree | 387b08a9a802cd34a58d248004c52b54a5c9b499 /src/dolphinpart.json.in | |
| parent | 5797371c789f8814b2310b2ee659724d10a413c2 (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, 1 insertions, 0 deletions
diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in index 1b1343d11..d0cf5174a 100644 --- a/src/dolphinpart.json.in +++ b/src/dolphinpart.json.in @@ -17,6 +17,7 @@ "Name[da]": "Dolphin-visning", "Name[de]": "Dolphin-Ansicht", "Name[el]": "Προβολή Dolphin", + "Name[en_GB]": "Dolphin View", "Name[eo]": "Dolfin-Vido", "Name[es]": "Vista de Dolphin", "Name[et]": "Dolphini vaade", |