diff options
| author | l10n daemon script <[email protected]> | 2024-06-12 01:20:11 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-06-12 01:20:11 +0000 |
| commit | 02422bca8986769746001658e1b7d10940ae2b8d (patch) | |
| tree | ef44ff197f22e92dbb0b48b19d14b6791b2bfac7 | |
| parent | bee17990d04f8db77d31946ee6c756e9755a9f52 (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"
| -rw-r--r-- | src/itemactions/movetonewfolderitemaction.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json index f79fc6da4..7b47b521c 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -22,6 +22,7 @@ "Name[nl]": "Naar nieuwe map verplaatsen", "Name[pl]": "Przenieś do nowego katalogu", "Name[ro]": "Mută în dosar nou", + "Name[ru]": "Переместить в новую папку", "Name[sl]": "Premakni v novo mapo", "Name[tr]": "Yeni Klasöre Taşı", "Name[uk]": "Пересунути до нової теки", |