Commit cc9b031f authored by l10n daemon script's avatar l10n daemon script

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"
parent 976876ce
......@@ -6,6 +6,7 @@ Name[da]=Brugerfeedback-konsol
Name[en_GB]=UserFeedback Console
Name[es]=Consola de UserFeedback
Name[fr]=Console UserFeedback
Name[gl]=Consola de UserFeedback
Name[it]=Console di UserFeedback
......@@ -29,6 +30,7 @@ Comment[ca@valencia]=Eina d'anàlisi i d'administració pels servidors d'UserFee
Comment[da]=Analyse- og administrationsværktøj til brugerfeedback-servere.
Comment[en_GB]=Analytics and administration tool for UserFeedback servers.
Comment[es]=Herramienta de análisis y administración para servidores de UserFeedback.
Comment[fi]=Analyysi- ja hallintatyökalu käyttäjäpalautepalvelimiin.
Comment[fr]=Outil d'analyse et d'administration pour les serveurs UserFeedback.
Comment[gl]=Ferramenta de análise de datos e de administración para servidores de UserFeedback.
Comment[it]=Strumento per analitiche e amministrativo per i server di tipo UserFeedback.
......@@ -51,6 +53,7 @@ GenericName[ca@valencia]=Consola de gestió de l'UserFeedback
GenericName[da]=Konsol til håndtering af brugerfeedback
GenericName[en_GB]=UserFeedback Management Console
GenericName[es]=Consola de gestión de UserFeedback
GenericName[fi]=Käyttäjäpalautteen hallintakonsoli
GenericName[fr]=Console de gestion UserFeedback
GenericName[gl]=Consola de xestión de UserFeedback
GenericName[it]=Console di gestione di UserFeedback
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment