diff options
| author | l10n daemon script <[email protected]> | 2025-09-25 01:35:17 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-09-25 01:35:17 +0000 |
| commit | 0778b805cd823172f179809f535048c41bccef8d (patch) | |
| tree | 1a9cc482825dfb633ab1e7107f03da8b26432031 /src/dolphinpart.json.in | |
| parent | eb94e6dd675da09f1d8979be42ced179ec853a23 (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 4537f88a0..2e7b68a75 100644 --- a/src/dolphinpart.json.in +++ b/src/dolphinpart.json.in @@ -58,7 +58,7 @@ "Name[sa]": "डॉल्फिन दृश्य", "Name[se]": "Dolphinčájeheapmi", "Name[sk]": "Dolphin pohľad", - "Name[sl]": "Dolphin - pogled", + "Name[sl]": "Dolphinov pogled", "Name[sr@ijekavian]": "Делфинов приказ", "Name[sr@ijekavianlatin]": "Dolphinov prikaz", "Name[sr@latin]": "Dolphinov prikaz", |