diff options
| author | l10n daemon script <[email protected]> | 2022-10-20 02:11:03 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-10-20 02:11:03 +0000 |
| commit | 3333246dba8df1da7f0e735c7816efbce270c96a (patch) | |
| tree | b8ae20ea3aeac484dbccdfc5da09f227c3108eff /src/dolphinpart.json.in | |
| parent | 58ff9c9cc8f6023f484fd4dbf436e4f598b9fad4 (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 9502fd065..b01cb5dfa 100644 --- a/src/dolphinpart.json.in +++ b/src/dolphinpart.json.in @@ -9,7 +9,6 @@ ], "Name": "Dolphin View", "Name[ar]": "عرض دولفين", - "Name[ast]": "Vista de Dolphin", "Name[az]": "Dolphin görünüşü", "Name[bg]": "Изглед на Dolphin", "Name[ca@valencia]": "Vista de Dolphin", |