From 427a430fe427f1173121bf57c11e7d9a0d0bdefa Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 20 Aug 2024 01:25:27 +0000 Subject: 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" --- src/itemactions/movetonewfolderitemaction.json | 1 + 1 file changed, 1 insertion(+) (limited to 'src') 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", -- cgit v1.3