From 69d9780315b415140dd2f923760c4b23d4115be1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 2 Sep 2017 04:54:36 +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" --- applets/quicksettings/package/metadata.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/applets/quicksettings/package/metadata.desktop b/applets/quicksettings/package/metadata.desktop index 86116c79..7babfb04 100644 --- a/applets/quicksettings/package/metadata.desktop +++ b/applets/quicksettings/package/metadata.desktop @@ -3,6 +3,7 @@ Encoding=UTF-8 Name=Quick Settings Name[ca]=Opcions ràpides Name[cs]=Rychlé nastavení +Name[es]=Ajustes rápidos Name[nl]=Snelle instellingen Name[pt]=Configuração Rápida Name[sv]=Snabbinställningar @@ -11,6 +12,7 @@ Name[x-test]=xxQuick Settingsxx Comment=A panel to quickly access most important settings Comment[ca]=Un plafó per accedir ràpidament a les opcions més importants +Comment[es]=Un panel para acceder rápidamente a los ajustes más importantes Comment[nl]=Een paneel voor snelle toegang tot de meest belangrijke instellingen Comment[pt]=Um painel para aceder rapidamente às configurações mais importantes Comment[sv]=En panel för att snabbt komma åt de viktigaste inställningarna