diff options
| author | l10n daemon script <[email protected]> | 2024-12-14 01:47:37 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-12-14 01:47:37 +0000 |
| commit | 517cc98e1574fdff4944f256d14ff10543b7c718 (patch) | |
| tree | 224448128f592008e0fbbebf42760f4e3c7a354c /src/itemactions | |
| parent | 81062df1158e62b7ed65fd81ef55a190637c4c8a (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/movetonewfolderitemaction.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json index c2956ea10..185667c32 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -38,6 +38,7 @@ "Name[pt_BR]": "Mover para pasta", "Name[ro]": "Mută în dosar nou", "Name[ru]": "Переместить в новую папку", + "Name[sa]": "New Folder इत्यत्र गच्छन्तु", "Name[sl]": "Premakni v novo mapo", "Name[sv]": "Flytta till ny katalog", "Name[ta]": "புதிய அடைவிற்கு நகர்த்து", |