From 880dd6dc0b0e9cd2af66422bdd05c9e52b944ea6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 31 Dec 2017 04:52:32 +0100 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 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/minimizeall/metadata.desktop b/scripts/minimizeall/metadata.desktop index cccb6ace25..218ce8b9b0 100644 --- a/scripts/minimizeall/metadata.desktop +++ b/scripts/minimizeall/metadata.desktop @@ -40,6 +40,13 @@ Name[x-test]=xxMinimizeAllxx Name[zh_CN]=最小化所有 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[en_GB]=Adds a shortcut to minimise and restore all windows +Comment[nl]=Voegt een sneltoets toe om alle vensters te minimaliseren en te herstellen +Comment[pt]=Adiciona um atalho para minimizar ou repor todas as janelas +Comment[uk]=Додає скорочення мінімізації усіх вікон або скасування такої мінімізації для усіх вікон +Comment[x-test]=xxAdds a shortcut to minimize and restore all windowsxx Icon=preferences-system-windows-script-test Type=Service