From 15bd7990ac4dee19dbdbce6e79c9ea6625ecc0c1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 28 Jul 2024 01:23:46 +0000 Subject: [PATCH] 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(+) diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json index 7c8f43289..ce4a9d4e1 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -17,6 +17,7 @@ "Name[eu]": "Eraman karpeta berrira", "Name[fr]": "Déplacer vers le nouveau dossier", "Name[he]": "העברה לתיקייה חדשה", + "Name[hu]": "Áthelyezés új mappába", "Name[ia]": "Move a nove dossier", "Name[is]": "Færa í nýja möppu", "Name[it]": "Sposta in una nuova cartella", -- 2.47.3