diff options
| author | l10n daemon script <[email protected]> | 2024-08-27 01:22:38 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-08-27 01:22:38 +0000 |
| commit | 2dc848d7d1166bfa6c1ae7d9970f6ad7f924d49b (patch) | |
| tree | 5f585497892ccaf65941505cc78d88dbf17659b4 /src | |
| parent | 11f27e98df4084df24f6beae74b5018de6c94878 (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/movetonewfolderitemaction.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json index bf31f6739..3f8efeddc 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -27,6 +27,7 @@ "Name[ka]": "გადატანა ახალ საქაღალდეში", "Name[ko]": "새 폴더로 이동", "Name[lt]": "Perkelti į naują aplanką", + "Name[lv]": "Pārvietot uz jaunu mapi", "Name[nl]": "Naar nieuwe map verplaatsen", "Name[nn]": "Flytt til ny mappe", "Name[pa]": "ਨਵੇਂ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ", |