diff options
| author | l10n daemon script <[email protected]> | 2022-06-02 01:44:29 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-06-02 01:44:29 +0000 |
| commit | 165448bc7f5dc943c259b37d9e3438335ca0251e (patch) | |
| tree | 203db107cd972fe548890c5ad9bef794b83d1519 /src/dolphinpart.json.in | |
| parent | 9bb2b0a6a80298d33f6c568bef051d98e8fff3d9 (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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in index fe0cb0210..887e6c7c4 100644 --- a/src/dolphinpart.json.in +++ b/src/dolphinpart.json.in @@ -42,7 +42,7 @@ "Name[pl]": "Widok Dolphina", "Name[pt]": "Área do Dolphin", "Name[pt_BR]": "Visualização do Dolphin", - "Name[ro]": "Dolphin – Vizualizare", + "Name[ro]": "Vizualizare Dolphin", "Name[ru]": "Представление Dolphin", "Name[se]": "Dolphinčájeheapmi", "Name[sk]": "Dolphin pohľad", |