From 0778b805cd823172f179809f535048c41bccef8d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 25 Sep 2025 01:35:17 +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/itemactions/movetonewfolderitemaction.json') diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json index 3b995afa8..a44732b8a 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -28,6 +28,7 @@ "Name[ie]": "Mover a un nov fólder", "Name[is]": "Færa í nýja möppu", "Name[it]": "Sposta in una nuova cartella", + "Name[ja]": "新しいフォルダに移動", "Name[ka]": "გადატანა ახალ საქაღალდეში", "Name[ko]": "새 폴더로 이동", "Name[lt]": "Perkelti į naują aplanką", -- cgit v1.3.1