Merge lp:~leonardolemos/pantheon-mail/fix-translations into lp:~elementary-apps/pantheon-mail/trunk

[Leonardo Lemos]

Correctly translate the Desktop files.
Translate the contract files.

This branch fixes lp:1577023 and lp:1577995 issues by making correct use of CMake Translations module for .desktop files and using the Translations.vala workaround for .contract files.

[Corentin Noël (tintou)]

Two remaining issues in the code

review: Needs Fixing

[lp:~leonardolemos/pantheon-mail/fix-translations]

2060. By Leonardo Lemos on 2016-05-17

Fix CMakeLists.txt file

[Rico Tzschichholz (ricotz)]

Does this really build without issues?

https://launchpadlibrarian.net/261654655/buildlog_ubuntu-xenial-i386.pantheon-mail_1.0.0+r2054+pkg7~daily~ubuntu0.4.1_BUILDING.txt.gz

[Rico Tzschichholz (ricotz)]

PLEASE TEST BUILD!

I can confirm that this breaks the build in some non-obvious way and therefore should not have been merged.

=== modified file 'cmake/Translations.cmake'
--- cmake/Translations.cmake	2015-11-20 20:12:38 +0000
+++ cmake/Translations.cmake	2016-05-17 01:07:53 +0000
@@ -1,135 +1,206 @@
-# Translations.cmake, CMake macros written for Marlin, feel free to re-use them
-
-macro (add_translations_directory NLS_PACKAGE)
-    add_custom_target (i18n ALL COMMENT “Building i18n messages.”)
-    find_program (MSGFMT_EXECUTABLE msgfmt)
-    # be sure that all languages are present
-    # Using all usual languages code from https://www.gnu.org/software/gettext/manual/html_node/Language-Codes.html#Language-Codes
-    # Rare language codes should be added on-demand.
-    set (LANGUAGES_NEEDED aa ab ae af ak am an ar as ast av ay az ba be bg bh bi bm bn bo br bs ca ce ch ckb co cr cs cu cv cy da de dv dz ee el en_AU en_CA en_GB eo es et eu fa ff fi fj fo fr fr_CA fy ga gd gl gn gu gv ha he hi ho hr ht hu hy hz ia id ie ig ii ik io is it iu ja jv ka kg ki kj kk kl km kn ko kr ks ku kv kw ky la lb lg li ln lo lt lu lv mg mh mi mk ml mn mo mr ms mt my na nb nd ne ng nl nn no nr nv ny oc oj om or os pa pi pl ps pt pt_BR qu rm rn ro ru rue rw sa sc sd se sg si sk sl sm sma sn so sq sr ss st su sv sw ta te tg th ti tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa wo xh yi yo za zh zh_CN zh_HK zh_TW zu)
-    foreach (LANGUAGE_NEEDED ${LANGUAGES_NEEDED})
-        create_po_file (${LANGUAGE_NEEDED})
-    endforeach (LANGUAGE_NEEDED ${LANGUAGES_NEEDED})
-    # generate .mo from .po
-    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
-            share/locale/${PO_INPUT_BASE}/LC_MESSAGES
-            RENAME ${NLS_PACKAGE}.mo)
-    endforeach (PO_INPUT ${PO_FILES})
-endmacro (add_translations_directory)
-
-# Apply the right default template.
-macro (create_po_file LANGUAGE_NEEDED)
-    set (FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LANGUAGE_NEEDED}.po)
-    if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${LANGUAGE_NEEDED}.po)
-        file (APPEND ${FILE} "msgid \"\"\n")
-        file (APPEND ${FILE} "msgstr \"\"\n")
-        file (APPEND ${FILE} "\"MIME-Version: 1.0\\n\"\n")
-        file (APPEND ${FILE} "\"Content-Type: text/plain; charset=UTF-8\\n\"\n")
-
-        if ("${LANGUAGE_NEEDED}" STREQUAL "ja"
-            OR "${LANGUAGE_NEEDED}" STREQUAL "vi"
-            OR "${LANGUAGE_NEEDED}" STREQUAL "ko")
-                file (APPEND ${FILE} "\"Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\\n\"\n")
-        elseif ("${LANGUAGE_NEEDED}" STREQUAL "en"
-            OR "${LANGUAGE_NEEDED}" STREQUAL "de"
-            OR "${LANGUAGE_NEEDED}" STREQUAL "nl"
-            OR "${LANGUAGE_NEEDED}" STREQUAL "sv"
-            OR "${LANGUAGE_NEEDED}" STREQUAL "nb"
-            OR "${LANGUAGE_NEEDED}" STREQUAL "nn"
-            OR "${LANGUAGE_NEEDED}" STREQUAL "nb"
-            OR "${LANGUAGE_NEEDED}" STREQUAL "no"
-            OR "${LANGUAGE_NEEDED}" STREQUAL "fo"
-            OR "${LANGUAGE_NEEDED}" STREQUAL "es"
-            OR "${LANGUAGE_NEEDED}" STREQUAL "pt"
-            OR "${LANGUAGE_NEEDED}" STREQUAL "it"
-            OR "${LANGUAGE_NEEDED}" STREQUAL "bg"
-            OR "${LANGUAGE_NEEDED}" STREQUAL "he"
-            OR "${LANGUAGE_NEEDED}" STREQUAL "fi"
-            OR "${LANGUAGE_NEEDED}" STREQUAL "et"
-            OR "${LANGUAGE_NEEDED}" STREQUAL "eo"
-            OR "${LANGUAGE_NEEDED}" STREQUAL "hu"
-            OR "${LANGUAGE_NEEDED}" STREQUAL "tr"
-            OR "${LANGUAGE_NEEDED}" STREQUAL "es")
-                file (APPEND ${FILE} "\"Plural-Forms: nplurals=2; plural=n != 1;\\n\"\n")
-        elseif ("${LANGUAGE_NEEDED}" STREQUAL "fr"
-            OR "${LANGUAGE_NEEDED}" STREQUAL "fr_CA"
-            OR "${LANGUAGE_NEEDED}" STREQUAL "pt_BR")
-                file (APPEND ${FILE} "\"Plural-Forms: nplurals=2; plural=n>1;\\n\"\n")
-        elseif ("${LANGUAGE_NEEDED}" STREQUAL "lv")
-                file (APPEND ${FILE} "\"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\\n\"\n")
-        elseif ("${LANGUAGE_NEEDED}" STREQUAL "ro")
-                file (APPEND ${FILE} "\"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;\\n\"\n")
-        elseif ("${LANGUAGE_NEEDED}" STREQUAL "lt")
-                file (APPEND ${FILE} "\"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2;\\n\"\n")
-        elseif ("${LANGUAGE_NEEDED}" STREQUAL "ru"
-            OR "${LANGUAGE_NEEDED}" STREQUAL "uk"
-            OR "${LANGUAGE_NEEDED}" STREQUAL "be"
-            OR "${LANGUAGE_NEEDED}" STREQUAL "sr"
-            OR "${LANGUAGE_NEEDED}" STREQUAL "hr")
-                file (APPEND ${FILE} "\"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\\n\"\n")
-        elseif ("${LANGUAGE_NEEDED}" STREQUAL "cs"
-            OR "${LANGUAGE_NEEDED}" STREQUAL "sk")
-                file (APPEND ${FILE} "\"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\\n\"\n")
-        elseif ("${LANGUAGE_NEEDED}" STREQUAL "pl")
-                file (APPEND ${FILE} "\"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\\n\"\n")
-        elseif ("${LANGUAGE_NEEDED}" STREQUAL "sl")
-                file (APPEND ${FILE} "\"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3;\\n\"\n")
-        endif ()
-
-    endif ()
-endmacro (create_po_file)
-
-macro (add_translations_catalog NLS_PACKAGE)
-    add_custom_target (pot COMMENT “Building translation catalog.”)
-    find_program (XGETTEXT_EXECUTABLE xgettext)
-
-    set(C_SOURCE "")
-    set(VALA_SOURCE "")
-    set(GLADE_SOURCE "")
-
-    foreach(FILES_INPUT ${ARGN})
-        set(BASE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT})
-
-        file (GLOB_RECURSE SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ ${BASE_DIRECTORY}/*.c)
-        foreach(C_FILE ${SOURCE_FILES})
-            set(C_SOURCE ${C_SOURCE} ${C_FILE})
-        endforeach()
-
-        file (GLOB_RECURSE SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ ${BASE_DIRECTORY}/*.vala)
-        foreach(VALA_C_FILE ${SOURCE_FILES})
-            set(VALA_SOURCE ${VALA_SOURCE} ${VALA_C_FILE})
-        endforeach()
-
-        file (GLOB_RECURSE SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ ${BASE_DIRECTORY}/*.ui)
-        foreach(GLADE_C_FILE ${SOURCE_FILES})
-            set(GLADE_SOURCE ${GLADE_SOURCE} ${GLADE_C_FILE})
-        endforeach()
-    endforeach()
-
-    set(BASE_XGETTEXT_COMMAND
-        ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE}
-        -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
-        --add-comments="/" --keyword="_" --keyword="N_" --keyword="C_:1c,2" --keyword="NC_:1c,2" --keyword="ngettext:1,2" --keyword="Q_:1g" --from-code=UTF-8)
-
-   set(CONTINUE_FLAG "")
-
-    IF(NOT "${C_SOURCE}" STREQUAL "")
-        add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${BASE_XGETTEXT_COMMAND} ${C_SOURCE})
-        set(CONTINUE_FLAG "-j")
-    ENDIF()
-
-    IF(NOT "${VALA_SOURCE}" STREQUAL "")
-        add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${BASE_XGETTEXT_COMMAND} ${CONTINUE_FLAG} -LC\# ${VALA_SOURCE})
-        set(CONTINUE_FLAG "-j")
-    ENDIF()
-
-    IF(NOT "${GLADE_SOURCE}" STREQUAL "")
-        add_custom_command (TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${BASE_XGETTEXT_COMMAND} ${CONTINUE_FLAG} -LGlade ${GLADE_SOURCE})
-    ENDIF()  
-endmacro ()
+# Translations.cmake, CMake macros written for Marlin, feel free to re-use them
+include(CMakeParseArguments)
+
+macro (add_translations_directory NLS_PACKAGE)
+    add_custom_target (i18n ALL COMMENT “Building i18n messages.”)
+    find_program (MSGFMT_EXECUTABLE msgfmt)
+    # be sure that all languages are present
+    # Using all usual languages code from https://www.gnu.org/software/gettext/manual/html_node/Language-Codes.html#Language-Codes
+    # Rare language codes should be added on-demand.
+    set (LANGUAGES_NEEDED aa ab ae af ak am an ar as ast av ay az ba be bg bh bi bm bn bo br bs ca ce ch ckb co cr cs cu cv cy da de dv dz ee el en_AU en_CA en_GB eo es et eu fa ff fi fj fo fr fr_CA fy ga gd gl gn gu gv ha he hi ho hr ht hu hy hz ia id ie ig ii ik io is it iu ja jv ka kg ki kj kk kl km kn ko kr ks ku kv kw ky la lb lg li ln lo lt lu lv mg mh mi mk ml mn mo mr ms mt my na nb nd ne ng nl nn no nr nv ny oc oj om or os pa pi pl ps pt pt_BR qu rm rn ro ru rue rw sa sc sd se sg si sk sl sm sma sn so sq sr ss st su sv sw ta te tg th ti tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa wo xh yi yo za zh zh_CN zh_HK zh_TW zu)
+    foreach (LANGUAGE_NEEDED ${LANGUAGES_NEEDED})
+        create_po_file (${LANGUAGE_NEEDED})
+    endforeach (LANGUAGE_NEEDED ${LANGUAGES_NEEDED})
+    # generate .mo from .po
+    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
+            share/locale/${PO_INPUT_BASE}/LC_MESSAGES
+            RENAME ${NLS_PACKAGE}.mo)
+    endforeach (PO_INPUT ${PO_FILES})
+endmacro (add_translations_directory)
+
+# Apply the right default template.
+macro (create_po_file LANGUAGE_NEEDED)
+    set (FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LANGUAGE_NEEDED}.po)
+    if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${LANGUAGE_NEEDED}.po)
+        file (APPEND ${FILE} "msgid \"\"\n")
+        file (APPEND ${FILE} "msgstr \"\"\n")
+        file (APPEND ${FILE} "\"MIME-Version: 1.0\\n\"\n")
+        file (APPEND ${FILE} "\"Content-Type: text/plain; charset=UTF-8\\n\"\n")
+
+        if ("${LANGUAGE_NEEDED}" STREQUAL "ja"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "vi"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "ko")
+                file (APPEND ${FILE} "\"Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\\n\"\n")
+        elseif ("${LANGUAGE_NEEDED}" STREQUAL "en"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "de"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "nl"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "sv"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "nb"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "nn"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "nb"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "no"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "fo"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "es"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "pt"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "it"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "bg"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "he"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "fi"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "et"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "eo"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "hu"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "tr"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "es")
+                file (APPEND ${FILE} "\"Plural-Forms: nplurals=2; plural=n != 1;\\n\"\n")
+        elseif ("${LANGUAGE_NEEDED}" STREQUAL "fr"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "fr_CA"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "pt_BR")
+                file (APPEND ${FILE} "\"Plural-Forms: nplurals=2; plural=n>1;\\n\"\n")
+        elseif ("${LANGUAGE_NEEDED}" STREQUAL "lv")
+                file (APPEND ${FILE} "\"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\\n\"\n")
+        elseif ("${LANGUAGE_NEEDED}" STREQUAL "ro")
+                file (APPEND ${FILE} "\"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;\\n\"\n")
+        elseif ("${LANGUAGE_NEEDED}" STREQUAL "lt")
+                file (APPEND ${FILE} "\"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2;\\n\"\n")
+        elseif ("${LANGUAGE_NEEDED}" STREQUAL "ru"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "uk"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "be"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "sr"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "hr")
+                file (APPEND ${FILE} "\"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\\n\"\n")
+        elseif ("${LANGUAGE_NEEDED}" STREQUAL "cs"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "sk")
+                file (APPEND ${FILE} "\"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\\n\"\n")
+        elseif ("${LANGUAGE_NEEDED}" STREQUAL "pl")
+                file (APPEND ${FILE} "\"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\\n\"\n")
+        elseif ("${LANGUAGE_NEEDED}" STREQUAL "sl")
+                file (APPEND ${FILE} "\"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3;\\n\"\n")
+        endif ()
+
+    endif ()
+endmacro (create_po_file)
+
+macro (configure_file_translation SOURCE RESULT PO_DIR)
+    cmake_parse_arguments (ARGS "IS_DESKTOP;IS_GSCHEMA;IS_XML;IS_KEY" "" "" ${ARGN})
+    find_program (INTLTOOL_MERGE_EXECUTABLE intltool-merge)
+    set(EXTRA_PO_DIR ${PO_DIR}/extra/)
+    get_filename_component(EXTRA_PO_DIR ${EXTRA_PO_DIR} ABSOLUTE)
+
+    # Intltool can't create a new directory.
+    get_filename_component(SOURCE_DIRECTORY ${SOURCE} DIRECTORY)
+    file(MAKE_DIRECTORY ${SOURCE_DIRECTORY})
+
+    set (INTLTOOL_FLAG "")
+    if (${SOURCE} MATCHES ".desktop" OR ${ARGS_IS_DESKTOP})
+        set (INTLTOOL_FLAG "--desktop-style")
+    elseif (${SOURCE} MATCHES ".gschema" OR ${ARGS_IS_GSCHEMA})
+        set (INTLTOOL_FLAG "--schemas-style")
+    elseif (${ARGS_IS_KEY})
+        set (INTLTOOL_FLAG "--keys-style")
+    else ()
+        set (INTLTOOL_FLAG "--xml-style")
+    endif ()
+    execute_process (WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${INTLTOOL_MERGE_EXECUTABLE} --quiet ${INTLTOOL_FLAG} ${EXTRA_PO_DIR} ${SOURCE} ${RESULT})
+endmacro ()
+
+macro (add_translations_catalog NLS_PACKAGE)
+    cmake_parse_arguments (ARGS "" "" "DESKTOP_FILES;APPDATA_FILES;SCHEMA_FILES;KEY_FILES" ${ARGN})
+    add_custom_target (pot COMMENT “Building translation catalog.”)
+    find_program (XGETTEXT_EXECUTABLE xgettext)
+    find_program (INTLTOOL_EXTRACT_EXECUTABLE intltool-extract)
+
+    set(EXTRA_PO_DIR ${CMAKE_CURRENT_SOURCE_DIR}/extra)
+
+    set(C_SOURCE "")
+    set(VALA_SOURCE "")
+    set(GLADE_SOURCE "")
+
+    foreach(FILES_INPUT ${ARGN})
+        if((${FILES_INPUT} MATCHES ${CMAKE_SOURCE_DIR}) OR (${FILES_INPUT} MATCHES ${CMAKE_BINARY_DIR}))
+            set(BASE_DIRECTORY ${FILES_INPUT})
+        else ()
+            set(BASE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT})
+        endif ()
+
+        file (GLOB_RECURSE SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ ${BASE_DIRECTORY}/*.c)
+        foreach(C_FILE ${SOURCE_FILES})
+            set(C_SOURCE ${C_SOURCE} ${C_FILE})
+        endforeach()
+
+        file (GLOB_RECURSE SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ ${BASE_DIRECTORY}/*.vala)
+        foreach(VALA_FILE ${SOURCE_FILES})
+            set(VALA_SOURCE ${VALA_SOURCE} ${VALA_FILE})
+        endforeach()
+
+        file (GLOB_RECURSE SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ ${BASE_DIRECTORY}/*.ui)
+        foreach(GLADE_FILE ${SOURCE_FILES})
+            set(GLADE_SOURCE ${GLADE_SOURCE} ${GLADE_FILE})
+        endforeach()
+    endforeach()
+
+    set (XGETTEXT_C_ARGS --add-comments="/" --keyword="_" --keyword="N_" --keyword="C_:1c,2" --keyword="NC_:1c,2" --keyword="ngettext:1,2" --keyword="Q_:1g")
+    set(BASE_XGETTEXT_COMMAND
+        ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE}
+        -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
+        ${XGETTEXT_C_ARGS} --from-code=UTF-8)
+
+    set(EXTRA_XGETTEXT_COMMAND
+        ${XGETTEXT_EXECUTABLE} -d extra
+        -o ${EXTRA_PO_DIR}/extra.pot --no-location --from-code=UTF-8)
+
+    set (INTLTOOL_EXTRACT_COMMAND
+        ${INTLTOOL_EXTRACT_EXECUTABLE} --local --srcdir=/)
+
+    set(CONTINUE_FLAG "")
+
+    IF(NOT "${C_SOURCE}" STREQUAL "")
+        add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${BASE_XGETTEXT_COMMAND} ${C_SOURCE})
+        set(CONTINUE_FLAG "-j")
+    ENDIF()
+
+    IF(NOT "${VALA_SOURCE}" STREQUAL "")
+        add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${BASE_XGETTEXT_COMMAND} ${CONTINUE_FLAG} -LC\# ${VALA_SOURCE})
+        set(CONTINUE_FLAG "-j")
+    ENDIF()
+
+    IF(NOT "${GLADE_SOURCE}" STREQUAL "")
+        add_custom_command (TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${BASE_XGETTEXT_COMMAND} ${CONTINUE_FLAG} -LGlade ${GLADE_SOURCE})
+    ENDIF()
+
+    # We need to create the directory if one extra content exists.
+    IF((NOT "${ARGS_DESKTOP_FILES}" STREQUAL "") OR (NOT "${ARGS_KEY_FILES}" STREQUAL "") OR (NOT "${ARGS_APPDATA_SOURCE}" STREQUAL "") OR (NOT "${ARGS_SCHEMA_SOURCE}" STREQUAL ""))
+        file(MAKE_DIRECTORY ${EXTRA_PO_DIR})
+    ENDIF()
+
+    set(CONTINUE_FLAG "")
+
+    foreach(DESKTOP_SOURCE ${ARGS_DESKTOP_FILES} ${ARGS_KEY_FILES})
+        get_filename_component(DESKTOP_SOURCE ${DESKTOP_SOURCE} ABSOLUTE)
+        add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${INTLTOOL_EXTRACT_COMMAND} --type=gettext/keys ${DESKTOP_SOURCE})
+        get_filename_component(DESKTOP_SOURCE_NAME ${DESKTOP_SOURCE} NAME)
+        add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${EXTRA_XGETTEXT_COMMAND} ${CONTINUE_FLAG} ${XGETTEXT_C_ARGS} ${CMAKE_CURRENT_BINARY_DIR}/tmp/${DESKTOP_SOURCE_NAME}.h)
+        set(CONTINUE_FLAG "-j")
+    endforeach()
+
+    foreach(APPDATA_SOURCE ${ARGS_APPDATA_FILES})
+        get_filename_component(APPDATA_SOURCE ${APPDATA_SOURCE} ABSOLUTE)
+        add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${INTLTOOL_EXTRACT_COMMAND} --type=gettext/xml ${APPDATA_SOURCE})
+        get_filename_component(APPDATA_SOURCE_NAME ${APPDATA_SOURCE} NAME)
+        add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${EXTRA_XGETTEXT_COMMAND} ${CONTINUE_FLAG} ${XGETTEXT_C_ARGS} ${CMAKE_CURRENT_BINARY_DIR}/tmp/${APPDATA_SOURCE_NAME}.h)
+        set(CONTINUE_FLAG "-j")
+    endforeach()
+
+    foreach(SCHEMA_SOURCE ${ARGS_SCHEMA_FILES})
+        get_filename_component(SCHEMA_SOURCE ${SCHEMA_SOURCE} ABSOLUTE)
+        add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${INTLTOOL_EXTRACT_COMMAND} --type=gettext/schemas ${SCHEMA_SOURCE})
+        get_filename_component(SCHEMA_SOURCE_NAME ${SCHEMA_SOURCE} NAME)
+        add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${EXTRA_XGETTEXT_COMMAND} ${CONTINUE_FLAG} ${XGETTEXT_C_ARGS} ${CMAKE_CURRENT_BINARY_DIR}/tmp/${SCHEMA_SOURCE_NAME}.h)
+        set(CONTINUE_FLAG "-j")
+    endforeach()
+endmacro ()
\ No newline at end of file

=== modified file 'cmake/ValaPrecompile.cmake'
--- cmake/ValaPrecompile.cmake	2015-02-13 02:39:33 +0000
+++ cmake/ValaPrecompile.cmake	2016-05-17 01:07:53 +0000
@@ -1,5 +1,6 @@
 ##
 # Copyright 2009-2010 Jakob Westhoff. All rights reserved.
+# Copyright 2012-2016 elementary LLC.
 # 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -27,8 +28,8 @@
 # either expressed or implied, of Jakob Westhoff
 ##
 
-include(ParseArguments)
 find_package(Vala REQUIRED)
+include(CMakeParseArguments)
 
 ##
 # Compile vala files to their c equivalents for further processing. 
@@ -39,14 +40,10 @@
 # 
 # The first parameter provided is a variable, which will be filled with a list
 # of c files outputted by the vala compiler. This list can than be used in
-# conjunction with functions like "add_executable" or others to create the
-# necessary compile rules with CMake.
-#
-# The second parameter provided is a unique name for the source bundle, which
-# is used to create a .stamp file that marks the last time the bundle was
-# compiled to C.
+# conjuction with functions like "add_executable" or others to create the
+# neccessary compile rules with CMake.
 # 
-# The initial variables are followed by a list of .vala files to be compiled.
+# The initial variable is followed by a list of .vala files to be compiled.
 # Please take care to add every vala file belonging to the currently compiled
 # project or library as Vala will otherwise not be able to resolve all
 # dependencies.
@@ -78,10 +75,18 @@
 #   be a header file as well as an internal header file being generated called
 #   <provided_name>.h and <provided_name>_internal.h
 #
+# GENERATE_GIR
+#   Have the compiler generate a GObject-Introspection repository file with
+#   name: <provided_name>.gir. This can be later used to create a binary typelib
+#   using the GI compiler.
+#
+# GENERATE_SYMBOLS
+#   Output a <provided_name>.symbols file containing all the exported symbols.
+# 
 # The following call is a simple example to the vala_precompile macro showing
 # an example to every of the optional sections:
 #
-#   vala_precompile(VALA_C mysourcebundle
+#   vala_precompile(VALA_C mytargetname
 #       source1.vala
 #       source2.vala
 #       source3.vala
@@ -99,81 +104,77 @@
 #       myvapi
 #   GENERATE_HEADER
 #       myheader
+#   GENERATE_GIR
+#       mygir
+#   GENERATE_SYMBOLS
+#       mysymbols
 #   )
 #
 # Most important is the variable VALA_C which will contain all the generated c
 # file names after the call.
 ##
 
-macro(vala_precompile output source_bundle_name)
-    parse_arguments(ARGS "PACKAGES;OPTIONS;DIRECTORY;GENERATE_HEADER;GENERATE_VAPI;CUSTOM_VAPIS" "" ${ARGN})
-    
+macro(vala_precompile output target_name)
+    cmake_parse_arguments (ARGS "" "GENERATE_GIR;GENERATE_SYMBOLS;GENERATE_HEADER;GENERATE_VAPI;DIRECTORY" "PACKAGES;OPTIONS;CUSTOM_VAPIS" ${ARGN})
+
     if(ARGS_DIRECTORY)
         set(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${ARGS_DIRECTORY})
     else(ARGS_DIRECTORY)
         set(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
     endif(ARGS_DIRECTORY)
-    
     include_directories(${DIRECTORY})
-    
     set(vala_pkg_opts "")
     foreach(pkg ${ARGS_PACKAGES})
         list(APPEND vala_pkg_opts "--pkg=${pkg}")
     endforeach(pkg ${ARGS_PACKAGES})
-    
-
     set(in_files "")
     set(out_files "")
+    set(out_files_display "")
     set(${output} "")
-    foreach(src ${ARGS_DEFAULT_ARGS})
-        string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" src ${src})
+
+    foreach(src ${ARGS_UNPARSED_ARGUMENTS})
         string(REGEX MATCH "^/" IS_MATCHED ${src})
-        
         if(${IS_MATCHED} MATCHES "/")
-            set(in_file ${src})
+            set(src_file_path ${src})
         else()
-            set(in_file "${CMAKE_CURRENT_SOURCE_DIR}/${src}")
+            set(src_file_path ${CMAKE_CURRENT_SOURCE_DIR}/${src})
         endif()
-        
+        list(APPEND in_files ${src_file_path})
         string(REPLACE ".vala" ".c" src ${src})
         string(REPLACE ".gs" ".c" src ${src})
-        
         if(${IS_MATCHED} MATCHES "/")
             get_filename_component(VALA_FILE_NAME ${src} NAME)
             set(out_file "${CMAKE_CURRENT_BINARY_DIR}/${VALA_FILE_NAME}")
+            list(APPEND out_files "${CMAKE_CURRENT_BINARY_DIR}/${VALA_FILE_NAME}")
         else()
             set(out_file "${DIRECTORY}/${src}")
+            list(APPEND out_files "${DIRECTORY}/${src}")
         endif()
-        
-        list(APPEND in_files ${in_file})
-        list(APPEND out_files ${out_file})
         list(APPEND ${output} ${out_file})
+        list(APPEND out_files_display "${src}")
     endforeach(src ${ARGS_DEFAULT_ARGS})
 
     set(custom_vapi_arguments "")
     if(ARGS_CUSTOM_VAPIS)
+        # Check for relative and absolute paths
         foreach(vapi ${ARGS_CUSTOM_VAPIS})
-            SET(_srcdir_regexp "${CMAKE_SOURCE_DIR}")
-            SET(_bindir_regexp "${CMAKE_BINARY_DIR}")
-            STRING(REGEX REPLACE "\\+" "\\\\+" _srcdir_regexp "${_srcdir_regexp}")
-            STRING(REGEX REPLACE "\\+" "\\\\+" _bindir_regexp "${_bindir_regexp}")
-            if(${vapi} MATCHES ${_srcdir_regexp} OR ${vapi} MATCHES ${_bindir_regexp})
+            string(REGEX MATCH "^/" IS_MATCHED ${vapi})
+            if(${IS_MATCHED} MATCHES "/")
                 list(APPEND custom_vapi_arguments ${vapi})
-            else(${vapi} MATCHES ${_srcdir_regexp} OR ${vapi} MATCHES ${_bindir_regexp})
+            else()
                 list(APPEND custom_vapi_arguments ${CMAKE_CURRENT_SOURCE_DIR}/${vapi})
-            endif(${vapi} MATCHES ${_srcdir_regexp} OR ${vapi} MATCHES ${_bindir_regexp})
+            endif()
         endforeach(vapi ${ARGS_CUSTOM_VAPIS})
     endif(ARGS_CUSTOM_VAPIS)
 
-    set(STAMP_FILE ".${source_bundle_name}.stamp")
-    
     set(vapi_arguments "")
     if(ARGS_GENERATE_VAPI)
         list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_VAPI}.vapi")
-        set(vapi_arguments "--vapi=${ARGS_GENERATE_VAPI}.vapi")
-        
+        list(APPEND out_files_display "${ARGS_GENERATE_VAPI}.vapi")
+        set(vapi_arguments "--library=${ARGS_GENERATE_VAPI}" "--vapi=${ARGS_GENERATE_VAPI}.vapi")
+
         # Header and internal header is needed to generate internal vapi
-        if(NOT ARGS_GENERATE_HEADER)
+        if (NOT ARGS_GENERATE_HEADER)
             set(ARGS_GENERATE_HEADER ${ARGS_GENERATE_VAPI})
         endif(NOT ARGS_GENERATE_HEADER)
     endif(ARGS_GENERATE_VAPI)
@@ -181,33 +182,70 @@
     set(header_arguments "")
     if(ARGS_GENERATE_HEADER)
         list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_HEADER}.h")
-        list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_HEADER}_internal.h")
-        list(APPEND header_arguments "--header=${DIRECTORY}/${ARGS_GENERATE_HEADER}.h")
-        list(APPEND header_arguments "--internal-header=${DIRECTORY}/${ARGS_GENERATE_HEADER}_internal.h")
+        list(APPEND out_files_display "${ARGS_GENERATE_HEADER}.h")
+        list(APPEND header_arguments "--header=${ARGS_GENERATE_HEADER}.h")
     endif(ARGS_GENERATE_HEADER)
 
-    add_custom_command(OUTPUT ${STAMP_FILE}
-    COMMAND
-        ${VALA_EXECUTABLE}
+    set(gir_arguments "")
+    set(gircomp_command "")
+    if(ARGS_GENERATE_GIR)
+        list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_GIR}.gir")
+        list(APPEND out_files_display "${ARGS_GENERATE_GIR}.gir")
+        set(gir_arguments "--gir=${ARGS_GENERATE_GIR}.gir")
+
+        include (FindGirCompiler)
+        find_package(GirCompiler REQUIRED)
+        
+        set(gircomp_command 
+            COMMAND 
+                ${G_IR_COMPILER_EXECUTABLE}
+            ARGS 
+                "${DIRECTORY}/${ARGS_GENERATE_GIR}.gir"
+                -o "${DIRECTORY}/${ARGS_GENERATE_GIR}.typelib")
+    endif(ARGS_GENERATE_GIR)
+
+    set(symbols_arguments "")
+    if(ARGS_GENERATE_SYMBOLS)
+        list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_SYMBOLS}.symbols")
+        list(APPEND out_files_display "${ARGS_GENERATE_SYMBOLS}.symbols")
+        set(symbols_arguments "--symbols=${ARGS_GENERATE_SYMBOLS}.symbols")
+    endif(ARGS_GENERATE_SYMBOLS)
+
+    # Workaround for a bug that would make valac run twice. This file is written
+    # after the vala compiler generates C source code.
+    set(OUTPUT_STAMP ${CMAKE_CURRENT_BINARY_DIR}/${target_name}_valac.stamp)
+
+    add_custom_command(
+    OUTPUT
+        ${OUTPUT_STAMP}
+    COMMAND 
+        ${VALA_EXECUTABLE} 
     ARGS 
         "-C" 
         ${header_arguments} 
-        ${vapi_arguments}
+        ${vapi_arguments} 
+        ${gir_arguments} 
+        ${symbols_arguments} 
         "-b" ${CMAKE_CURRENT_SOURCE_DIR} 
         "-d" ${DIRECTORY} 
         ${vala_pkg_opts} 
         ${ARGS_OPTIONS} 
+        "-g"
         ${in_files} 
         ${custom_vapi_arguments}
     COMMAND
         touch
     ARGS
-        ${STAMP_FILE}
+        ${OUTPUT_STAMP}
     DEPENDS 
-        ${in_files}
+        ${in_files} 
         ${ARGS_CUSTOM_VAPIS}
+    COMMENT
+        "Generating ${out_files_display}"
+    ${gircomp_command}
     )
-    
-    add_custom_command(OUTPUT ${out_files} DEPENDS ${STAMP_FILE})
+
+    # This command will be run twice for some reason (pass a non-empty string to COMMENT
+    # in order to see it). Since valac is not executed from here, this won't be a problem.
+    add_custom_command(OUTPUT ${out_files} DEPENDS ${OUTPUT_STAMP} COMMENT "")
 endmacro(vala_precompile)
-

=== modified file 'cmake/ValaVersion.cmake'
--- cmake/ValaVersion.cmake	2012-07-30 14:34:15 +0000
+++ cmake/ValaVersion.cmake	2016-05-17 01:07:53 +0000
@@ -27,8 +27,8 @@
 # either expressed or implied, of Jakob Westhoff
 ##
 
-include(ParseArguments)
 find_package(Vala REQUIRED)
+include(CMakeParseArguments)
 
 ##
 # Ensure a certain valac version is available
@@ -52,7 +52,7 @@
 # If no option is specified the version will be treated as a minimal version.
 ##
 macro(ensure_vala_version version)
-    parse_arguments(ARGS "" "MINIMUM;MAXIMUM;EXACT" ${ARGN})
+    cmake_parse_arguments (ARGS "" "MINIMUM;MAXIMUM;EXACT" "" ${ARGN})
 	set(compare_message "")
 	set(error_message "")
 	if(ARGS_MINIMUM)
@@ -78,7 +78,7 @@
 		if(${VALA_VERSION} VERSION_LESS ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version})
 			set(version_accepted TRUE)	
 		endif(${VALA_VERSION} VERSION_LESS ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version})
-	else(ARGS_MINIMUM)
+	else(ARGS_MAXIMUM)
 		if(${VALA_VERSION} VERSION_GREATER ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version})
 			set(version_accepted TRUE)	
 		endif(${VALA_VERSION} VERSION_GREATER ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version})

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2016-03-14 21:11:21 +0000
+++ data/CMakeLists.txt	2016-05-17 01:07:53 +0000
@@ -1,9 +1,16 @@
 #
 # Build and install pantheon-mail.desktop
 #
-
-configure_file(pantheon-mail.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/pantheon-mail.desktop)
-configure_file(pantheon-mail-autostart.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/pantheon-mail-autostart.desktop)
+include(Translations)
+
+configure_file(pantheon-mail.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/pantheon-mail.desktop.in)
+configure_file(${CMAKE_CURRENT_BINARY_DIR}/pantheon-mail.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/pantheon-mail.desktop)
+configure_file_translation(${CMAKE_CURRENT_BINARY_DIR}/pantheon-mail.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/pantheon-mail.desktop ${CMAKE_SOURCE_DIR}/po/)
+
+configure_file(pantheon-mail-autostart.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/pantheon-mail-autostart.desktop.in)
+configure_file(${CMAKE_CURRENT_BINARY_DIR}/pantheon-mail-autostart.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/pantheon-mail-autostart.desktop)
+configure_file_translation(${CMAKE_CURRENT_BINARY_DIR}/pantheon-mail-autostart.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/pantheon-mail-autostart.desktop ${CMAKE_SOURCE_DIR}/po/)
+
 
 install(FILES pantheon-mail.appdata.xml DESTINATION share/appdata)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pantheon-mail.desktop DESTINATION share/applications)

=== modified file 'data/mail-attach.contract'
--- data/mail-attach.contract	2015-11-30 17:28:30 +0000
+++ data/mail-attach.contract	2016-05-17 01:07:53 +0000
@@ -4,4 +4,4 @@
 Description=Send files using Mail
 MimeType=!inode;
 Exec=mail-attach %F
-X-GNOME-Gettext-Domain=geary
+X-GNOME-Gettext-Domain=pantheon-mail

=== renamed file 'data/pantheon-mail-autostart.desktop.in' => 'data/pantheon-mail-autostart.desktop.in.in'
--- data/pantheon-mail-autostart.desktop.in	2015-11-24 22:59:32 +0000
+++ data/pantheon-mail-autostart.desktop.in.in	2016-05-17 01:07:53 +0000
@@ -1,10 +1,10 @@
 [Desktop Entry]
-Name=@APP_NAME@
-Comment=@RELEASE_NAME@
+_Name=@APP_NAME@
+_Comment=@RELEASE_NAME@
 TryExec=@EXEC_NAME@
 Exec=@EXEC_NAME@ --hidden
 Icon=@DESKTOP_ICON@
-Keywords=Email;E-mail;Mail;
+_Keywords=Email;E-mail;Mail;
 Type=Application
 Terminal=false
 Categories=GNOME;GTK;Network;Email;

=== renamed file 'data/pantheon-mail.desktop.in' => 'data/pantheon-mail.desktop.in.in'
--- data/pantheon-mail.desktop.in	2016-02-08 21:29:43 +0000
+++ data/pantheon-mail.desktop.in.in	2016-05-17 01:07:53 +0000
@@ -1,10 +1,10 @@
 [Desktop Entry]
-Name=@APP_NAME@
-Comment=@RELEASE_NAME@
+_Name=@APP_NAME@
+_Comment=@RELEASE_NAME@
 TryExec=@EXEC_NAME@
 Exec=@EXEC_NAME@ %U
 Icon=@DESKTOP_ICON@
-Keywords=Email;E-mail;Mail;
+_Keywords=Email;E-mail;Mail;
 Terminal=false
 Type=Application
 MimeType=x-scheme-handler/mailto;
@@ -15,10 +15,10 @@
 Actions=AboutDialog;Compose;
 
 [Desktop Action AboutDialog]
-Name=About @APP_NAME@
+_Name=About @APP_NAME@
 Exec=@EXEC_NAME@ --about
 
 [Desktop Action Compose]
-Name=Compose Message
+_Name=Compose Message
 Exec=@EXEC_NAME@ mailto:
 

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2015-12-15 13:32:42 +0000
+++ po/CMakeLists.txt	2016-05-17 01:07:53 +0000
@@ -3,4 +3,7 @@
 add_translations_catalog(${GETTEXT_PACKAGE}
     ../src
     ../data
+    DESKTOP_FILES
+	    ${CMAKE_BINARY_DIR}/data/pantheon-mail.desktop.in
+        ${CMAKE_BINARY_DIR}/data/pantheon-mail-autostart.desktop.in
 )

=== added directory 'po/extra'
=== added file 'po/extra/extra.pot'
--- po/extra/extra.pot	1970-01-01 00:00:00 +0000
+++ po/extra/extra.pot	2016-05-17 01:07:53 +0000
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# 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: 2016-05-15 18:08+0400\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"
+
+msgid "Mail"
+msgstr ""
+
+msgid "Lightweight email client"
+msgstr ""
+
+msgid "Email;E-mail;Mail;"
+msgstr ""
+
+msgid "About Mail"
+msgstr ""
+
+msgid "Compose Message"
+msgstr ""

=== modified file 'po/pantheon-mail.pot'
--- po/pantheon-mail.pot	2016-03-21 16:44:26 +0000
+++ po/pantheon-mail.pot	2016-05-17 01:07:53 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-21 09:44-0700\n"
+"POT-Creation-Date: 2016-05-15 18:08+0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -1379,12 +1379,14 @@
 #: ../src/client/conversation-viewer/conversation-viewer.vala:413
 #: ../src/client/conversation-viewer/conversation-viewer.vala:415
 #: ../src/client/conversation-viewer/conversation-viewer.vala:302
+#: ../src/client/conversation-viewer/conversation-viewer.vala:308
 msgid "No conversations selected."
 msgstr ""
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:415
 #: ../src/client/conversation-viewer/conversation-viewer.vala:417
 #: ../src/client/conversation-viewer/conversation-viewer.vala:304
+#: ../src/client/conversation-viewer/conversation-viewer.vala:310
 msgid "%u conversation selected."
 msgid_plural "%u conversations selected."
 msgstr[0] ""
@@ -1393,12 +1395,14 @@
 #: ../src/client/conversation-viewer/conversation-viewer.vala:444
 #: ../src/client/conversation-viewer/conversation-viewer.vala:446
 #: ../src/client/conversation-viewer/conversation-viewer.vala:333
+#: ../src/client/conversation-viewer/conversation-viewer.vala:339
 msgid "No search results found."
 msgstr ""
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:446
 #: ../src/client/conversation-viewer/conversation-viewer.vala:448
 #: ../src/client/conversation-viewer/conversation-viewer.vala:335
+#: ../src/client/conversation-viewer/conversation-viewer.vala:341
 msgid "No conversations in folder."
 msgstr ""
 
@@ -1406,6 +1410,7 @@
 #: ../src/client/conversation-viewer/conversation-viewer.vala:713
 #: ../src/client/conversation-viewer/ConversationWidget.vala:426
 #: ../src/client/conversation-viewer/ConversationWidget.vala:450
+#: ../src/client/conversation-viewer/ConversationWidget.vala:453
 msgid "This message contains remote images."
 msgstr ""
 
@@ -1413,6 +1418,7 @@
 #: ../src/client/conversation-viewer/conversation-viewer.vala:713
 #: ../src/client/conversation-viewer/ConversationWidget.vala:424
 #: ../src/client/conversation-viewer/ConversationWidget.vala:448
+#: ../src/client/conversation-viewer/ConversationWidget.vala:451
 msgid "Show Images"
 msgstr ""
 
@@ -1425,6 +1431,7 @@
 #: ../src/client/conversation-viewer/conversation-viewer.vala:738
 #: ../src/client/conversation-viewer/ConversationWidget.vala:377
 #: ../src/client/conversation-viewer/ConversationWidget.vala:397
+#: ../src/client/conversation-viewer/ConversationWidget.vala:400
 msgid "Edit Draft"
 msgstr ""
 
@@ -1484,6 +1491,7 @@
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1302
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1129
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1153
+#: ../src/client/conversation-viewer/ConversationWidget.vala:1157
 msgid "_Copy"
 msgstr ""
 
@@ -1491,6 +1499,7 @@
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1310
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1137
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1161
+#: ../src/client/conversation-viewer/ConversationWidget.vala:1165
 msgid "Copy _Email Address"
 msgstr ""
 
@@ -1500,6 +1509,7 @@
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1146
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1170
 #: ../data/ui/composer.ui:103
+#: ../src/client/conversation-viewer/ConversationWidget.vala:1174
 msgid "Copy _Link"
 msgstr ""
 
@@ -1514,6 +1524,7 @@
 #: ../src/client/components/stock.vala:31
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1157
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1181
+#: ../src/client/conversation-viewer/ConversationWidget.vala:1185
 msgid "Select _All"
 msgstr ""
 
@@ -1521,6 +1532,7 @@
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1335
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1163
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1187
+#: ../src/client/conversation-viewer/ConversationWidget.vala:1191
 msgid "_Inspect"
 msgstr ""
 
@@ -1590,6 +1602,7 @@
 #: ../src/client/conversation-viewer/conversation-viewer.vala:2367
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1038
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1062
+#: ../src/client/conversation-viewer/ConversationWidget.vala:1066
 msgid "Failed to open default text editor."
 msgstr ""
 
@@ -1878,11 +1891,13 @@
 
 #: ../src/client/application/geary-application.vala:25
 #: ../src/client/application/geary-application.vala:24
+#: ../src/Translations.vala:1
 msgid "Send by Email"
 msgstr ""
 
 #: ../src/client/application/geary-application.vala:26
 #: ../src/client/application/geary-application.vala:25
+#: ../src/Translations.vala:2
 msgid "Send files using Mail"
 msgstr ""
 
@@ -2601,6 +2616,7 @@
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1112
 #: ../src/client/conversation-viewer/ConversationWidget.vala:267
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1136
+#: ../src/client/conversation-viewer/ConversationWidget.vala:1140
 msgid "Mark as Unread"
 msgstr ""
 
@@ -2608,6 +2624,7 @@
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1110
 #: ../src/client/conversation-viewer/ConversationWidget.vala:269
 #: ../src/client/conversation-viewer/ConversationWidget.vala:1134
+#: ../src/client/conversation-viewer/ConversationWidget.vala:1138
 msgid "Mark as Read"
 msgstr ""
 
@@ -2625,31 +2642,38 @@
 #: ../src/client/conversation-viewer/ConversationWidget.vala:602
 #: ../src/client/conversation-viewer/ConversationWidget.vala:337
 #: ../src/client/conversation-viewer/ConversationWidget.vala:626
+#: ../src/client/conversation-viewer/ConversationWidget.vala:340
+#: ../src/client/conversation-viewer/ConversationWidget.vala:630
 msgid "View message"
 msgstr ""
 
 #: ../src/client/conversation-viewer/ConversationWidget.vala:386
 #: ../src/client/conversation-viewer/ConversationWidget.vala:406
+#: ../src/client/conversation-viewer/ConversationWidget.vala:409
 msgid "This message contains one or more attachments"
 msgstr ""
 
 #: ../src/client/conversation-viewer/ConversationWidget.vala:425
 #: ../src/client/conversation-viewer/ConversationWidget.vala:449
+#: ../src/client/conversation-viewer/ConversationWidget.vala:452
 msgid "Always Show from Sender"
 msgstr ""
 
 #: ../src/client/conversation-viewer/ConversationWidget.vala:553
 #: ../src/client/conversation-viewer/ConversationWidget.vala:577
+#: ../src/client/conversation-viewer/ConversationWidget.vala:581
 msgid "Compose New Message"
 msgstr ""
 
 #: ../src/client/conversation-viewer/ConversationWidget.vala:554
 #: ../src/client/conversation-viewer/ConversationWidget.vala:578
+#: ../src/client/conversation-viewer/ConversationWidget.vala:582
 msgid "Copy Email Address"
 msgstr ""
 
 #: ../src/client/conversation-viewer/ConversationWidget.vala:615
 #: ../src/client/conversation-viewer/ConversationWidget.vala:639
+#: ../src/client/conversation-viewer/ConversationWidget.vala:643
 msgid "Hide message"
 msgstr ""
 
@@ -2675,14 +2699,18 @@
 
 #: ../src/client/conversation-viewer/ConversationWidget.vala:410
 #: ../src/client/conversation-viewer/ConversationWidget.vala:423
+#: ../src/client/conversation-viewer/ConversationWidget.vala:413
+#: ../src/client/conversation-viewer/ConversationWidget.vala:426
 msgid "Star message"
 msgstr ""
 
 #: ../src/client/conversation-viewer/ConversationWidget.vala:420
+#: ../src/client/conversation-viewer/ConversationWidget.vala:423
 msgid "Unstar message"
 msgstr ""
 
 #: ../src/client/conversation-viewer/ConversationWidget.vala:430
+#: ../src/client/conversation-viewer/ConversationWidget.vala:433
 msgid "More"
 msgstr ""
 

=== added file 'src/Translations.vala'
--- src/Translations.vala	1970-01-01 00:00:00 +0000
+++ src/Translations.vala	2016-05-17 01:07:53 +0000
@@ -0,0 +1,2 @@
+_("Send by Email");
+_("Send files using Mail");