diff options
| author | l10n daemon script <[email protected]> | 2025-11-15 01:35:35 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-11-15 01:35:35 +0000 |
| commit | 3bd5568dd17b677f45dcb1e2b2b120c143536b84 (patch) | |
| tree | 6aac7e461596ee1833791e638c2fd8a66af2ad86 /src | |
| parent | 8aa12426596b2101cd54bc81ab5d3f07f799b368 (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')
| -rw-r--r-- | src/itemactions/hidefileitemaction.json | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/itemactions/hidefileitemaction.json b/src/itemactions/hidefileitemaction.json index ba918f0b5..f2115d15a 100644 --- a/src/itemactions/hidefileitemaction.json +++ b/src/itemactions/hidefileitemaction.json @@ -9,6 +9,7 @@ "Name[bg]": "Скриване", "Name[ca@valencia]": "Oculta", "Name[ca]": "Oculta", + "Name[de]": "Ausblenden", "Name[es]": "Ocultar", "Name[eu]": "Ezkutatu", "Name[fi]": "Piilota", @@ -24,6 +25,7 @@ "Name[nl]": "Verbergen", "Name[pl]": "Ukryj", "Name[pt_BR]": "Ocultar", + "Name[ru]": "Скрыть", "Name[sl]": "Skrij", "Name[sv]": "Dölj", "Name[tr]": "Gizle", |