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"

diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json
index 2dd9eb815402d42b527197035e183469fd0abc3e..d85984cf2d4aa9417671420711ba6f5bf6304043 100644 (file)
--- 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[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",
         "Name[lt]": "Perkelti į naują aplanką",
         "Name[nl]": "Naar nieuwe map verplaatsen",
         "Name[nn]": "Flytt til ny mappe",