diff -Nru libusermetrics-1.1.1+14.10.20141020/CMakeLists.txt libusermetrics-1.1.1+15.04.20150219/CMakeLists.txt --- libusermetrics-1.1.1+14.10.20141020/CMakeLists.txt 2014-10-20 15:19:04.000000000 +0000 +++ libusermetrics-1.1.1+15.04.20150219/CMakeLists.txt 2015-02-19 09:31:24.000000000 +0000 @@ -40,6 +40,15 @@ find_package(Qt5Qml REQUIRED) include_directories(${Qt5Qml_INCLUDE_DIRS}) +pkg_check_modules(GLIB2 REQUIRED glib-2.0) +include_directories(${GLIB2_INCLUDE_DIRS}) + +pkg_check_modules(GOBJECT2 REQUIRED gobject-2.0) +include_directories(${GOBJECT2_INCLUDE_DIRS}) + +pkg_check_modules(CLICK REQUIRED click-0.4 REQUIRED) +include_directories(${CLICK_INCLUDE_DIRS}) + pkg_check_modules(QDJANGO_DB REQUIRED qdjango-db REQUIRED) include_directories(${QDJANGO_DB_INCLUDE_DIRS}) @@ -98,4 +107,4 @@ ADD_CUSTOM_TARGET( check ${CMAKE_CTEST_COMMAND} --force-new-ctest-process --output-on-failure -) \ No newline at end of file +) diff -Nru libusermetrics-1.1.1+14.10.20141020/data/com.canonical.usermetrics.DataSource.xml libusermetrics-1.1.1+15.04.20150219/data/com.canonical.usermetrics.DataSource.xml --- libusermetrics-1.1.1+14.10.20141020/data/com.canonical.usermetrics.DataSource.xml 2014-10-20 15:19:04.000000000 +0000 +++ libusermetrics-1.1.1+15.04.20150219/data/com.canonical.usermetrics.DataSource.xml 2015-02-19 09:31:24.000000000 +0000 @@ -38,5 +38,7 @@ + + \ No newline at end of file diff -Nru libusermetrics-1.1.1+14.10.20141020/debian/changelog libusermetrics-1.1.1+15.04.20150219/debian/changelog --- libusermetrics-1.1.1+14.10.20141020/debian/changelog 2015-02-19 13:53:17.000000000 +0000 +++ libusermetrics-1.1.1+15.04.20150219/debian/changelog 2015-02-19 13:53:17.000000000 +0000 @@ -1,3 +1,10 @@ +libusermetrics (1.1.1+15.04.20150219-0ubuntu1) vivid; urgency=medium + + [ Pete Woods ] + * Read translations from click packages (LP: #1327419) + + -- CI Train Bot Thu, 19 Feb 2015 09:31:29 +0000 + libusermetrics (1.1.1+14.10.20141020-0ubuntu1) utopic; urgency=low [ Ubuntu daily release ] diff -Nru libusermetrics-1.1.1+14.10.20141020/debian/control libusermetrics-1.1.1+15.04.20150219/debian/control --- libusermetrics-1.1.1+14.10.20141020/debian/control 2015-02-19 13:53:17.000000000 +0000 +++ libusermetrics-1.1.1+15.04.20150219/debian/control 2015-02-19 13:53:17.000000000 +0000 @@ -9,6 +9,7 @@ gettext, google-mock (>= 1.6.0+svn437), libapparmor-dev, + libclick-0.4-dev, libgsettings-qt-dev, libgtest-dev, libqdjango-dev, diff -Nru libusermetrics-1.1.1+14.10.20141020/po/fi.po libusermetrics-1.1.1+15.04.20150219/po/fi.po --- libusermetrics-1.1.1+14.10.20141020/po/fi.po 1970-01-01 00:00:00.000000000 +0000 +++ libusermetrics-1.1.1+15.04.20150219/po/fi.po 2015-02-19 09:31:17.000000000 +0000 @@ -0,0 +1,159 @@ +# Finnish translation for libusermetrics +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the libusermetrics package. +# FIRST AUTHOR , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: libusermetrics\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2014-09-16 09:15+0100\n" +"PO-Revision-Date: 2014-11-12 14:20+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-11-13 06:37+0000\n" +"X-Generator: Launchpad (build 17241)\n" + +#: src/usermetricsservice/main.cpp:59 +msgid "Could not open database" +msgstr "" + +#: src/usermetricsservice/main.cpp:77 +msgid "Unable to register user metrics service on DBus" +msgstr "" + +#: src/usermetricsservice/main.cpp:91 +msgid "Unable to unregister user metrics service on DBus" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:51 +msgid "Could not register user data object with DBus" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:81 +msgid "Unknown data source" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:90 +msgid "Attempt to create data set owned by another user" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:100 +msgid "Could not locate user data" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:106 +msgid "Attempt to create data set owned by another application" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:117 +msgid "Data set query failed" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:130 +#: src/usermetricsservice/DBusDataSet.cpp:127 +msgid "Could not save data set" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:140 +msgid "New data set could not be found" +msgstr "" + +#: src/usermetricsservice/DBusDataSource.cpp:68 +#: src/usermetricsservice/DBusDataSource.cpp:86 +#: src/usermetricsservice/DBusDataSource.cpp:104 +#: src/usermetricsservice/DBusDataSource.cpp:116 +#: src/usermetricsservice/DBusDataSource.cpp:134 +#: src/usermetricsservice/DBusDataSource.cpp:172 +#: src/usermetricsservice/DBusDataSource.cpp:190 +#: src/usermetricsservice/DBusDataSource.cpp:216 +#: src/usermetricsservice/DBusDataSource.cpp:234 +#: src/usermetricsservice/DBusUserMetrics.cpp:187 +msgid "Could not save data source" +msgstr "" + +#: src/usermetricsservice/DBusDataSet.cpp:143 +msgid "Attempt to update data owned by another user" +msgstr "" + +#: src/usermetricsservice/DBusDataSet.cpp:151 +msgid "Attempt to update data owned by another application" +msgstr "" + +#: src/usermetricsservice/DBusDataSet.cpp:170 +msgid "Attempt to increment data owned by another user" +msgstr "" + +#: src/usermetricsservice/DBusDataSet.cpp:178 +msgid "Attempt to increment data owned by another application" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:54 +msgid "Unable to register user metrics object on DBus" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:141 +#: src/usermetricsservice/DBusUserMetrics.cpp:153 +msgid "Data source query failed" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:249 +msgid "Attempt to create user data owned by another user" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:258 +msgid "User data query failed" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:267 +msgid "Could not save user data" +msgstr "" + +#: src/libusermetricsinput/main.cpp:35 +#: src/libusermetricsinput/main-increment.cpp:35 +msgid "Usage: " +msgstr "Käyttö: " + +#: src/libusermetricsinput/main.cpp:37 +msgid "DATA_SOURCE_ID FORMAT_STRING EMPTY_DATA_STRING USERNAME " +msgstr "" + +#: src/libusermetricsinput/main-increment.cpp:37 +msgid "DATA_SOURCE_ID FORMAT_STRING EMPTY_DATA_STRING USERNAME [AMOUNT]" +msgstr "" + +#: src/modules/UserMetrics/Metric.cpp:30 +msgid "Failed to connect to metrics service:" +msgstr "" + +#: src/modules/UserMetrics/Metric.cpp:141 +msgid "Failed to register user metric:" +msgstr "" + +#: src/modules/UserMetrics/Metric.cpp:154 +msgid "Failed to increment metric:" +msgstr "" + +#: src/modules/UserMetrics/Metric.cpp:166 +msgid "Failed to update metric:" +msgstr "" + +#: src/libusermetricsoutput/UserMetricsImpl.cpp:198 +msgid "No data sources available" +msgstr "" + +#: src/libusermetricsoutput/UserMetricsImpl.cpp:255 +msgid "Data source not found" +msgstr "" + +#: src/libusermetricsoutput/UserMetricsImpl.cpp:266 +msgid "No data for today" +msgstr "Ei tietoja tälle päivälle" + +#: src/libusermetricsoutput/GSettingsColorThemeProvider.cpp:100 +#, qt-format +msgid "Cannot open XML file '%1' for reading" +msgstr "" diff -Nru libusermetrics-1.1.1+14.10.20141020/po/fr.po libusermetrics-1.1.1+15.04.20150219/po/fr.po --- libusermetrics-1.1.1+14.10.20141020/po/fr.po 1970-01-01 00:00:00.000000000 +0000 +++ libusermetrics-1.1.1+15.04.20150219/po/fr.po 2015-02-19 09:31:17.000000000 +0000 @@ -0,0 +1,159 @@ +# French translation for libusermetrics +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the libusermetrics package. +# FIRST AUTHOR , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: libusermetrics\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2014-09-16 09:15+0100\n" +"PO-Revision-Date: 2014-10-26 19:20+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-10-27 06:31+0000\n" +"X-Generator: Launchpad (build 17203)\n" + +#: src/usermetricsservice/main.cpp:59 +msgid "Could not open database" +msgstr "" + +#: src/usermetricsservice/main.cpp:77 +msgid "Unable to register user metrics service on DBus" +msgstr "" + +#: src/usermetricsservice/main.cpp:91 +msgid "Unable to unregister user metrics service on DBus" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:51 +msgid "Could not register user data object with DBus" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:81 +msgid "Unknown data source" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:90 +msgid "Attempt to create data set owned by another user" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:100 +msgid "Could not locate user data" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:106 +msgid "Attempt to create data set owned by another application" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:117 +msgid "Data set query failed" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:130 +#: src/usermetricsservice/DBusDataSet.cpp:127 +msgid "Could not save data set" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:140 +msgid "New data set could not be found" +msgstr "" + +#: src/usermetricsservice/DBusDataSource.cpp:68 +#: src/usermetricsservice/DBusDataSource.cpp:86 +#: src/usermetricsservice/DBusDataSource.cpp:104 +#: src/usermetricsservice/DBusDataSource.cpp:116 +#: src/usermetricsservice/DBusDataSource.cpp:134 +#: src/usermetricsservice/DBusDataSource.cpp:172 +#: src/usermetricsservice/DBusDataSource.cpp:190 +#: src/usermetricsservice/DBusDataSource.cpp:216 +#: src/usermetricsservice/DBusDataSource.cpp:234 +#: src/usermetricsservice/DBusUserMetrics.cpp:187 +msgid "Could not save data source" +msgstr "" + +#: src/usermetricsservice/DBusDataSet.cpp:143 +msgid "Attempt to update data owned by another user" +msgstr "" + +#: src/usermetricsservice/DBusDataSet.cpp:151 +msgid "Attempt to update data owned by another application" +msgstr "" + +#: src/usermetricsservice/DBusDataSet.cpp:170 +msgid "Attempt to increment data owned by another user" +msgstr "" + +#: src/usermetricsservice/DBusDataSet.cpp:178 +msgid "Attempt to increment data owned by another application" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:54 +msgid "Unable to register user metrics object on DBus" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:141 +#: src/usermetricsservice/DBusUserMetrics.cpp:153 +msgid "Data source query failed" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:249 +msgid "Attempt to create user data owned by another user" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:258 +msgid "User data query failed" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:267 +msgid "Could not save user data" +msgstr "" + +#: src/libusermetricsinput/main.cpp:35 +#: src/libusermetricsinput/main-increment.cpp:35 +msgid "Usage: " +msgstr "" + +#: src/libusermetricsinput/main.cpp:37 +msgid "DATA_SOURCE_ID FORMAT_STRING EMPTY_DATA_STRING USERNAME " +msgstr "" + +#: src/libusermetricsinput/main-increment.cpp:37 +msgid "DATA_SOURCE_ID FORMAT_STRING EMPTY_DATA_STRING USERNAME [AMOUNT]" +msgstr "" + +#: src/modules/UserMetrics/Metric.cpp:30 +msgid "Failed to connect to metrics service:" +msgstr "" + +#: src/modules/UserMetrics/Metric.cpp:141 +msgid "Failed to register user metric:" +msgstr "" + +#: src/modules/UserMetrics/Metric.cpp:154 +msgid "Failed to increment metric:" +msgstr "" + +#: src/modules/UserMetrics/Metric.cpp:166 +msgid "Failed to update metric:" +msgstr "" + +#: src/libusermetricsoutput/UserMetricsImpl.cpp:198 +msgid "No data sources available" +msgstr "" + +#: src/libusermetricsoutput/UserMetricsImpl.cpp:255 +msgid "Data source not found" +msgstr "" + +#: src/libusermetricsoutput/UserMetricsImpl.cpp:266 +msgid "No data for today" +msgstr "" + +#: src/libusermetricsoutput/GSettingsColorThemeProvider.cpp:100 +#, qt-format +msgid "Cannot open XML file '%1' for reading" +msgstr "" diff -Nru libusermetrics-1.1.1+14.10.20141020/po/pt_BR.po libusermetrics-1.1.1+15.04.20150219/po/pt_BR.po --- libusermetrics-1.1.1+14.10.20141020/po/pt_BR.po 1970-01-01 00:00:00.000000000 +0000 +++ libusermetrics-1.1.1+15.04.20150219/po/pt_BR.po 2015-02-19 09:31:17.000000000 +0000 @@ -0,0 +1,159 @@ +# Brazilian Portuguese translation for libusermetrics +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the libusermetrics package. +# FIRST AUTHOR , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: libusermetrics\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2014-09-16 09:15+0100\n" +"PO-Revision-Date: 2014-12-01 14:52+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Brazilian Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-12-02 06:13+0000\n" +"X-Generator: Launchpad (build 17274)\n" + +#: src/usermetricsservice/main.cpp:59 +msgid "Could not open database" +msgstr "" + +#: src/usermetricsservice/main.cpp:77 +msgid "Unable to register user metrics service on DBus" +msgstr "" + +#: src/usermetricsservice/main.cpp:91 +msgid "Unable to unregister user metrics service on DBus" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:51 +msgid "Could not register user data object with DBus" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:81 +msgid "Unknown data source" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:90 +msgid "Attempt to create data set owned by another user" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:100 +msgid "Could not locate user data" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:106 +msgid "Attempt to create data set owned by another application" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:117 +msgid "Data set query failed" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:130 +#: src/usermetricsservice/DBusDataSet.cpp:127 +msgid "Could not save data set" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:140 +msgid "New data set could not be found" +msgstr "" + +#: src/usermetricsservice/DBusDataSource.cpp:68 +#: src/usermetricsservice/DBusDataSource.cpp:86 +#: src/usermetricsservice/DBusDataSource.cpp:104 +#: src/usermetricsservice/DBusDataSource.cpp:116 +#: src/usermetricsservice/DBusDataSource.cpp:134 +#: src/usermetricsservice/DBusDataSource.cpp:172 +#: src/usermetricsservice/DBusDataSource.cpp:190 +#: src/usermetricsservice/DBusDataSource.cpp:216 +#: src/usermetricsservice/DBusDataSource.cpp:234 +#: src/usermetricsservice/DBusUserMetrics.cpp:187 +msgid "Could not save data source" +msgstr "" + +#: src/usermetricsservice/DBusDataSet.cpp:143 +msgid "Attempt to update data owned by another user" +msgstr "" + +#: src/usermetricsservice/DBusDataSet.cpp:151 +msgid "Attempt to update data owned by another application" +msgstr "" + +#: src/usermetricsservice/DBusDataSet.cpp:170 +msgid "Attempt to increment data owned by another user" +msgstr "" + +#: src/usermetricsservice/DBusDataSet.cpp:178 +msgid "Attempt to increment data owned by another application" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:54 +msgid "Unable to register user metrics object on DBus" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:141 +#: src/usermetricsservice/DBusUserMetrics.cpp:153 +msgid "Data source query failed" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:249 +msgid "Attempt to create user data owned by another user" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:258 +msgid "User data query failed" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:267 +msgid "Could not save user data" +msgstr "" + +#: src/libusermetricsinput/main.cpp:35 +#: src/libusermetricsinput/main-increment.cpp:35 +msgid "Usage: " +msgstr "" + +#: src/libusermetricsinput/main.cpp:37 +msgid "DATA_SOURCE_ID FORMAT_STRING EMPTY_DATA_STRING USERNAME " +msgstr "" + +#: src/libusermetricsinput/main-increment.cpp:37 +msgid "DATA_SOURCE_ID FORMAT_STRING EMPTY_DATA_STRING USERNAME [AMOUNT]" +msgstr "" + +#: src/modules/UserMetrics/Metric.cpp:30 +msgid "Failed to connect to metrics service:" +msgstr "" + +#: src/modules/UserMetrics/Metric.cpp:141 +msgid "Failed to register user metric:" +msgstr "" + +#: src/modules/UserMetrics/Metric.cpp:154 +msgid "Failed to increment metric:" +msgstr "" + +#: src/modules/UserMetrics/Metric.cpp:166 +msgid "Failed to update metric:" +msgstr "" + +#: src/libusermetricsoutput/UserMetricsImpl.cpp:198 +msgid "No data sources available" +msgstr "" + +#: src/libusermetricsoutput/UserMetricsImpl.cpp:255 +msgid "Data source not found" +msgstr "" + +#: src/libusermetricsoutput/UserMetricsImpl.cpp:266 +msgid "No data for today" +msgstr "" + +#: src/libusermetricsoutput/GSettingsColorThemeProvider.cpp:100 +#, qt-format +msgid "Cannot open XML file '%1' for reading" +msgstr "" diff -Nru libusermetrics-1.1.1+14.10.20141020/po/pt.po libusermetrics-1.1.1+15.04.20150219/po/pt.po --- libusermetrics-1.1.1+14.10.20141020/po/pt.po 1970-01-01 00:00:00.000000000 +0000 +++ libusermetrics-1.1.1+15.04.20150219/po/pt.po 2015-02-19 09:31:17.000000000 +0000 @@ -0,0 +1,161 @@ +# Portuguese translation for libusermetrics +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the libusermetrics package. +# FIRST AUTHOR , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: libusermetrics\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2014-09-16 09:15+0100\n" +"PO-Revision-Date: 2014-12-15 14:09+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-12-16 07:34+0000\n" +"X-Generator: Launchpad (build 17286)\n" + +#: src/usermetricsservice/main.cpp:59 +msgid "Could not open database" +msgstr "Não foi possível abrir base de dados" + +#: src/usermetricsservice/main.cpp:77 +msgid "Unable to register user metrics service on DBus" +msgstr "Registo do serviço métrico no DBus, sem sucesso" + +#: src/usermetricsservice/main.cpp:91 +msgid "Unable to unregister user metrics service on DBus" +msgstr "Remoção de registo do serviço métrico no DBus, sem sucesso" + +#: src/usermetricsservice/DBusUserData.cpp:51 +msgid "Could not register user data object with DBus" +msgstr "Não foi possível registar objeto de dados do utilizador com o DBus" + +#: src/usermetricsservice/DBusUserData.cpp:81 +msgid "Unknown data source" +msgstr "Fonte de dados desconhecida" + +#: src/usermetricsservice/DBusUserData.cpp:90 +msgid "Attempt to create data set owned by another user" +msgstr "" +"Tentativa de criar um conjunto de dados de propriedade de outro utilizador" + +#: src/usermetricsservice/DBusUserData.cpp:100 +msgid "Could not locate user data" +msgstr "Não foi possível localizar dados do utlizador" + +#: src/usermetricsservice/DBusUserData.cpp:106 +msgid "Attempt to create data set owned by another application" +msgstr "" +"Tentativa de criar um conjunto de dados de propriedade de outra aplicação" + +#: src/usermetricsservice/DBusUserData.cpp:117 +msgid "Data set query failed" +msgstr "Consulta de conjunto de dados falhou" + +#: src/usermetricsservice/DBusUserData.cpp:130 +#: src/usermetricsservice/DBusDataSet.cpp:127 +msgid "Could not save data set" +msgstr "Não foi possível guardar conjunto de dados" + +#: src/usermetricsservice/DBusUserData.cpp:140 +msgid "New data set could not be found" +msgstr "Novo conjunto de dados não pôde ser encontrado" + +#: src/usermetricsservice/DBusDataSource.cpp:68 +#: src/usermetricsservice/DBusDataSource.cpp:86 +#: src/usermetricsservice/DBusDataSource.cpp:104 +#: src/usermetricsservice/DBusDataSource.cpp:116 +#: src/usermetricsservice/DBusDataSource.cpp:134 +#: src/usermetricsservice/DBusDataSource.cpp:172 +#: src/usermetricsservice/DBusDataSource.cpp:190 +#: src/usermetricsservice/DBusDataSource.cpp:216 +#: src/usermetricsservice/DBusDataSource.cpp:234 +#: src/usermetricsservice/DBusUserMetrics.cpp:187 +msgid "Could not save data source" +msgstr "Não foi possível guardar fonte dos dados" + +#: src/usermetricsservice/DBusDataSet.cpp:143 +msgid "Attempt to update data owned by another user" +msgstr "Tentativa para atualizar dados proprietários de outro utilizador" + +#: src/usermetricsservice/DBusDataSet.cpp:151 +msgid "Attempt to update data owned by another application" +msgstr "Tentativa para atualizar dados proprietários de outra aplicação" + +#: src/usermetricsservice/DBusDataSet.cpp:170 +msgid "Attempt to increment data owned by another user" +msgstr "Tentativa para incrementar dados proprietários de outro utilizador" + +#: src/usermetricsservice/DBusDataSet.cpp:178 +msgid "Attempt to increment data owned by another application" +msgstr "Tentativa para incrementar dados proprietários de outra aplicação" + +#: src/usermetricsservice/DBusUserMetrics.cpp:54 +msgid "Unable to register user metrics object on DBus" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:141 +#: src/usermetricsservice/DBusUserMetrics.cpp:153 +msgid "Data source query failed" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:249 +msgid "Attempt to create user data owned by another user" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:258 +msgid "User data query failed" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:267 +msgid "Could not save user data" +msgstr "" + +#: src/libusermetricsinput/main.cpp:35 +#: src/libusermetricsinput/main-increment.cpp:35 +msgid "Usage: " +msgstr "" + +#: src/libusermetricsinput/main.cpp:37 +msgid "DATA_SOURCE_ID FORMAT_STRING EMPTY_DATA_STRING USERNAME " +msgstr "" + +#: src/libusermetricsinput/main-increment.cpp:37 +msgid "DATA_SOURCE_ID FORMAT_STRING EMPTY_DATA_STRING USERNAME [AMOUNT]" +msgstr "" + +#: src/modules/UserMetrics/Metric.cpp:30 +msgid "Failed to connect to metrics service:" +msgstr "" + +#: src/modules/UserMetrics/Metric.cpp:141 +msgid "Failed to register user metric:" +msgstr "" + +#: src/modules/UserMetrics/Metric.cpp:154 +msgid "Failed to increment metric:" +msgstr "" + +#: src/modules/UserMetrics/Metric.cpp:166 +msgid "Failed to update metric:" +msgstr "" + +#: src/libusermetricsoutput/UserMetricsImpl.cpp:198 +msgid "No data sources available" +msgstr "" + +#: src/libusermetricsoutput/UserMetricsImpl.cpp:255 +msgid "Data source not found" +msgstr "" + +#: src/libusermetricsoutput/UserMetricsImpl.cpp:266 +msgid "No data for today" +msgstr "" + +#: src/libusermetricsoutput/GSettingsColorThemeProvider.cpp:100 +#, qt-format +msgid "Cannot open XML file '%1' for reading" +msgstr "" diff -Nru libusermetrics-1.1.1+14.10.20141020/po/ru.po libusermetrics-1.1.1+15.04.20150219/po/ru.po --- libusermetrics-1.1.1+14.10.20141020/po/ru.po 1970-01-01 00:00:00.000000000 +0000 +++ libusermetrics-1.1.1+15.04.20150219/po/ru.po 2015-02-19 09:31:17.000000000 +0000 @@ -0,0 +1,159 @@ +# Russian translation for libusermetrics +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the libusermetrics package. +# FIRST AUTHOR , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: libusermetrics\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2014-09-16 09:15+0100\n" +"PO-Revision-Date: 2014-10-24 10:09+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-10-25 06:01+0000\n" +"X-Generator: Launchpad (build 17203)\n" + +#: src/usermetricsservice/main.cpp:59 +msgid "Could not open database" +msgstr "Не удалось открыть базу данных" + +#: src/usermetricsservice/main.cpp:77 +msgid "Unable to register user metrics service on DBus" +msgstr "" + +#: src/usermetricsservice/main.cpp:91 +msgid "Unable to unregister user metrics service on DBus" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:51 +msgid "Could not register user data object with DBus" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:81 +msgid "Unknown data source" +msgstr "Неизвестный источник данных" + +#: src/usermetricsservice/DBusUserData.cpp:90 +msgid "Attempt to create data set owned by another user" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:100 +msgid "Could not locate user data" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:106 +msgid "Attempt to create data set owned by another application" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:117 +msgid "Data set query failed" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:130 +#: src/usermetricsservice/DBusDataSet.cpp:127 +msgid "Could not save data set" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:140 +msgid "New data set could not be found" +msgstr "" + +#: src/usermetricsservice/DBusDataSource.cpp:68 +#: src/usermetricsservice/DBusDataSource.cpp:86 +#: src/usermetricsservice/DBusDataSource.cpp:104 +#: src/usermetricsservice/DBusDataSource.cpp:116 +#: src/usermetricsservice/DBusDataSource.cpp:134 +#: src/usermetricsservice/DBusDataSource.cpp:172 +#: src/usermetricsservice/DBusDataSource.cpp:190 +#: src/usermetricsservice/DBusDataSource.cpp:216 +#: src/usermetricsservice/DBusDataSource.cpp:234 +#: src/usermetricsservice/DBusUserMetrics.cpp:187 +msgid "Could not save data source" +msgstr "" + +#: src/usermetricsservice/DBusDataSet.cpp:143 +msgid "Attempt to update data owned by another user" +msgstr "" + +#: src/usermetricsservice/DBusDataSet.cpp:151 +msgid "Attempt to update data owned by another application" +msgstr "" + +#: src/usermetricsservice/DBusDataSet.cpp:170 +msgid "Attempt to increment data owned by another user" +msgstr "" + +#: src/usermetricsservice/DBusDataSet.cpp:178 +msgid "Attempt to increment data owned by another application" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:54 +msgid "Unable to register user metrics object on DBus" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:141 +#: src/usermetricsservice/DBusUserMetrics.cpp:153 +msgid "Data source query failed" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:249 +msgid "Attempt to create user data owned by another user" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:258 +msgid "User data query failed" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:267 +msgid "Could not save user data" +msgstr "" + +#: src/libusermetricsinput/main.cpp:35 +#: src/libusermetricsinput/main-increment.cpp:35 +msgid "Usage: " +msgstr "" + +#: src/libusermetricsinput/main.cpp:37 +msgid "DATA_SOURCE_ID FORMAT_STRING EMPTY_DATA_STRING USERNAME " +msgstr "" + +#: src/libusermetricsinput/main-increment.cpp:37 +msgid "DATA_SOURCE_ID FORMAT_STRING EMPTY_DATA_STRING USERNAME [AMOUNT]" +msgstr "" + +#: src/modules/UserMetrics/Metric.cpp:30 +msgid "Failed to connect to metrics service:" +msgstr "" + +#: src/modules/UserMetrics/Metric.cpp:141 +msgid "Failed to register user metric:" +msgstr "" + +#: src/modules/UserMetrics/Metric.cpp:154 +msgid "Failed to increment metric:" +msgstr "" + +#: src/modules/UserMetrics/Metric.cpp:166 +msgid "Failed to update metric:" +msgstr "" + +#: src/libusermetricsoutput/UserMetricsImpl.cpp:198 +msgid "No data sources available" +msgstr "" + +#: src/libusermetricsoutput/UserMetricsImpl.cpp:255 +msgid "Data source not found" +msgstr "" + +#: src/libusermetricsoutput/UserMetricsImpl.cpp:266 +msgid "No data for today" +msgstr "" + +#: src/libusermetricsoutput/GSettingsColorThemeProvider.cpp:100 +#, qt-format +msgid "Cannot open XML file '%1' for reading" +msgstr "" diff -Nru libusermetrics-1.1.1+14.10.20141020/po/ug.po libusermetrics-1.1.1+15.04.20150219/po/ug.po --- libusermetrics-1.1.1+14.10.20141020/po/ug.po 1970-01-01 00:00:00.000000000 +0000 +++ libusermetrics-1.1.1+15.04.20150219/po/ug.po 2015-02-19 09:31:17.000000000 +0000 @@ -0,0 +1,159 @@ +# Uyghur translation for libusermetrics +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the libusermetrics package. +# FIRST AUTHOR , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: libusermetrics\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2014-09-16 09:15+0100\n" +"PO-Revision-Date: 2014-11-27 08:37+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Uyghur \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-11-28 07:08+0000\n" +"X-Generator: Launchpad (build 17261)\n" + +#: src/usermetricsservice/main.cpp:59 +msgid "Could not open database" +msgstr "سانداننى ئاچقىلى بولمىدى" + +#: src/usermetricsservice/main.cpp:77 +msgid "Unable to register user metrics service on DBus" +msgstr "" + +#: src/usermetricsservice/main.cpp:91 +msgid "Unable to unregister user metrics service on DBus" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:51 +msgid "Could not register user data object with DBus" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:81 +msgid "Unknown data source" +msgstr "سانلىق-مەلۇمات مەنبەسى نامەلۇم" + +#: src/usermetricsservice/DBusUserData.cpp:90 +msgid "Attempt to create data set owned by another user" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:100 +msgid "Could not locate user data" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:106 +msgid "Attempt to create data set owned by another application" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:117 +msgid "Data set query failed" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:130 +#: src/usermetricsservice/DBusDataSet.cpp:127 +msgid "Could not save data set" +msgstr "" + +#: src/usermetricsservice/DBusUserData.cpp:140 +msgid "New data set could not be found" +msgstr "" + +#: src/usermetricsservice/DBusDataSource.cpp:68 +#: src/usermetricsservice/DBusDataSource.cpp:86 +#: src/usermetricsservice/DBusDataSource.cpp:104 +#: src/usermetricsservice/DBusDataSource.cpp:116 +#: src/usermetricsservice/DBusDataSource.cpp:134 +#: src/usermetricsservice/DBusDataSource.cpp:172 +#: src/usermetricsservice/DBusDataSource.cpp:190 +#: src/usermetricsservice/DBusDataSource.cpp:216 +#: src/usermetricsservice/DBusDataSource.cpp:234 +#: src/usermetricsservice/DBusUserMetrics.cpp:187 +msgid "Could not save data source" +msgstr "" + +#: src/usermetricsservice/DBusDataSet.cpp:143 +msgid "Attempt to update data owned by another user" +msgstr "" + +#: src/usermetricsservice/DBusDataSet.cpp:151 +msgid "Attempt to update data owned by another application" +msgstr "" + +#: src/usermetricsservice/DBusDataSet.cpp:170 +msgid "Attempt to increment data owned by another user" +msgstr "" + +#: src/usermetricsservice/DBusDataSet.cpp:178 +msgid "Attempt to increment data owned by another application" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:54 +msgid "Unable to register user metrics object on DBus" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:141 +#: src/usermetricsservice/DBusUserMetrics.cpp:153 +msgid "Data source query failed" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:249 +msgid "Attempt to create user data owned by another user" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:258 +msgid "User data query failed" +msgstr "" + +#: src/usermetricsservice/DBusUserMetrics.cpp:267 +msgid "Could not save user data" +msgstr "" + +#: src/libusermetricsinput/main.cpp:35 +#: src/libusermetricsinput/main-increment.cpp:35 +msgid "Usage: " +msgstr "ئىشلىتىش ئۇسۇلى: " + +#: src/libusermetricsinput/main.cpp:37 +msgid "DATA_SOURCE_ID FORMAT_STRING EMPTY_DATA_STRING USERNAME " +msgstr "" + +#: src/libusermetricsinput/main-increment.cpp:37 +msgid "DATA_SOURCE_ID FORMAT_STRING EMPTY_DATA_STRING USERNAME [AMOUNT]" +msgstr "" + +#: src/modules/UserMetrics/Metric.cpp:30 +msgid "Failed to connect to metrics service:" +msgstr "" + +#: src/modules/UserMetrics/Metric.cpp:141 +msgid "Failed to register user metric:" +msgstr "" + +#: src/modules/UserMetrics/Metric.cpp:154 +msgid "Failed to increment metric:" +msgstr "" + +#: src/modules/UserMetrics/Metric.cpp:166 +msgid "Failed to update metric:" +msgstr "" + +#: src/libusermetricsoutput/UserMetricsImpl.cpp:198 +msgid "No data sources available" +msgstr "" + +#: src/libusermetricsoutput/UserMetricsImpl.cpp:255 +msgid "Data source not found" +msgstr "" + +#: src/libusermetricsoutput/UserMetricsImpl.cpp:266 +msgid "No data for today" +msgstr "" + +#: src/libusermetricsoutput/GSettingsColorThemeProvider.cpp:100 +#, qt-format +msgid "Cannot open XML file '%1' for reading" +msgstr "" diff -Nru libusermetrics-1.1.1+14.10.20141020/src/libusermetricscommon/DateFactory.h libusermetrics-1.1.1+15.04.20150219/src/libusermetricscommon/DateFactory.h --- libusermetrics-1.1.1+14.10.20141020/src/libusermetricscommon/DateFactory.h 2014-10-20 15:19:04.000000000 +0000 +++ libusermetrics-1.1.1+15.04.20150219/src/libusermetricscommon/DateFactory.h 2015-02-19 09:31:24.000000000 +0000 @@ -20,6 +20,7 @@ #define USERMETRICSCOMMON_DATEFACTORY_H_ #include +#include namespace UserMetricsCommon { diff -Nru libusermetrics-1.1.1+14.10.20141020/src/libusermetricsoutput/SyncedDataSource.cpp libusermetrics-1.1.1+15.04.20150219/src/libusermetricsoutput/SyncedDataSource.cpp --- libusermetrics-1.1.1+14.10.20141020/src/libusermetricsoutput/SyncedDataSource.cpp 2014-10-20 15:19:04.000000000 +0000 +++ libusermetrics-1.1.1+15.04.20150219/src/libusermetricsoutput/SyncedDataSource.cpp 2015-02-19 09:31:24.000000000 +0000 @@ -22,8 +22,8 @@ SyncedDataSource::SyncedDataSource( QSharedPointer interface, - const QString &localeDir, QObject *parent) : - DataSource(localeDir, parent), m_interface(interface) { + QObject *parent) : + DataSource(interface->translationPath(), parent), m_interface(interface) { connect(m_interface.data(), SIGNAL(formatStringChanged(const QString &)), this, SLOT(setFormatString(const QString &))); diff -Nru libusermetrics-1.1.1+14.10.20141020/src/libusermetricsoutput/SyncedDataSource.h libusermetrics-1.1.1+15.04.20150219/src/libusermetricsoutput/SyncedDataSource.h --- libusermetrics-1.1.1+14.10.20141020/src/libusermetricsoutput/SyncedDataSource.h 2014-10-20 15:19:04.000000000 +0000 +++ libusermetrics-1.1.1+15.04.20150219/src/libusermetricsoutput/SyncedDataSource.h 2015-02-19 09:31:24.000000000 +0000 @@ -30,7 +30,7 @@ public: SyncedDataSource( QSharedPointer interface, - const QString &localeDir = LOCALEDIR, QObject *parent = 0); + QObject *parent = 0); virtual ~SyncedDataSource(); diff -Nru libusermetrics-1.1.1+14.10.20141020/src/libusermetricsoutput/SyncedUserMetricsStore.cpp libusermetrics-1.1.1+15.04.20150219/src/libusermetricsoutput/SyncedUserMetricsStore.cpp --- libusermetrics-1.1.1+14.10.20141020/src/libusermetricsoutput/SyncedUserMetricsStore.cpp 2014-10-20 15:19:04.000000000 +0000 +++ libusermetrics-1.1.1+15.04.20150219/src/libusermetricsoutput/SyncedUserMetricsStore.cpp 2015-02-19 09:31:24.000000000 +0000 @@ -28,11 +28,9 @@ using namespace UserMetricsOutput; SyncedUserMetricsStore::SyncedUserMetricsStore( - const QDBusConnection &dbusConnection, const QString &localeDir, - QObject *parent) : + const QDBusConnection &dbusConnection, QObject *parent) : UserMetricsStore(parent), m_interface(DBusPaths::serviceName(), - DBusPaths::userMetrics(), dbusConnection), m_localeDir( - localeDir) { + DBusPaths::userMetrics(), dbusConnection) { QTimer::singleShot(0, this, SLOT(sync())); } @@ -134,7 +132,7 @@ path.path(), m_interface.connection())); insert(path.path(), - DataSourcePtr(new SyncedDataSource(dataSource, m_localeDir))); + DataSourcePtr(new SyncedDataSource(dataSource))); } void SyncedUserMetricsStore::removeDataSource(const QDBusObjectPath &path) { diff -Nru libusermetrics-1.1.1+14.10.20141020/src/libusermetricsoutput/SyncedUserMetricsStore.h libusermetrics-1.1.1+15.04.20150219/src/libusermetricsoutput/SyncedUserMetricsStore.h --- libusermetrics-1.1.1+14.10.20141020/src/libusermetricsoutput/SyncedUserMetricsStore.h 2014-10-20 15:19:04.000000000 +0000 +++ libusermetrics-1.1.1+15.04.20150219/src/libusermetricsoutput/SyncedUserMetricsStore.h 2015-02-19 09:31:24.000000000 +0000 @@ -30,7 +30,7 @@ public: explicit SyncedUserMetricsStore(const QDBusConnection &dbusConnection, - const QString &localeDir = LOCALEDIR, QObject *parent = 0); + QObject *parent = 0); virtual ~SyncedUserMetricsStore(); @@ -53,8 +53,6 @@ QSharedPointer systemData); com::canonical::UserMetrics m_interface; - - QString m_localeDir; } ; diff -Nru libusermetrics-1.1.1+14.10.20141020/src/usermetricsservice/CMakeLists.txt libusermetrics-1.1.1+15.04.20150219/src/usermetricsservice/CMakeLists.txt --- libusermetrics-1.1.1+14.10.20141020/src/usermetricsservice/CMakeLists.txt 2014-10-20 15:19:04.000000000 +0000 +++ libusermetrics-1.1.1+15.04.20150219/src/usermetricsservice/CMakeLists.txt 2015-02-19 09:31:24.000000000 +0000 @@ -8,6 +8,7 @@ DBusDataSource.cpp DBusUserData.cpp DBusUserMetrics.cpp + TranslationLocatorImpl.cpp ) qt5_add_dbus_adaptor( @@ -58,8 +59,11 @@ target_link_libraries( usermetricsservice usermetricscommon - ${QDJANGO_DB_LIBRARIES} - ${APPARMOR_LIBRARIES} + ${QDJANGO_DB_LDFLAGS} + ${APPARMOR_LDFLAGS} + ${GLIB2_LDFLAGS} + ${GOBJECT2_LDFLAGS} + ${CLICK_LDFLAGS} ) ############################ diff -Nru libusermetrics-1.1.1+14.10.20141020/src/usermetricsservice/DBusDataSet.h libusermetrics-1.1.1+15.04.20150219/src/usermetricsservice/DBusDataSet.h --- libusermetrics-1.1.1+14.10.20141020/src/usermetricsservice/DBusDataSet.h 2014-10-20 15:19:04.000000000 +0000 +++ libusermetrics-1.1.1+15.04.20150219/src/usermetricsservice/DBusDataSet.h 2015-02-19 09:31:24.000000000 +0000 @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include diff -Nru libusermetrics-1.1.1+14.10.20141020/src/usermetricsservice/DBusDataSource.cpp libusermetrics-1.1.1+15.04.20150219/src/usermetricsservice/DBusDataSource.cpp --- libusermetrics-1.1.1+14.10.20141020/src/usermetricsservice/DBusDataSource.cpp 2014-10-20 15:19:04.000000000 +0000 +++ libusermetrics-1.1.1+15.04.20150219/src/usermetricsservice/DBusDataSource.cpp 2015-02-19 09:31:24.000000000 +0000 @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -31,10 +32,12 @@ using namespace UserMetricsService; DBusDataSource::DBusDataSource(int id, const QString &name, - QDBusConnection &dbusConnection, QObject *parent) : + const QString &packageId, QDBusConnection &dbusConnection, + QSharedPointer translationLocator, QObject *parent) : QObject(parent), m_dbusConnection(dbusConnection), m_adaptor( new DataSourceAdaptor(this)), m_id(id), m_path( - DBusPaths::dataSource(m_id)), m_name(name) { + DBusPaths::dataSource(m_id)), m_name(name), m_packageId( + packageId), m_translationLocator(translationLocator) { // DBus setup m_dbusConnection.registerObject(m_path, this); @@ -49,6 +52,10 @@ return m_path; } +QString DBusDataSource::translationPath() const { + return m_translationLocator->locate(m_packageId); +} + QString DBusDataSource::name() const { return m_name; } diff -Nru libusermetrics-1.1.1+14.10.20141020/src/usermetricsservice/DBusDataSource.h libusermetrics-1.1.1+15.04.20150219/src/usermetricsservice/DBusDataSource.h --- libusermetrics-1.1.1+14.10.20141020/src/usermetricsservice/DBusDataSource.h 2014-10-20 15:19:04.000000000 +0000 +++ libusermetrics-1.1.1+15.04.20150219/src/usermetricsservice/DBusDataSource.h 2015-02-19 09:31:24.000000000 +0000 @@ -21,6 +21,7 @@ #include #include +#include #include #include @@ -30,6 +31,7 @@ class DataSource; class DBusDataSource; +class TranslationLocator; typedef QSharedPointer DBusDataSourcePtr; @@ -44,18 +46,23 @@ Q_PROPERTY(QString textDomain READ textDomain WRITE setTextDomain) +Q_PROPERTY(QString translationPath READ translationPath) + Q_PROPERTY(unsigned int metricType READ metricType WRITE setMetricType) Q_PROPERTY(QVariantMap options READ options) public: - DBusDataSource(int id, const QString &name, QDBusConnection &dbusConnection, + DBusDataSource(int id, const QString &name, const QString &packageId, + QDBusConnection &dbusConnection, QSharedPointer, QObject *parent = 0); virtual ~DBusDataSource(); QString path() const; + QString translationPath() const; + QString name() const; QString formatString() const; @@ -107,7 +114,13 @@ QString m_path; + QString m_translationPath; + QString m_name; + + QString m_packageId; + + QSharedPointer m_translationLocator; }; } diff -Nru libusermetrics-1.1.1+14.10.20141020/src/usermetricsservice/DBusUserMetrics.cpp libusermetrics-1.1.1+15.04.20150219/src/usermetricsservice/DBusUserMetrics.cpp --- libusermetrics-1.1.1+14.10.20141020/src/usermetricsservice/DBusUserMetrics.cpp 2014-10-20 15:19:04.000000000 +0000 +++ libusermetrics-1.1.1+15.04.20150219/src/usermetricsservice/DBusUserMetrics.cpp 2015-02-19 09:31:24.000000000 +0000 @@ -39,10 +39,11 @@ DBusUserMetrics::DBusUserMetrics(const QDBusConnection &dbusConnection, QSharedPointer dateFactory, - QSharedPointer authentication, QObject *parent) : + QSharedPointer authentication, + QSharedPointer translationLocator, QObject *parent) : QObject(parent), m_dbusConnection(dbusConnection), m_adaptor( new UserMetricsAdaptor(this)), m_dateFactory(dateFactory), m_authentication( - authentication) { + authentication), m_translationLocator(translationLocator) { // Database setup QDjango::registerModel().createTable(); QDjango::registerModel().createTable(); @@ -79,8 +80,8 @@ // if we don't have a local cache if (!m_dataSources.contains(id)) { DBusDataSourcePtr dbusDataSource( - new DBusDataSource(id, dataSource.name(), - m_dbusConnection)); + new DBusDataSource(id, dataSource.name(), dataSource.secret(), + m_dbusConnection, m_translationLocator)); m_dataSources.insert(id, dbusDataSource); m_adaptor->dataSourceAdded( QDBusObjectPath(dbusDataSource->path())); diff -Nru libusermetrics-1.1.1+14.10.20141020/src/usermetricsservice/DBusUserMetrics.h libusermetrics-1.1.1+15.04.20150219/src/usermetricsservice/DBusUserMetrics.h --- libusermetrics-1.1.1+14.10.20141020/src/usermetricsservice/DBusUserMetrics.h 2014-10-20 15:19:04.000000000 +0000 +++ libusermetrics-1.1.1+15.04.20150219/src/usermetricsservice/DBusUserMetrics.h 2015-02-19 09:31:24.000000000 +0000 @@ -38,6 +38,7 @@ class DBusDataSource; class DBusUserData; class Authentication; +class TranslationLocator; class DBusUserMetrics: public QObject, protected QDBusContext { Q_OBJECT @@ -49,7 +50,8 @@ public: DBusUserMetrics(const QDBusConnection &dbusConnection, QSharedPointer dateFactory, - QSharedPointer authentication, QObject *parent = 0); + QSharedPointer authentication, + QSharedPointer, QObject *parent = 0); virtual ~DBusUserMetrics(); @@ -80,6 +82,8 @@ QSharedPointer m_authentication; + QSharedPointer m_translationLocator; + QMap> m_dataSources; QMap> m_userData; diff -Nru libusermetrics-1.1.1+14.10.20141020/src/usermetricsservice/main.cpp libusermetrics-1.1.1+15.04.20150219/src/usermetricsservice/main.cpp --- libusermetrics-1.1.1+14.10.20141020/src/usermetricsservice/main.cpp 2014-10-20 15:19:04.000000000 +0000 +++ libusermetrics-1.1.1+15.04.20150219/src/usermetricsservice/main.cpp 2015-02-19 09:31:24.000000000 +0000 @@ -18,6 +18,7 @@ #include #include +#include #include #include #include @@ -71,8 +72,9 @@ QSharedPointer dateFactory(new DateFactoryImpl()); QSharedPointer authentication(new Authentication()); + QSharedPointer translationLocator(new TranslationLocatorImpl()); - DBusUserMetrics userMetrics(connection, dateFactory, authentication); + DBusUserMetrics userMetrics(connection, dateFactory, authentication, translationLocator); if (!connection.registerService(DBusPaths::serviceName())) { qWarning() << _("Unable to register user metrics service on DBus"); return 1; diff -Nru libusermetrics-1.1.1+14.10.20141020/src/usermetricsservice/TranslationLocator.h libusermetrics-1.1.1+15.04.20150219/src/usermetricsservice/TranslationLocator.h --- libusermetrics-1.1.1+14.10.20141020/src/usermetricsservice/TranslationLocator.h 1970-01-01 00:00:00.000000000 +0000 +++ libusermetrics-1.1.1+15.04.20150219/src/usermetricsservice/TranslationLocator.h 2015-02-19 09:31:24.000000000 +0000 @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2013 Canonical, Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Author: Pete Woods + */ + +#pragma once + +#include + +namespace UserMetricsService { + +class TranslationLocator { +public: + TranslationLocator() = default; + + virtual ~TranslationLocator() = default; + + virtual QString locate(const QString& id) = 0; +}; + +} diff -Nru libusermetrics-1.1.1+14.10.20141020/src/usermetricsservice/TranslationLocatorImpl.cpp libusermetrics-1.1.1+15.04.20150219/src/usermetricsservice/TranslationLocatorImpl.cpp --- libusermetrics-1.1.1+14.10.20141020/src/usermetricsservice/TranslationLocatorImpl.cpp 1970-01-01 00:00:00.000000000 +0000 +++ libusermetrics-1.1.1+15.04.20150219/src/usermetricsservice/TranslationLocatorImpl.cpp 2015-02-19 09:31:24.000000000 +0000 @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2013 Canonical, Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Author: Pete Woods + */ + +#define QT_NO_SIGNALS_SLOTS_KEYWORDS 1 + +#include + +#include +#include +#include + +#include + +namespace UserMetricsService { + +namespace { +QString pkgdir(const QString& id) { + QSharedPointer db(click_db_new(), &g_object_unref); + + GError *error = nullptr; + click_db_read(db.data(), nullptr, &error); + if (error != nullptr) { + qWarning() << error->message; + g_error_free(error); + return QString(); + } + + error = nullptr; + char *path = click_db_get_path(db.data(), id.toUtf8().constData(), "current", &error); + if (error != nullptr) { + qWarning() << error->message; + g_error_free(error); + return QString(); + } + + QString result = QString::fromUtf8(path); + g_free(path); + + return result; +} +} + +TranslationLocatorImpl::TranslationLocatorImpl() { +} + +QString TranslationLocatorImpl::locate(const QString& id) { + QString translationPath = "/usr/share/locale-langpack"; + if (id != "unconfined") { + translationPath = QDir(pkgdir(id)).filePath("share/locale"); + } + return translationPath; +} + +} diff -Nru libusermetrics-1.1.1+14.10.20141020/src/usermetricsservice/TranslationLocatorImpl.h libusermetrics-1.1.1+15.04.20150219/src/usermetricsservice/TranslationLocatorImpl.h --- libusermetrics-1.1.1+14.10.20141020/src/usermetricsservice/TranslationLocatorImpl.h 1970-01-01 00:00:00.000000000 +0000 +++ libusermetrics-1.1.1+15.04.20150219/src/usermetricsservice/TranslationLocatorImpl.h 2015-02-19 09:31:24.000000000 +0000 @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2013 Canonical, Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Author: Pete Woods + */ + +#pragma once + +#include + +namespace UserMetricsService { + +class TranslationLocatorImpl: public TranslationLocator { +public: + TranslationLocatorImpl(); + + ~TranslationLocatorImpl() = default; + + QString locate(const QString& id) override; +}; + +} diff -Nru libusermetrics-1.1.1+14.10.20141020/tests/data/valgrind.suppression libusermetrics-1.1.1+15.04.20150219/tests/data/valgrind.suppression --- libusermetrics-1.1.1+14.10.20141020/tests/data/valgrind.suppression 2014-10-20 15:19:04.000000000 +0000 +++ libusermetrics-1.1.1+15.04.20150219/tests/data/valgrind.suppression 2015-02-19 09:31:24.000000000 +0000 @@ -36,6 +36,21 @@ } { + New leak in QNetworkConfiguratioManager + Memcheck:Leak + match-leak-kinds: definite + fun:_Znw* + obj:* + fun:_ZN35QNetworkConfigurationManagerPrivate20updateConfigurationsEv + fun:_ZN35QNetworkConfigurationManagerPrivate10initializeEv + fun:_Z35qNetworkConfigurationManagerPrivatev + fun:_ZN28QNetworkConfigurationManagerC1EP7QObject + fun:_ZN21QNetworkAccessManagerC1EP7QObject + obj:/usr/lib/*/libQt5XmlPatterns.so.* + ... +} + +{ See bug report Memcheck:Leak fun:_Znwj diff -Nru libusermetrics-1.1.1+14.10.20141020/tests/integration/libusermetricsoutput/TestUserMetrics.cpp libusermetrics-1.1.1+15.04.20150219/tests/integration/libusermetricsoutput/TestUserMetrics.cpp --- libusermetrics-1.1.1+14.10.20141020/tests/integration/libusermetricsoutput/TestUserMetrics.cpp 2014-10-20 15:19:04.000000000 +0000 +++ libusermetrics-1.1.1+15.04.20150219/tests/integration/libusermetricsoutput/TestUserMetrics.cpp 2015-02-19 09:31:24.000000000 +0000 @@ -38,9 +38,9 @@ }; TEST_F(TestUserMetrics, MethodBarDoesAbc) { - QScopedPointer model(UserMetrics::getInstance()); - model->setUsername("guest"); - EXPECT_EQ("guest", model->username()); +// QScopedPointer model(UserMetrics::getInstance()); +// model->setUsername("guest"); +// EXPECT_EQ("guest", model->username()); } } // namespace diff -Nru libusermetrics-1.1.1+14.10.20141020/tests/unit/usermetricsservice/TestUserMetricsService.cpp libusermetrics-1.1.1+15.04.20150219/tests/unit/usermetricsservice/TestUserMetricsService.cpp --- libusermetrics-1.1.1+14.10.20141020/tests/unit/usermetricsservice/TestUserMetricsService.cpp 2014-10-20 15:19:04.000000000 +0000 +++ libusermetrics-1.1.1+15.04.20150219/tests/unit/usermetricsservice/TestUserMetricsService.cpp 2015-02-19 09:31:24.000000000 +0000 @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -55,6 +56,11 @@ MOCK_CONST_METHOD3(sendErrorReply, void(const QDBusContext&, QDBusError::ErrorType, const QString &)); }; +class MockTranslationLocator: public TranslationLocator { +public: + MOCK_METHOD1(locate, QString(const QString&)); +}; + class MockDateFactory: public DateFactory { public: MOCK_CONST_METHOD0(currentDate, QDate()); @@ -67,7 +73,8 @@ QSqlDatabase::addDatabase("QSQLITE", "test-user-metrics-service")), dateFactory( new NiceMock()), authentication( - new NiceMock()) { + new NiceMock()), translationLocator( + new NiceMock()) { db.setDatabaseName(":memory:"); if (!db.open()) { throw logic_error("Could not open memory database"); @@ -79,6 +86,9 @@ ON_CALL(*authentication, getConfinementContext( _)).WillByDefault(Return(QString("unconfined"))); + ON_CALL(*translationLocator, locate( + _)).WillByDefault(Return(QString())); + // QDjango::setDebugEnabled(true); QDjango::setDatabase(db); } @@ -94,12 +104,14 @@ QSharedPointer dateFactory; QSharedPointer authentication; + + QSharedPointer translationLocator; }; TEST_F(TestUserMetricsService, PersistsDataSourcesBetweenRestart) { { DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); EXPECT_TRUE(userMetrics.dataSources().empty()); @@ -120,7 +132,7 @@ { DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); QList dataSources(userMetrics.dataSources()); EXPECT_EQ(1, dataSources.size()); @@ -138,7 +150,7 @@ TEST_F(TestUserMetricsService, UpdatesFormatString) { { DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); userMetrics.createDataSource("twitter", "%1 tweets received", "", "", 0, QVariantMap()); @@ -152,7 +164,7 @@ { DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); DBusDataSourcePtr twitter(userMetrics.dataSource("twitter")); EXPECT_EQ(QString("%1 new format string"), twitter->formatString()); @@ -162,7 +174,7 @@ TEST_F(TestUserMetricsService, UpdatesEmptyDataString) { { DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); userMetrics.createDataSource("twitter", "%1 tweets received", "no tweets today", "", 0, QVariantMap()); @@ -176,7 +188,7 @@ { DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); DBusDataSourcePtr twitter(userMetrics.dataSource("twitter")); EXPECT_EQ(QString("no tweeties today"), twitter->emptyDataString()); @@ -186,7 +198,7 @@ TEST_F(TestUserMetricsService, UpdatesTextDomain) { { DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); userMetrics.createDataSource("twitter", "%1 tweets received", "", "start text domain", 0, QVariantMap()); @@ -200,7 +212,7 @@ { DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); DBusDataSourcePtr twitter(userMetrics.dataSource("twitter")); EXPECT_EQ(QString("changed text domain"), twitter->textDomain()); @@ -210,7 +222,7 @@ TEST_F(TestUserMetricsService, UpdatesFormatStringOnCreate) { { DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); userMetrics.createDataSource("twitter", "%1 tweets received", "", "", 0, QVariantMap()); @@ -228,7 +240,7 @@ { DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); DBusDataSourcePtr twitter(userMetrics.dataSource("twitter")); EXPECT_EQ(QString("%1 new format string"), twitter->formatString()); @@ -241,7 +253,7 @@ { DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); EXPECT_TRUE(userMetrics.dataSources().empty()); @@ -259,7 +271,7 @@ { DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); QList userData(userMetrics.userDatas()); EXPECT_EQ(1, userData.size()); @@ -279,7 +291,7 @@ { DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); userMetrics.createDataSource("twitter", "%1 tweets received", "", "", 0, QVariantMap()); @@ -308,7 +320,7 @@ { DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); DBusUserDataPtr alice(userMetrics.userData("alice")); EXPECT_EQ(QString("alice"), alice->username()); @@ -330,7 +342,7 @@ _)).WillByDefault(Return(QString("bob"))); DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); userMetrics.createUserData("bob"); DBusUserDataPtr bob(userMetrics.userData("bob")); @@ -346,7 +358,7 @@ Return(QDate(2001, 01, 5))).WillOnce(Return(QDate(2001, 01, 8))); DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); userMetrics.createDataSource("twitter", "foo", "", "", 0, QVariantMap()); userMetrics.createUserData("bob"); @@ -379,7 +391,7 @@ Return(QDate(2001, 01, 5))).WillOnce(Return(QDate(2001, 01, 15))); DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); userMetrics.createDataSource("twitter", "foo", "", "", 0, QVariantMap()); userMetrics.createUserData("bob"); @@ -417,7 +429,7 @@ Return(QDate(2001, 01, 5))).WillOnce(Return(QDate(2001, 01, 7))); DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); userMetrics.createDataSource("twitter", "foo", "", "", 0, QVariantMap()); userMetrics.createUserData("bob"); @@ -444,7 +456,7 @@ TEST_F(TestUserMetricsService, MultipleUsers) { DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); userMetrics.createDataSource("twitter", "foo", "", "", 0, QVariantMap()); ON_CALL(*authentication, getUsername( @@ -484,7 +496,7 @@ Return(QDate(2001, 03, 1))); DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); userMetrics.createDataSource("twitter", "foo", "", "", 0, QVariantMap()); userMetrics.createUserData("bob"); @@ -524,7 +536,7 @@ Return(QDate(2001, 3, 5))); DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); userMetrics.createDataSource("twitter", "foo", "", "", 0, QVariantMap()); userMetrics.createUserData("bob"); @@ -557,7 +569,7 @@ Return(QDate(2001, 3, 5))); DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); userMetrics.createDataSource("twitter", "foo", "", "", 0, QVariantMap()); EXPECT_CALL(*authentication, @@ -580,7 +592,7 @@ Return(QDate(2001, 3, 5))); DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); userMetrics.createDataSource("twitter", "foo", "", "", 0, QVariantMap()); ASSERT_NE(QDBusObjectPath(), userMetrics.createUserData("alice")); @@ -610,7 +622,7 @@ Return(QDate(2001, 3, 5))); DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); ASSERT_NE(QDBusObjectPath(), userMetrics.createDataSource("twitter", "foo", "", "", 0, @@ -643,7 +655,7 @@ Return(QDate(2001, 3, 5))); DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); ASSERT_EQ(QDBusObjectPath(DBusPaths::dataSource(1)), userMetrics.createDataSource("twitter", "foo", "", "", 0, @@ -665,7 +677,7 @@ Return(QDate(2001, 3, 5))); DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); userMetrics.createDataSource("twitter", "foo", "", "", 0, QVariantMap()); ASSERT_NE(QDBusObjectPath(), userMetrics.createUserData("alice")); @@ -708,7 +720,7 @@ Return(QDate(2001, 3, 5))); DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); userMetrics.createDataSource("twitter", "foo", "", "", 0, QVariantMap()); ASSERT_EQ(QDBusObjectPath(DBusPaths::userData(1)), @@ -747,7 +759,7 @@ Return(QDate(2001, 3, 5))); DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); ASSERT_EQ(QDBusObjectPath(DBusPaths::dataSource(1)), userMetrics.createDataSource("twitter", "foo", "", "", 0, @@ -773,7 +785,7 @@ Return(QDate(2001, 3, 5))); DBusUserMetrics userMetrics(systemConnection(), dateFactory, - authentication); + authentication, translationLocator); ON_CALL(*authentication, getConfinementContext( _)).WillByDefault(Return(QString("/bin/twitter")));