From 0a18c04e19da3d94e3c885237c9d4d2a9fc822e1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 6 Feb 2026 01:41:48 +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 a44732b8a..0b1b67551 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -21,6 +21,7 @@ "Name[eu]": "Eraman karpeta berrira", "Name[fi]": "Siirrä uuteen kansioon", "Name[fr]": "Déplacer vers le nouveau dossier", + "Name[ga]": "Bog go Fillteán Nua", "Name[gl]": "Mover a un novo cartafol", "Name[he]": "העברה לתיקייה חדשה", "Name[hu]": "Áthelyezés új mappába", -- cgit v1.3.1