diff options
| author | l10n daemon script <[email protected]> | 2024-05-25 01:19:17 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-05-25 01:19:17 +0000 |
| commit | 3fad514921f528145d4af3f921afaf3d1908a3cf (patch) | |
| tree | 9a878947d65fae381e850078b110af694efaf9fb /src/dolphinpart.json.in | |
| parent | efff6a57087754b76864721d27529b1aae63915c (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 91cfd0f75..d6928ef5e 100644 --- a/src/dolphinpart.json.in +++ b/src/dolphinpart.json.in @@ -33,7 +33,7 @@ "Name[is]": "Dolphin-yfirlit", "Name[it]": "Vista di Dolphin", "Name[ja]": "Dolphin ビュー", - "Name[ka]": "Dolphin -ის ხედი", + "Name[ka]": "Dolphin-ის ხედი", "Name[ko]": "Dolphin 보기", "Name[lt]": "Dolphin rodinys", "Name[lv]": "„Dolphin“ skats", |