diff options
| author | l10n daemon script <[email protected]> | 2024-06-11 01:19:51 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-06-11 01:19:51 +0000 |
| commit | 5d2b495c44746d37f5e281f46ac7ab6cd9702cc7 (patch) | |
| tree | 06a2da516daf2ff3f09e94e9556c9d8bf8df2fc6 | |
| parent | c14de67536b708e3eaa7030ecdff72653e557d07 (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 2c516d0bc..f79fc6da4 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -21,6 +21,7 @@ "Name[lt]": "Perkelti į naują aplanką", "Name[nl]": "Naar nieuwe map verplaatsen", "Name[pl]": "Przenieś do nowego katalogu", + "Name[ro]": "Mută în dosar nou", "Name[sl]": "Premakni v novo mapo", "Name[tr]": "Yeni Klasöre Taşı", "Name[uk]": "Пересунути до нової теки", |