Merge lp:~renatofilho/sync-monitor/sync-monitor-i18n into lp:sync-monitor

[Renato Araujo Oliveira Filho]

Add support for i18n.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:44
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/92/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-vivid-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-vivid-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/sync-monitor-vivid-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-vivid-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/92/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-10-31 14:46:50 +0000
+++ CMakeLists.txt	2014-11-13 13:48:10 +0000
@@ -14,6 +14,7 @@
 pkg_check_modules(LIBNOTIFY libnotify)
 
 find_program(INTLTOOL_MERGE_EXECUTABLE intltool-merge)
+find_program(INTLTOOL_EXTRACT_EXECUTABLE intltool-extract)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)

=== modified file 'accounts/applications/contacts-sync.application.in'
--- accounts/applications/contacts-sync.application.in	2014-09-25 21:15:22 +0000
+++ accounts/applications/contacts-sync.application.in	2014-11-13 13:48:10 +0000
@@ -2,7 +2,7 @@
 <application id="contacts-sync">
   <_description>Contacts</_description>
   <desktop-entry>sync-monitor-contacts.desktop</desktop-entry>
-  <translations>contacts-sync</translations>
+  <translations>sync-monitor</translations>
 
   <service-types>
     <service-type id="contacts">

=== modified file 'accounts/services/google-caldav.service.in'
--- accounts/services/google-caldav.service.in	2014-09-25 20:14:06 +0000
+++ accounts/services/google-caldav.service.in	2014-11-13 13:48:10 +0000
@@ -4,4 +4,5 @@
   <name>Google Calendar</name>
   <provider>google</provider>
   <icon>calendar</icon>
+  <translations>sync-monitor</translations>
 </service>

=== modified file 'accounts/services/google-carddav.service.in'
--- accounts/services/google-carddav.service.in	2014-04-07 22:00:28 +0000
+++ accounts/services/google-carddav.service.in	2014-11-13 13:48:10 +0000
@@ -4,6 +4,7 @@
   <name>Google Contacts</name>
   <provider>google</provider>
   <icon>contacts-app</icon>
+  <translations>sync-monitor</translations>
 
   <!-- default settings (account settings have precedence over these) -->
   <template>

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2014-04-15 19:02:30 +0000
+++ po/CMakeLists.txt	2014-11-13 13:48:10 +0000
@@ -12,6 +12,14 @@
 file(GLOB_RECURSE I18N_SRCS RELATIVE ${CMAKE_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}/src/*.cpp
 )
+file(GLOB_RECURSE I18N_XMLS RELATIVE ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/accounts/applications/*.in
+)
+string(REPLACE "${CMAKE_SOURCE_DIR}/" "" RELATIVE_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR})
+foreach(XML_FILE ${I18N_XMLS})
+    get_filename_component(XML_BASE_NAME ${XML_FILE} NAME)
+    list(APPEND I18N_SRCS "${RELATIVE_BUILD_DIR}/tmp/${XML_BASE_NAME}.h")
+endforeach(XML_FILE)
 
 foreach(PO_FILE ${PO_FILES})
     get_filename_component(LANG ${PO_FILE} NAME_WE)
@@ -22,17 +30,18 @@
             RENAME ${DOMAIN}.mo)
 endforeach(PO_FILE)
 
-
 find_program(XGETTEXT_EXECUTABLE xgettext)
 if(XGETTEXT_EXECUTABLE)
     add_custom_target(${POT_FILE})
     add_custom_command(TARGET ${POT_FILE}
+        COMMAND ${INTLTOOL_EXTRACT_EXECUTABLE}
+                -l --type=gettext/xml ${I18N_XMLS}
         COMMAND ${XGETTEXT_EXECUTABLE} -o ${POT_FILE}
                 --c++ --qt --add-comments=TRANSLATORS
-                --keyword=_
+                --keyword=_ --keyword=N_
                 --package-name=${DOMAIN}
                 --copyright-holder='Canonical Ltd.'
                 -D ${CMAKE_SOURCE_DIR} -s
-                -p ${CMAKE_CURRENT_SOURCE_DIR}  ${I18N_SRCS}
+                -p ${CMAKE_CURRENT_SOURCE_DIR} ${I18N_SRCS}
     )
 endif()

=== added file 'po/sync-monitor.pot'
--- po/sync-monitor.pot	1970-01-01 00:00:00 +0000
+++ po/sync-monitor.pot	2014-11-13 13:48:10 +0000
@@ -0,0 +1,125 @@
+# 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: sync-monitor\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-13 10:43-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"
+
+#: src/sync-daemon.cpp:378
+#, qt-format
+msgid "Account %1 removed. Do you want to keep the account data?"
+msgstr ""
+
+#: src/sync-account.cpp:532
+msgid "Command not allowed"
+msgstr ""
+
+#: src/sync-account.cpp:552
+msgid "Connection certificate has expired"
+msgstr ""
+
+#: src/sync-account.cpp:554
+msgid "Connection certificate is invalid"
+msgstr ""
+
+#: src/sync-account.cpp:550
+msgid "Connection timeout"
+msgstr ""
+
+#: qbuild/po/tmp/contacts-sync.application.in.h:1
+msgid "Contacts"
+msgstr ""
+
+#: src/sync-account.cpp:537
+msgid "Disk full"
+msgstr ""
+
+#: src/sync-account.cpp:558
+msgid "Fail to connect with the server"
+msgstr ""
+
+#: src/sync-account.cpp:541
+msgid "Fail to run \"two-way\" sync"
+msgstr ""
+
+#: src/sync-daemon.cpp:469
+#, qt-format
+msgid ""
+"Fail to sync %1 (%2).\n"
+"%3"
+msgstr ""
+
+#: src/sync-account.cpp:539
+msgid "Fail to sync due some remote problem"
+msgstr ""
+
+#: src/sync-account.cpp:543
+msgid "Fail to sync some items"
+msgstr ""
+
+#: src/sync-account.cpp:528
+msgid "Forbidden / access denied"
+msgstr ""
+
+#: src/notify-message.cpp:88
+msgid "No"
+msgstr ""
+
+#: src/sync-account.cpp:530
+msgid "Object not found / unassigned field"
+msgstr ""
+
+#: src/sync-account.cpp:545
+msgid "Process unexpected die."
+msgstr ""
+
+#: src/sync-account.cpp:535
+msgid "Proxy authentication required"
+msgstr ""
+
+#: src/sync-account.cpp:561
+msgid "Server not found"
+msgstr ""
+
+#: src/sync-account.cpp:548
+msgid "Server sent bad content"
+msgstr ""
+
+#: src/sync-daemon.cpp:409
+#, qt-format
+msgid "Start sync:  %1 (%2)"
+msgstr ""
+
+#: src/sync-daemon.cpp:433
+#, qt-format
+msgid "Sync done: %1 (%2)"
+msgstr ""
+
+#: src/sync-daemon.cpp:377 src/sync-daemon.cpp:408 src/sync-daemon.cpp:432
+#: src/sync-daemon.cpp:468
+msgid "Synchronization"
+msgstr ""
+
+#: qbuild/po/tmp/contacts-sync.application.in.h:2
+msgid "Synchronize your contacts"
+msgstr ""
+
+#: src/sync-account.cpp:563
+msgid "Unknown status"
+msgstr ""
+
+#: src/notify-message.cpp:83
+msgid "Yes"
+msgstr ""

=== modified file 'src/notify-message.cpp'
--- src/notify-message.cpp	2014-07-30 12:47:14 +0000
+++ src/notify-message.cpp	2014-11-13 13:48:10 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "notify-message.h"
+#include "sync-i18n.h"
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDebug>
@@ -79,12 +80,12 @@
                                         "x-canonical-non-shaped-icon",
                                         "true");
     notify_notification_add_action(m_notification,
-                                   "action_accept", "Yes",
+                                   "action_accept", _("Yes"),
                                    (NotifyActionCallback) NotifyMessage::onQuestionAccepted,
                                    this,
                                    NULL);
     notify_notification_add_action(m_notification,
-                                   "action_reject", "No",
+                                   "action_reject", _("No"),
                                    (NotifyActionCallback) NotifyMessage::onQuestionRejected,
                                    this,
                                    NULL);