Commit 67e41d2d 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 9c7c1b64
......@@ -25,7 +25,7 @@ Name[sv]=Terminal för användaråterkoppling
Name[tr]=UserFeedback Konsolu
Name[uk]=Консоль UserFeedback
Name[x-test]=xxUserFeedback Consolexx
Name[zh_CN]=UserFeedback 控制台
Name[zh_CN]=用户反馈控制台
Name[zh_TW]=UserFeedback 終端
Comment=Analytics and administration tool for UserFeedback servers.
Comment[ca]=Eina d'anàlisi i d'administració pels servidors d'UserFeedback.
......@@ -51,7 +51,7 @@ Comment[sv]=Analys- och administrationsverktyg för användaråterkopplingsservr
Comment[tr]=UserFeedback sunucuları için analiz ve yönetim aracı.
Comment[uk]=Засіб для аналізу та адміністрування серверів UserFeedback.
Comment[x-test]=xxAnalytics and administration tool for UserFeedback servers.xx
Comment[zh_CN]=UserFeedback 服务器的分析和管理工具。
Comment[zh_CN]=用户反馈服务器的分析和管理工具。
Comment[zh_TW]=為 UserFeedback 伺服器設計的統計與管理工具
GenericName=UserFeedback Management Console
GenericName[ca]=Consola de gestió de l'UserFeedback
......@@ -77,7 +77,7 @@ GenericName[sv]=Hanteringsterminal för användaråterkoppling
GenericName[tr]=UserFeedback Yönetim Konsolu
GenericName[uk]=Консоль керування UserFeedback
GenericName[x-test]=xxUserFeedback Management Consolexx
GenericName[zh_CN]=UserFeedback 管理控制台
GenericName[zh_CN]=用户反馈管理控制台
GenericName[zh_TW]=UserFeedback 管理終端
Exec=UserFeedbackConsole
Icon=search
......
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