Commit 0672b217 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 2b35e29d
......@@ -2,6 +2,7 @@
Name=UserFeedback Console
Name[ca]=Consola de l'UserFeedback
Name[ca@valencia]=Consola de l'UserFeedback
Name[da]=Brugerfeedback-konsol
Name[de]=UserFeedback-Konsole
Name[en_GB]=UserFeedback Console
Name[es]=Consola de UserFeedback
......@@ -24,6 +25,7 @@ Name[x-test]=xxUserFeedback Consolexx
Comment=Analytics and administration tool for UserFeedback servers.
Comment[ca]=Eina d'anàlisi i d'administració pels servidors d'UserFeedback.
Comment[ca@valencia]=Eina d'anàlisi i d'administració pels servidors d'UserFeedback.
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[fr]=Outil d'analyse et d'administration pour les serveurs UserFeedback.
......@@ -44,6 +46,7 @@ Comment[x-test]=xxAnalytics and administration tool for UserFeedback servers.xx
GenericName=UserFeedback Management Console
GenericName[ca]=Consola de gestió de l'UserFeedback
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[fr]=Console de gestion 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