diff options
| author | l10n daemon script <[email protected]> | 2023-01-02 02:34:18 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-01-02 02:34:18 +0000 |
| commit | d11d4781487243dddc3a3899bd65d21542a93383 (patch) | |
| tree | e4221185daeb79c8b8c944576bbc6ce5c6ebdcde /src/dolphinpart.json.in | |
| parent | dccd8c4899e2811960f60c825ddf433ce174b372 (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 030710cea..d48aff759 100644 --- a/src/dolphinpart.json.in +++ b/src/dolphinpart.json.in @@ -30,7 +30,7 @@ "Name[ia]": "Vista de Dolphin", "Name[id]": "Tampilan Dolphin", "Name[ie]": "Vise de Dolphin", - "Name[is]": "Dolphin-sýn", + "Name[is]": "Dolphin-yfirlit", "Name[it]": "Vista di Dolphin", "Name[ja]": "Dolphin ビュー", "Name[ka]": "Dolphin -ის ხედი", |