From 08347a59c0a442c42b6c97c692b6d4aabb2e70df Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 28 Jun 2024 01:27:14 +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 deletion(-) (limited to 'src/itemactions') diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json index 3d140705e..1b040416f 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -11,7 +11,6 @@ "Name[ca@valencia]": "Mou cap a una carpeta nova", "Name[ca]": "Mou a una carpeta nova", "Name[cs]": "Přesunout do nové složky", - "Name[en_GB]": "Move to New Folder", "Name[eo]": "Movi al Nova Dosierujo", "Name[es]": "Mover a una nueva carpeta", "Name[fr]": "Déplacer vers le nouveau dossier", -- cgit v1.3