diff options
| author | l10n daemon script <[email protected]> | 2024-08-20 01:25:27 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-08-20 01:25:27 +0000 |
| commit | 427a430fe427f1173121bf57c11e7d9a0d0bdefa (patch) | |
| tree | 885abed5db798f56a5f6cc6aaec96d23a75a5090 /src | |
| parent | 6bd922b936e048a515ea2992d39e4a3568ecd5bb (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 2dd9eb815..d85984cf2 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -24,6 +24,7 @@ "Name[is]": "Færa í nýja möppu", "Name[it]": "Sposta in una nuova cartella", "Name[ka]": "გადატანა ახალ საქაღალდეში", + "Name[ko]": "새 폴더로 이동", "Name[lt]": "Perkelti į naują aplanką", "Name[nl]": "Naar nieuwe map verplaatsen", "Name[nn]": "Flytt til ny mappe", |