From 310c2c5a941c8b0112204305bb374497ad476976 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 26 Aug 2024 01:23:13 +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') diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json index d85984cf2..bf31f6739 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[de]": "In neuen Ordner verschieben", "Name[el]": "Μετακίνηση σε Νέο Φάκελο", "Name[eo]": "Movi al Nova Dosierujo", "Name[es]": "Mover a una nueva carpeta", -- cgit v1.3