From c927d1ab3881c519b3df7f756435a5c4d7e01eb3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 15 Sep 2020 09:55:30 +0200 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/panelplugins/filebrowserpanel/filebrowserpanelplugin.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/panelplugins/filebrowserpanel/filebrowserpanelplugin.json b/src/panelplugins/filebrowserpanel/filebrowserpanelplugin.json index fcc94d7f..f66709b9 100644 --- a/src/panelplugins/filebrowserpanel/filebrowserpanelplugin.json +++ b/src/panelplugins/filebrowserpanel/filebrowserpanelplugin.json @@ -3,6 +3,7 @@ "Dependencies": [], "Description": "A panel for working with files inside Cantor", "Description[ca]": "Un plafó per a treballar amb fitxers dins del Cantor", + "Description[de]": "Eine Kontrollleiste zur Verwaltung von Dateien in Cantor", "Description[es]": "Un panel para trabajar con archivos dentro de Cantor", "Description[fr]": "Un panneau pour travailler avec les fichiers à l'intérieur de Cantor", "Description[it]": "Un pannello per lavorare con i file dentro Cantor", -- GitLab