Merge lp:~renatofilho/address-book-service/new-pot into lp:address-book-service

[Renato Araujo Oliveira Filho]

Added pot files for the new updater module.

[lp:~renatofilho/address-book-service/new-pot]

161. By Renato Araujo Oliveira Filho on 2015-09-21

Use relative path on pot file.

162. By Renato Araujo Oliveira Filho on 2015-09-21

Run tests sequentially.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:160
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/414/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-vivid-armhf-ci/98
        deb: http://jenkins.qa.ubuntu.com/job/address-book-service-vivid-armhf-ci/98/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-vivid-i386-ci/98
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4293
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3498
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4290
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4290/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23541

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-service-ci/414/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:162
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/415/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-vivid-armhf-ci/99
        deb: http://jenkins.qa.ubuntu.com/job/address-book-service-vivid-armhf-ci/99/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-vivid-i386-ci/99
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4300
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3503
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4297
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4297/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23553

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-service-ci/415/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-08-10 21:05:44 +0000
+++ CMakeLists.txt	2015-09-21 18:20:39 +0000
@@ -1,7 +1,7 @@
-project(contatos)
+project(address-book-service C CXX)
 
 cmake_minimum_required(VERSION 2.8.9)
-set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
 
 include(FindPkgConfig)
 # Standard install paths
@@ -29,6 +29,10 @@
     set(EVOLUTION_ADDRESSBOOK_SERVICE_NAME "org.gnome.evolution.dataserver.AddressBook9")
 endif()
 
+set(PACKAGE ${CMAKE_PROJECT_NAME})
+set(GETTEXT_PACKAGE "address-book-service")
+add_definitions(-DGETTEXT_PACKAGE="${GETTEXT_PACKAGE}"
+                -DGETTEXT_LOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
 add_definitions(-std=c++11)
@@ -77,6 +81,7 @@
 add_subdirectory(src)
 add_subdirectory(contacts)
 add_subdirectory(upstart)
+add_subdirectory(po)
 if(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc")
     # Some tests fail when running on PPPC check bug #1294229
     message(STATUS "Tests disable for ppc")

=== added file 'cmake/modules/Translations.cmake'
--- cmake/modules/Translations.cmake	1970-01-01 00:00:00 +0000
+++ cmake/modules/Translations.cmake	2015-09-21 18:20:39 +0000
@@ -0,0 +1,42 @@
+# Translations.cmake, CMake macros written for Marlin, feel free to re-use them
+
+macro(add_translations_directory NLS_PACKAGE)
+    add_custom_target (i18n ALL)
+    find_program (MSGFMT_EXECUTABLE msgfmt)
+    file (GLOB PO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.po)
+    foreach (PO_INPUT ${PO_FILES})
+        get_filename_component (PO_INPUT_BASE ${PO_INPUT} NAME_WE)
+        set (MO_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PO_INPUT_BASE}.mo)
+        add_custom_command (TARGET i18n COMMAND ${MSGFMT_EXECUTABLE} -o ${MO_OUTPUT} ${PO_INPUT})
+
+        install (FILES ${MO_OUTPUT} DESTINATION
+            ${CMAKE_INSTALL_LOCALEDIR}/${PO_INPUT_BASE}/LC_MESSAGES
+            RENAME ${NLS_PACKAGE}.mo)
+    endforeach (PO_INPUT ${PO_FILES})
+endmacro(add_translations_directory)
+
+
+macro(add_translations_catalog NLS_PACKAGE)
+    add_custom_target (pot COMMENT “Building translation catalog.”)
+    find_program (XGETTEXT_EXECUTABLE xgettext)
+
+    # init this list, which will hold all the sources across all dirs
+    set(SOURCES "")
+
+    # add each directory's sources to the overall sources list
+    foreach(FILES_INPUT ${ARGN})
+        set (DIR ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT})
+        file(GLOB_RECURSE DIR_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+             ${DIR}/*.c ${DIR}/*.cc ${DIR}/*.cpp ${DIR}/*.cxx ${DIR}/*.vala)
+	set (SOURCES ${SOURCES} ${DIR_SOURCES})
+    endforeach()
+
+    add_custom_command (TARGET pot COMMAND
+        ${XGETTEXT_EXECUTABLE} -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
+        --c++ --qt --add-comments=TRANSLATORS
+        --keyword="_" --keyword="N_" --from-code=UTF-8
+        --copyright-holder='Canonical Ltd.'
+        -s -p ${CMAKE_CURRENT_SOURCE_DIR}
+        -D ${CMAKE_CURRENT_SOURCE_DIR} ${SOURCES}
+        )
+endmacro()

=== modified file 'debian/rules'
--- debian/rules	2015-06-18 12:31:14 +0000
+++ debian/rules	2015-09-21 18:20:39 +0000
@@ -27,5 +27,5 @@
 HOME=$(CURDIR)/debian/tmp-home
 
 override_dh_auto_test:
-	HOME=$(HOME) XDG_RUNTIME_DIR=$(HOME) dh_auto_test
+	HOME=$(HOME) XDG_RUNTIME_DIR=$(HOME) ctest -j1 --output-on-failure
 	rm -rf $(HOME)

=== added directory 'po'
=== added file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ po/CMakeLists.txt	2015-09-21 18:20:39 +0000
@@ -0,0 +1,3 @@
+include(Translations)
+add_translations_directory("${GETTEXT_PACKAGE}")
+add_translations_catalog("${GETTEXT_PACKAGE}" ../updater ../lib)

=== added file 'po/address-book-service.pot'
--- po/address-book-service.pot	1970-01-01 00:00:00 +0000
+++ po/address-book-service.pot	2015-09-21 18:20:39 +0000
@@ -0,0 +1,124 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Canonical Ltd.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-21 12:10-0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../updater/ab-update.cpp:355
+#, qt-format
+msgid ""
+"%1 contact sync account needs upgrade. Please connect with the internet."
+msgstr ""
+
+#: ../updater/ab-update.cpp:107
+#, qt-format
+msgid "%1 contact sync account upgrade already in progress"
+msgstr ""
+
+#: ../updater/ab-update.cpp:344
+#, qt-format
+msgid "%1 contact sync account upgrade in progress"
+msgstr ""
+
+#: ../updater/ab-update.cpp:288
+#, qt-format
+msgid ""
+"%1.\n"
+"Do you want to retry now?"
+msgstr ""
+
+#: ../updater/ab-update.cpp:106 ../updater/ab-update.cpp:267
+#: ../updater/ab-update.cpp:343 ../updater/ab-update.cpp:354
+msgid "Account update"
+msgstr ""
+
+#: ../lib/addressbook.cpp:983
+msgid "Address book service"
+msgstr ""
+
+#: ../updater/ab-update.cpp:268
+msgid "Contact sync upgrade complete."
+msgstr ""
+
+#: ../updater/ab-update.cpp:216
+msgid "Contacts app is updated already!"
+msgstr ""
+
+#: ../updater/ab-update.cpp:224
+msgid "Fail to authenticate!"
+msgstr ""
+
+#: ../updater/ab-update.cpp:220
+msgid "Fail to connect to contact sync service!"
+msgstr ""
+
+#: ../updater/ab-update.cpp:218
+msgid "Fail to connect to internet!"
+msgstr ""
+
+#: ../updater/ab-update.cpp:222
+msgid "Fail to create sync profile!"
+msgstr ""
+
+#: ../updater/ab-update.cpp:233
+msgid "Fail to sync contacts!"
+msgstr ""
+
+#: ../updater/ab-update.cpp:287 ../updater/ab-update.cpp:312
+msgid "Fail to update"
+msgstr ""
+
+#: ../updater/ab-update.cpp:226
+msgid "Internal error during the sync!"
+msgstr ""
+
+#: ../updater/ab-notify-message.cpp:93
+msgid "No"
+msgstr ""
+
+#: ../updater/ab-update.cpp:228
+msgid "Online account not found!"
+msgstr ""
+
+#: ../updater/ab-update.cpp:313
+msgid "To retry later open Contacts app and press the sync button."
+msgstr ""
+
+#: ../updater/ab-update.cpp:230
+msgid "Update already in progress!"
+msgstr ""
+
+#: ../lib/addressbook.cpp:1002
+msgid "Update complete"
+msgstr ""
+
+#: ../lib/addressbook.cpp:995
+msgid "Update required"
+msgstr ""
+
+#: ../updater/ab-notify-message.cpp:88
+msgid "Yes"
+msgstr ""
+
+#: ../lib/addressbook.cpp:997
+msgid ""
+"Your Contacts app needs to be upgraded. Only local contacts will be editable "
+"until upgrade is complete"
+msgstr ""
+
+#: ../lib/addressbook.cpp:1004
+msgid "Your Contacts app upldate is complete."
+msgstr ""