diff options
| author | l10n daemon script <[email protected]> | 2022-05-17 01:46:51 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-05-17 01:46:51 +0000 |
| commit | e34eba7e0fe1720830fd410e4df42205d28f355a (patch) | |
| tree | f9c5fb93316134acd699aaea5a1cc21585386ab6 /src | |
| parent | 0b27270beec7a9b8309322b0c869e71dde30f3d2 (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')
| -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 d5f41b793..2d56db904 100644 --- a/src/dolphinpart.json.in +++ b/src/dolphinpart.json.in @@ -38,6 +38,7 @@ "Name[nl]": "Dolphin-weergave", "Name[pa]": "ਡਾਲਫਿਨ ਝਲਕ", "Name[pl]": "Widok Dolphina", + "Name[pt]": "Área do Dolphin", "Name[pt_BR]": "Visualização do Dolphin", "Name[ro]": "Dolphin – Vizualizare", "Name[ru]": "Представление Dolphin", |