From 8fb06607483553cf83faf33a8ae88e9c468420ab Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 5 Aug 2024 01:22:56 +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 ce4a9d4e1..bb8bb48e9 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -19,6 +19,7 @@ "Name[he]": "העברה לתיקייה חדשה", "Name[hu]": "Áthelyezés új mappába", "Name[ia]": "Move a nove dossier", + "Name[ie]": "Mover a un nov fólder", "Name[is]": "Færa í nýja möppu", "Name[it]": "Sposta in una nuova cartella", "Name[ka]": "გადატანა ახალ საქაღალდეში", -- 2.47.3