From 8560c73e677186572a134ba427443924eeda9646 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 19 Jul 2024 01:21:28 +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') diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json index 03de58f2c..7cdb60c8b 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -11,6 +11,7 @@ "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[el]": "Μετακίνηση σε Νέο Φάκελο", "Name[eo]": "Movi al Nova Dosierujo", "Name[es]": "Mover a una nueva carpeta", "Name[eu]": "Eraman karpeta berrira", -- cgit v1.3.1