diff options
| author | l10n daemon script <[email protected]> | 2023-01-22 02:03:57 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-01-22 02:03:57 +0000 |
| commit | 83964c2071893b65e6fd8dc96bad5388107c8ef3 (patch) | |
| tree | 77e6ceb4958d7729d7ba2b854565063ce05a426a /src/dolphinpart.json.in | |
| parent | 579eadeb6ddffb03e8043090a330c6dba0717299 (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 d48aff759..9510ce34e 100644 --- a/src/dolphinpart.json.in +++ b/src/dolphinpart.json.in @@ -39,7 +39,7 @@ "Name[lv]": "Dolphin skats", "Name[ml]": "ഡോള്ഫിന് അവതരണരീതി", "Name[my]": "လင်းပိုင် မြင်ကွင်း", - "Name[nb]": "Dolphin visning", + "Name[nb]": "Dolphin-visning", "Name[nl]": "Dolphin-weergave", "Name[nn]": "Dolphin-vising", "Name[pa]": "ਡਾਲਫਿਨ ਝਲਕ", |