diff options
| author | l10n daemon script <[email protected]> | 2025-10-05 01:30:38 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-10-05 01:30:38 +0000 |
| commit | 1cfe9f9ad3569be01da2e4a8877017c03ac484cf (patch) | |
| tree | 9401e7c667fa30dd7922c95453cba3f5be237426 /src/itemactions | |
| parent | f9db28431445a4b08c37dc5067a3f1c51c0c08dd (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/itemactions')
| -rw-r--r-- | src/itemactions/hidefileitemaction.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/itemactions/hidefileitemaction.json b/src/itemactions/hidefileitemaction.json index 0efd6f72f..0f8e4742c 100644 --- a/src/itemactions/hidefileitemaction.json +++ b/src/itemactions/hidefileitemaction.json @@ -14,6 +14,7 @@ "Name[fr]": "Masquer", "Name[he]": "הסתרה", "Name[ia]": "Cela", + "Name[is]": "Fela", "Name[it]": "Nascondi", "Name[ka]": "დამალვა", "Name[nl]": "Verbergen", |