diff options
| author | l10n daemon script <[email protected]> | 2024-01-17 01:13:46 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-01-17 01:13:46 +0000 |
| commit | 18cd42837f746984ae603513995c07fac8636b75 (patch) | |
| tree | a4a553d4e6de04a787cc5f1dcf0acb87a074ac4b /src/dolphinpart.json.in | |
| parent | 3a25f7628cf51dc1314adf4086f69baa8b6c7952 (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 58c0d9a9c..445e309ef 100644 --- a/src/dolphinpart.json.in +++ b/src/dolphinpart.json.in @@ -37,7 +37,7 @@ "Name[ka]": "Dolphin -ის ხედი", "Name[ko]": "Dolphin 보기", "Name[lt]": "Dolphin rodinys", - "Name[lv]": "Dolphin skats", + "Name[lv]": "„Dolphin“ skats", "Name[ml]": "ഡോള്ഫിന് അവതരണരീതി", "Name[my]": "လင်းပိုင် မြင်ကွင်း", "Name[nb]": "Dolphin-visning", |