From 9dfce7b41864e11c1cd1d77d9acab961911d3bb0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 30 Mar 2018 07:12:18 +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" --- scripts/minimizeall/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/minimizeall/metadata.desktop b/scripts/minimizeall/metadata.desktop index 37f1919184..635e61e8fa 100644 --- a/scripts/minimizeall/metadata.desktop +++ b/scripts/minimizeall/metadata.desktop @@ -42,6 +42,7 @@ Name[zh_TW]=全部最小化 Comment=Adds a shortcut to minimize and restore all windows Comment[ca]=Afegeix una drecera per a minimitzar i restaurar totes les finestres Comment[ca@valencia]=Afig una drecera per a minimitzar i restaurar totes les finestres +Comment[cs]=Přidá zkratku k minimalizaci a obnovení všech oken. Comment[da]=Tilføjer en genvej til at minimere og gendanne alle vinduer Comment[de]=Fügt einen Kurzbefehl hinzu, um alle Fenster zu minimieren oder wieder anzuzeigen Comment[en_GB]=Adds a shortcut to minimise and restore all windows