GNOME.org
 

[geary] Support GNOME's Damned Lies workflow

commit 1932f466704b5664a2ad8462119a7e1ec8eba6ef
Author: Charles Lindsay <chaz yorba org>
Date:   Fri Jan 10 11:04:10 2014 -0800

    Support GNOME's Damned Lies workflow
    
    This should get Geary ready to be integrated into l10n.gnome.org,
    GNOME's Damned Lies translation project.  The biggest change is that we
    no longer track a .pot file, but we set it up so that translators can
    generate their own using intltool-update --pot.
    
    Closes: bgo #713827

 .gitignore                                    |    1 +
 CMakeLists.txt                                |    4 -
 cmake/Gettext.cmake                           |   65 +-
 po/CMakeLists.txt                             |   48 +-
 po/LINGUAS                                    |   43 +
 po/POTFILES.in                                |  360 ++++++
 po/POTFILES.skip                              |    1 +
 po/geary.pot                                  | 1501 -------------------------
 src/CMakeLists.txt                            |    7 -
 src/client/application/geary-application.vala |   11 +-
 ui/CMakeLists.txt                             |    4 -
 11 files changed, 411 insertions(+), 1634 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7bd279e..9ec36a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ build/
 *.swp
 bindings/vapi/gmime-2.6/gmime-2.6.gi
 /valadoc
+/po/untitled.pot
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b4f4e1..12983b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,10 +24,6 @@ set(ARCHIVE_BASE_NAME ${CMAKE_PROJECT_NAME}-${VERSION})
 set(ARCHIVE_FULL_NAME ${ARCHIVE_BASE_NAME}.tar.xz)
 set(ARCHIVE_DEBUILD_FULL_NAME ${CMAKE_PROJECT_NAME}_${VERSION}.orig.tar.xz)
 
-set(GLADE_FILES ui/account_list.glade ui/account_cannot_remove.glade ui/account_spinner.glade
-    ui/composer.glade ui/login.glade ui/message.glade ui/password-dialog.glade ui/preferences.glade
-    ui/remove_confirm.glade)
-
 option(DEBUG "Build for debugging." OFF)
 option(ICON_UPDATE "Run gtk-update-icon-cache after the install." ON)
 option(DESKTOP_UPDATE "Run update-desktop-database after the install." ON)
diff --git a/cmake/Gettext.cmake b/cmake/Gettext.cmake
index 9be4742..3247b3b 100644
--- a/cmake/Gettext.cmake
+++ b/cmake/Gettext.cmake
@@ -76,66 +76,8 @@ IF(NOT DEFINED XGETTEXT_OPTIONS)
 ENDIF(NOT DEFINED XGETTEXT_OPTIONS)
 
 IF(XGETTEXT_FOUND)
-    MACRO(GETTEXT_CREATE_POT _potFile _pot_options )
-       SET(_xgettext_options_list)
-       SET(_src_list)
-       SET(_src_list_abs)
-       SET(_glade_list)
-       SET(_glade_list_abs)
-       SET(_stage "SRC")
-       FOREACH(_pot_option ${_pot_options} ${ARGN})
-               IF(_pot_option STREQUAL "OPTION")
-                       SET(_stage "OPTION")
-               ELSEIF(_pot_option STREQUAL "SRC")
-                       SET(_stage "SRC")
-               ELSEIF(_pot_option STREQUAL "GLADE")
-                       SET(_stage "GLADE")
-               ELSE(_pot_option STREQUAL "OPTION")
-                       IF(_stage STREQUAL "OPTION")
-                               SET(_xgettext_options_list ${_xgettext_options_list} ${_pot_option})
-                       ELSEIF(_stage STREQUAL "GLADE")
-                               FILE(RELATIVE_PATH _relFile ${CMAKE_CURRENT_BINARY_DIR} 
${CMAKE_SOURCE_DIR}/${_pot_option})
-                               GET_FILENAME_COMPONENT(_absFile ${_pot_option} ABSOLUTE)
-                               SET(_glade_list ${_glade_list} ${_relFile})
-                               SET(_glade_list_abs ${_glade_list_abs} ${_absFile})
-                       ELSEIF(_stage STREQUAL "SRC")
-                               FILE(RELATIVE_PATH _relFile ${CMAKE_CURRENT_BINARY_DIR} 
${CMAKE_CURRENT_SOURCE_DIR}/${_pot_option})
-                               GET_FILENAME_COMPONENT(_absFile ${_pot_option} ABSOLUTE)
-                               SET(_src_list ${_src_list} ${_relFile})
-                               SET(_src_list_abs ${_src_list_abs} ${_absFile})
-                       ENDIF(_stage STREQUAL "OPTION")
-               ENDIF(_pot_option STREQUAL "OPTION")
-       ENDFOREACH(_pot_option ${_pot_options} ${ARGN})
-
-       IF (_xgettext_options_list)
-           SET(_xgettext_options ${_xgettext_options_list})
-       ELSE(_xgettext_options_list)
-           SET(_xgettext_options ${XGETTEXT_OPTIONS})
-       ENDIF(_xgettext_options_list)
-
-       #MESSAGE("${XGETTEXT_EXECUTABLE} ${_xgettext_options_list} -o ${_potFile} ${_src_list}")
-       ADD_CUSTOM_COMMAND(OUTPUT pot_file
-           COMMAND ${XGETTEXT_EXECUTABLE} ${_xgettext_options} -o ${_potFile} ${_src_list}
-           DEPENDS ${_src_list_abs} ${GLADE_FILES}
-           WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-           )
-
-       ADD_CUSTOM_TARGET(pot_file
-           COMMAND ${XGETTEXT_EXECUTABLE} ${_xgettext_options_list} -o _source.pot ${_src_list}
-           COMMAND ${XGETTEXT_EXECUTABLE} --language=Glade --omit-header -o _glade.pot ${_glade_list}
-           COMMAND ${GETTEXT_MSGCAT_EXECUTABLE} -o ${_potFile} --use-first _source.pot _glade.pot
-           DEPENDS ${_src_list_abs}
-           WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-           COMMENT "Extract translatable messages to ${_potFile}"
-           )
-    ENDMACRO(GETTEXT_CREATE_POT _potFile _pot_options)
-
-
-    MACRO(GETTEXT_CREATE_TRANSLATIONS _potFile _firstLang)
+    MACRO(GETTEXT_CREATE_TRANSLATIONS _firstLang)
        SET(_gmoFiles)
-       GET_FILENAME_COMPONENT(_potBasename ${_potFile} NAME_WE)
-       GET_FILENAME_COMPONENT(_absPotFile ${_potFile} ABSOLUTE)
-
        SET(_addToAll)
        SET(_is_comment FALSE)
 
@@ -156,13 +98,12 @@ IF(XGETTEXT_FOUND)
                #MESSAGE("_absFile=${_absFile} _abs_PATH=${_abs_PATH} _lang=${_lang} 
curr_bin=${CMAKE_CURRENT_BINARY_DIR}")
                ADD_CUSTOM_COMMAND(
                    OUTPUT ${_gmoFile}
-                   COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${_absFile} 
${_absPotFile}
                    COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_absFile}
-                   DEPENDS ${_absPotFile} ${_absFile}
+                   DEPENDS ${_absFile}
                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
                    )
 
-               INSTALL(FILES ${_gmoFile} DESTINATION share/locale/${_lang}/LC_MESSAGES RENAME 
${_potBasename}.mo)
+                INSTALL(FILES ${_gmoFile} DESTINATION share/locale/${_lang}/LC_MESSAGES RENAME 
${GETTEXT_PACKAGE}.mo)
                SET(_gmoFiles ${_gmoFiles} ${_gmoFile})
            ENDIF()
        ENDFOREACH (_currentLang )
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 3530945..69ba600 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -1,52 +1,8 @@
 
-set(TRANSLATED
-    ar
-    ca
-    cs
-    da
-    de
-    el
-    en_CA
-    en_GB
-    eo
-    es
-    et
-    eu
-    fa
-    fi
-    fr
-    gl
-    he
-    hi
-    hr
-    hu
-    id
-    it
-    ja
-    km
-    lt
-    ms
-    nb
-    nl
-    pl
-    pt
-    pt_BR
-    ro
-    ru
-    sk
-    sl
-    sr
-    sv
-    te
-    tr
-    uk
-    vi
-    zh_CN
-    zh_TW
-)
+file(STRINGS "LINGUAS" TRANSLATED)
 
 IF (XGETTEXT_FOUND)
-    GETTEXT_CREATE_TRANSLATIONS(${GETTEXT_PACKAGE}.pot ALL ${TRANSLATED}
+    GETTEXT_CREATE_TRANSLATIONS(ALL ${TRANSLATED}
            COMMENT "Creating translations.")
 ELSE ()
     message(STATUS "xgettext not found")
diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644
index 0000000..1816c5f
--- /dev/null
+++ b/po/LINGUAS
@@ -0,0 +1,43 @@
+ar
+ca
+cs
+da
+de
+el
+en_CA
+en_GB
+eo
+es
+et
+eu
+fa
+fi
+fr
+gl
+he
+hi
+hr
+hu
+id
+it
+ja
+km
+lt
+ms
+nb
+nl
+pl
+pt
+pt_BR
+ro
+ru
+sk
+sl
+sr
+sv
+te
+tr
+uk
+vi
+zh_CN
+zh_TW
diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 0000000..6279475
--- /dev/null
+++ b/po/POTFILES.in
@@ -0,0 +1,360 @@
+[encoding: UTF-8]
+desktop/geary.desktop.in
+src/client/accounts/account-dialog-account-list-pane.vala
+src/client/accounts/account-dialog-add-edit-pane.vala
+src/client/accounts/account-dialog-pane.vala
+src/client/accounts/account-dialog-remove-confirm-pane.vala
+src/client/accounts/account-dialog-remove-fail-pane.vala
+src/client/accounts/account-dialog-spinner-pane.vala
+src/client/accounts/account-dialog.vala
+src/client/accounts/account-spinner-page.vala
+src/client/accounts/add-edit-page.vala
+src/client/accounts/login-dialog.vala
+src/client/application/geary-action-adapter.vala
+src/client/application/geary-application.vala
+src/client/application/geary-args.vala
+src/client/application/geary-config.vala
+src/client/application/geary-controller.vala
+src/client/application/main.vala
+src/client/application/secret-mediator.vala
+src/client/components/conversation-find-bar.vala
+src/client/components/count-badge.vala
+src/client/components/folder-menu.vala
+src/client/components/icon-factory.vala
+src/client/components/main-toolbar.vala
+src/client/components/main-window.vala
+src/client/components/monitored-progress-bar.vala
+src/client/components/monitored-spinner.vala
+src/client/components/pill-toolbar.vala
+src/client/components/status-bar.vala
+src/client/components/stock.vala
+src/client/composer/composer-toolbar.vala
+src/client/composer/composer-window.vala
+src/client/composer/contact-entry-completion.vala
+src/client/composer/contact-list-store.vala
+src/client/composer/email-entry.vala
+src/client/composer/webview-edit-fixer.vala
+src/client/conversation-list/conversation-list-cell-renderer.vala
+src/client/conversation-list/conversation-list-store.vala
+src/client/conversation-list/conversation-list-view.vala
+src/client/conversation-list/formatted-conversation-data.vala
+src/client/conversation-viewer/conversation-viewer.vala
+src/client/conversation-viewer/conversation-web-view.vala
+src/client/dialogs/alert-dialog.vala
+src/client/dialogs/attachment-dialog.vala
+src/client/dialogs/password-dialog.vala
+src/client/dialogs/preferences-dialog.vala
+src/client/dialogs/upgrade-dialog.vala
+src/client/folder-list/folder-list-abstract-folder-entry.vala
+src/client/folder-list/folder-list-account-branch.vala
+src/client/folder-list/folder-list-folder-entry.vala
+src/client/folder-list/folder-list-inboxes-branch.vala
+src/client/folder-list/folder-list-inbox-folder-entry.vala
+src/client/folder-list/folder-list-search-branch.vala
+src/client/folder-list/folder-list-special-grouping.vala
+src/client/folder-list/folder-list-tree.vala
+src/client/notification/libmessagingmenu.vala
+src/client/notification/libnotify.vala
+src/client/notification/new-messages-indicator.vala
+src/client/notification/new-messages-monitor.vala
+src/client/notification/null-indicator.vala
+src/client/notification/unity-launcher.vala
+src/client/sidebar/sidebar-branch.vala
+src/client/sidebar/sidebar-common.vala
+src/client/sidebar/sidebar-count-cell-renderer.vala
+src/client/sidebar/sidebar-entry.vala
+src/client/sidebar/sidebar-tree.vala
+src/client/util/util-date.vala
+src/client/util/util-email.vala
+src/client/util/util-files.vala
+src/client/util/util-gravatar.vala
+src/client/util/util-gtk.vala
+src/client/util/util-international.vala
+src/client/util/util-webkit.vala
+src/engine/abstract/geary-abstract-account.vala
+src/engine/abstract/geary-abstract-folder.vala
+src/engine/abstract/geary-abstract-local-folder.vala
+src/engine/api/geary-account-information.vala
+src/engine/api/geary-account.vala
+src/engine/api/geary-aggregated-folder-properties.vala
+src/engine/api/geary-attachment.vala
+src/engine/api/geary-base-object.vala
+src/engine/api/geary-composed-email.vala
+src/engine/api/geary-contact-flags.vala
+src/engine/api/geary-contact-importance.vala
+src/engine/api/geary-contact-store.vala
+src/engine/api/geary-contact.vala
+src/engine/api/geary-credentials-mediator.vala
+src/engine/api/geary-credentials.vala
+src/engine/api/geary-email-flags.vala
+src/engine/api/geary-email-identifier.vala
+src/engine/api/geary-email-properties.vala
+src/engine/api/geary-email.vala
+src/engine/api/geary-endpoint.vala
+src/engine/api/geary-engine-error.vala
+src/engine/api/geary-engine.vala
+src/engine/api/geary-folder-path.vala
+src/engine/api/geary-folder-properties.vala
+src/engine/api/geary-folder-supports-archive.vala
+src/engine/api/geary-folder-supports-copy.vala
+src/engine/api/geary-folder-supports-create.vala
+src/engine/api/geary-folder-supports-mark.vala
+src/engine/api/geary-folder-supports-move.vala
+src/engine/api/geary-folder-supports-remove.vala
+src/engine/api/geary-folder.vala
+src/engine/api/geary-logging.vala
+src/engine/api/geary-named-flags.vala
+src/engine/api/geary-named-flag.vala
+src/engine/api/geary-progress-monitor.vala
+src/engine/api/geary-search-folder.vala
+src/engine/api/geary-search-query.vala
+src/engine/api/geary-service-provider.vala
+src/engine/api/geary-special-folder-type.vala
+src/engine/app/app-conversation-monitor.vala
+src/engine/app/app-conversation.vala
+src/engine/app/app-email-store.vala
+src/engine/app/conversation-monitor/app-append-operation.vala
+src/engine/app/conversation-monitor/app-conversation-operation-queue.vala
+src/engine/app/conversation-monitor/app-conversation-operation.vala
+src/engine/app/conversation-monitor/app-conversation-set.vala
+src/engine/app/conversation-monitor/app-external-append-operation.vala
+src/engine/app/conversation-monitor/app-fill-window-operation.vala
+src/engine/app/conversation-monitor/app-local-load-operation.vala
+src/engine/app/conversation-monitor/app-local-search-operation.vala
+src/engine/app/conversation-monitor/app-remove-operation.vala
+src/engine/app/conversation-monitor/app-reseed-operation.vala
+src/engine/app/conversation-monitor/app-terminate-operation.vala
+src/engine/app/email-store/app-async-folder-operation.vala
+src/engine/app/email-store/app-copy-operation.vala
+src/engine/app/email-store/app-fetch-operation.vala
+src/engine/app/email-store/app-list-operation.vala
+src/engine/app/email-store/app-mark-operation.vala
+src/engine/common/common-message-data.vala
+src/engine/db/db-connection.vala
+src/engine/db/db-context.vala
+src/engine/db/db-database-error.vala
+src/engine/db/db-database.vala
+src/engine/db/db-result.vala
+src/engine/db/db-statement.vala
+src/engine/db/db-synchronous-mode.vala
+src/engine/db/db-transaction-async-job.vala
+src/engine/db/db-transaction-outcome.vala
+src/engine/db/db-transaction-type.vala
+src/engine/db/db.vala
+src/engine/db/db-versioned-database.vala
+src/engine/imap/api/imap-account.vala
+src/engine/imap/api/imap-email-flags.vala
+src/engine/imap/api/imap-email-properties.vala
+src/engine/imap/api/imap-folder-properties.vala
+src/engine/imap/api/imap-folder-root.vala
+src/engine/imap/api/imap-folder.vala
+src/engine/imap/command/imap-append-command.vala
+src/engine/imap/command/imap-capability-command.vala
+src/engine/imap/command/imap-close-command.vala
+src/engine/imap/command/imap-command.vala
+src/engine/imap/command/imap-compress-command.vala
+src/engine/imap/command/imap-copy-command.vala
+src/engine/imap/command/imap-examine-command.vala
+src/engine/imap/command/imap-expunge-command.vala
+src/engine/imap/command/imap-fetch-command.vala
+src/engine/imap/command/imap-id-command.vala
+src/engine/imap/command/imap-idle-command.vala
+src/engine/imap/command/imap-list-command.vala
+src/engine/imap/command/imap-login-command.vala
+src/engine/imap/command/imap-logout-command.vala
+src/engine/imap/command/imap-message-set.vala
+src/engine/imap/command/imap-noop-command.vala
+src/engine/imap/command/imap-search-command.vala
+src/engine/imap/command/imap-search-criteria.vala
+src/engine/imap/command/imap-search-criterion.vala
+src/engine/imap/command/imap-select-command.vala
+src/engine/imap/command/imap-starttls-command.vala
+src/engine/imap/command/imap-status-command.vala
+src/engine/imap/command/imap-store-command.vala
+src/engine/imap-db/imap-db-account.vala
+src/engine/imap-db/imap-db-attachment.vala
+src/engine/imap-db/imap-db-contact.vala
+src/engine/imap-db/imap-db-database.vala
+src/engine/imap-db/imap-db-email-identifier.vala
+src/engine/imap-db/imap-db-folder.vala
+src/engine/imap-db/imap-db-message-addresses.vala
+src/engine/imap-db/imap-db-message-row.vala
+src/engine/imap-db/imap-db-search-email-identifier.vala
+src/engine/imap-db/outbox/smtp-outbox-email-identifier.vala
+src/engine/imap-db/outbox/smtp-outbox-email-properties.vala
+src/engine/imap-db/outbox/smtp-outbox-folder-properties.vala
+src/engine/imap-db/outbox/smtp-outbox-folder-root.vala
+src/engine/imap-db/outbox/smtp-outbox-folder.vala
+src/engine/imap-engine/gmail/imap-engine-gmail-account.vala
+src/engine/imap-engine/gmail/imap-engine-gmail-folder.vala
+src/engine/imap-engine/gmail/imap-engine-gmail-search-folder.vala
+src/engine/imap-engine/imap-engine-account-synchronizer.vala
+src/engine/imap-engine/imap-engine-batch-operations.vala
+src/engine/imap-engine/imap-engine-contact-store.vala
+src/engine/imap-engine/imap-engine-email-flag-watcher.vala
+src/engine/imap-engine/imap-engine-email-prefetcher.vala
+src/engine/imap-engine/imap-engine-generic-account.vala
+src/engine/imap-engine/imap-engine-generic-all-mail-folder.vala
+src/engine/imap-engine/imap-engine-generic-drafts-folder.vala
+src/engine/imap-engine/imap-engine-generic-folder.vala
+src/engine/imap-engine/imap-engine-generic-sent-mail-folder.vala
+src/engine/imap-engine/imap-engine-generic-trash-folder.vala
+src/engine/imap-engine/imap-engine-receive-replay-operation.vala
+src/engine/imap-engine/imap-engine-replay-operation.vala
+src/engine/imap-engine/imap-engine-replay-queue.vala
+src/engine/imap-engine/imap-engine-send-replay-operation.vala
+src/engine/imap-engine/imap-engine.vala
+src/engine/imap-engine/other/imap-engine-other-account.vala
+src/engine/imap-engine/other/imap-engine-other-folder.vala
+src/engine/imap-engine/outlook/imap-engine-outlook-account.vala
+src/engine/imap-engine/outlook/imap-engine-outlook-folder.vala
+src/engine/imap-engine/replay-ops/imap-engine-abstract-list-email.vala
+src/engine/imap-engine/replay-ops/imap-engine-copy-email.vala
+src/engine/imap-engine/replay-ops/imap-engine-create-email.vala
+src/engine/imap-engine/replay-ops/imap-engine-fetch-email.vala
+src/engine/imap-engine/replay-ops/imap-engine-list-email-by-id.vala
+src/engine/imap-engine/replay-ops/imap-engine-list-email-by-sparse-id.vala
+src/engine/imap-engine/replay-ops/imap-engine-mark-email.vala
+src/engine/imap-engine/replay-ops/imap-engine-move-email.vala
+src/engine/imap-engine/replay-ops/imap-engine-remove-email.vala
+src/engine/imap-engine/replay-ops/imap-engine-replay-append.vala
+src/engine/imap-engine/replay-ops/imap-engine-replay-disconnect.vala
+src/engine/imap-engine/replay-ops/imap-engine-replay-removal.vala
+src/engine/imap-engine/replay-ops/imap-engine-server-search-email.vala
+src/engine/imap-engine/yahoo/imap-engine-yahoo-account.vala
+src/engine/imap-engine/yahoo/imap-engine-yahoo-folder.vala
+src/engine/imap/imap-error.vala
+src/engine/imap/imap.vala
+src/engine/imap/message/imap-data-format.vala
+src/engine/imap/message/imap-envelope.vala
+src/engine/imap/message/imap-fetch-body-data-specifier.vala
+src/engine/imap/message/imap-fetch-data-specifier.vala
+src/engine/imap/message/imap-flags.vala
+src/engine/imap/message/imap-flag.vala
+src/engine/imap/message/imap-internal-date.vala
+src/engine/imap/message/imap-mailbox-parameter.vala
+src/engine/imap/message/imap-mailbox-specifier.vala
+src/engine/imap/message/imap-message-data.vala
+src/engine/imap/message/imap-message-flags.vala
+src/engine/imap/message/imap-message-flag.vala
+src/engine/imap/message/imap-sequence-number.vala
+src/engine/imap/message/imap-status-data-type.vala
+src/engine/imap/message/imap-tag.vala
+src/engine/imap/message/imap-uid.vala
+src/engine/imap/message/imap-uid-validity.vala
+src/engine/imap/parameter/imap-atom-parameter.vala
+src/engine/imap/parameter/imap-list-parameter.vala
+src/engine/imap/parameter/imap-literal-parameter.vala
+src/engine/imap/parameter/imap-nil-parameter.vala
+src/engine/imap/parameter/imap-number-parameter.vala
+src/engine/imap/parameter/imap-parameter.vala
+src/engine/imap/parameter/imap-quoted-string-parameter.vala
+src/engine/imap/parameter/imap-root-parameters.vala
+src/engine/imap/parameter/imap-string-parameter.vala
+src/engine/imap/parameter/imap-unquoted-string-parameter.vala
+src/engine/imap/response/imap-capabilities.vala
+src/engine/imap/response/imap-continuation-response.vala
+src/engine/imap/response/imap-fetch-data-decoder.vala
+src/engine/imap/response/imap-fetched-data.vala
+src/engine/imap/response/imap-mailbox-attributes.vala
+src/engine/imap/response/imap-mailbox-attribute.vala
+src/engine/imap/response/imap-mailbox-information.vala
+src/engine/imap/response/imap-response-code-type.vala
+src/engine/imap/response/imap-response-code.vala
+src/engine/imap/response/imap-server-data-type.vala
+src/engine/imap/response/imap-server-data.vala
+src/engine/imap/response/imap-server-response.vala
+src/engine/imap/response/imap-status-data.vala
+src/engine/imap/response/imap-status-response.vala
+src/engine/imap/response/imap-status.vala
+src/engine/imap/transport/imap-client-connection.vala
+src/engine/imap/transport/imap-client-session-manager.vala
+src/engine/imap/transport/imap-client-session.vala
+src/engine/imap/transport/imap-deserializer.vala
+src/engine/imap/transport/imap-serializer.vala
+src/engine/memory/memory-buffer.vala
+src/engine/memory/memory-byte-buffer.vala
+src/engine/memory/memory-empty-buffer.vala
+src/engine/memory/memory-file-buffer.vala
+src/engine/memory/memory-growable-buffer.vala
+src/engine/memory/memory-string-buffer.vala
+src/engine/memory/memory-unowned-byte-array-buffer.vala
+src/engine/memory/memory-unowned-bytes-buffer.vala
+src/engine/memory/memory-unowned-string-buffer.vala
+src/engine/mime/mime-content-disposition.vala
+src/engine/mime/mime-content-parameters.vala
+src/engine/mime/mime-content-type.vala
+src/engine/mime/mime-data-format.vala
+src/engine/mime/mime-disposition-type.vala
+src/engine/mime/mime-error.vala
+src/engine/nonblocking/nonblocking-abstract-semaphore.vala
+src/engine/nonblocking/nonblocking-batch.vala
+src/engine/nonblocking/nonblocking-concurrent.vala
+src/engine/nonblocking/nonblocking-counting-semaphore.vala
+src/engine/nonblocking/nonblocking-error.vala
+src/engine/nonblocking/nonblocking-mailbox.vala
+src/engine/nonblocking/nonblocking-mutex.vala
+src/engine/nonblocking/nonblocking-reporting-semaphore.vala
+src/engine/nonblocking/nonblocking-variants.vala
+src/engine/rfc822/rfc822-error.vala
+src/engine/rfc822/rfc822-gmime-filter-blockquotes.vala
+src/engine/rfc822/rfc822-gmime-filter-flowed.vala
+src/engine/rfc822/rfc822-gmime-filter-plain.vala
+src/engine/rfc822/rfc822-mailbox-addresses.vala
+src/engine/rfc822/rfc822-mailbox-address.vala
+src/engine/rfc822/rfc822-message-data.vala
+src/engine/rfc822/rfc822-message.vala
+src/engine/rfc822/rfc822-utils.vala
+src/engine/rfc822/rfc822.vala
+src/engine/smtp/smtp-abstract-authenticator.vala
+src/engine/smtp/smtp-authenticator.vala
+src/engine/smtp/smtp-capabilities.vala
+src/engine/smtp/smtp-client-connection.vala
+src/engine/smtp/smtp-client-session.vala
+src/engine/smtp/smtp-command.vala
+src/engine/smtp/smtp-data-format.vala
+src/engine/smtp/smtp-error.vala
+src/engine/smtp/smtp-greeting.vala
+src/engine/smtp/smtp-login-authenticator.vala
+src/engine/smtp/smtp-plain-authenticator.vala
+src/engine/smtp/smtp-request.vala
+src/engine/smtp/smtp-response-code.vala
+src/engine/smtp/smtp-response-line.vala
+src/engine/smtp/smtp-response.vala
+src/engine/state/state-machine-descriptor.vala
+src/engine/state/state-machine.vala
+src/engine/state/state-mapping.vala
+src/engine/util/util-collection.vala
+src/engine/util/util-converter.vala
+src/engine/util/util-files.vala
+src/engine/util/util-generic-capabilities.vala
+src/engine/util/util-html.vala
+src/engine/util/util-imap-utf7.vala
+src/engine/util/util-inet.vala
+src/engine/util/util-iterable.vala
+src/engine/util/util-numeric.vala
+src/engine/util/util-object.vala
+src/engine/util/util-reference-semantics.vala
+src/engine/util/util-scheduler.vala
+src/engine/util/util-single-item.vala
+src/engine/util/util-stream.vala
+src/engine/util/util-string.vala
+src/engine/util/util-synchronization.vala
+src/engine/util/util-time.vala
+src/engine/util/util-trillian.vala
+[type: gettext/glade]ui/accelerators.ui
+[type: gettext/glade]ui/account_cannot_remove.glade
+[type: gettext/glade]ui/account_list.glade
+[type: gettext/glade]ui/account_spinner.glade
+[type: gettext/glade]ui/app_menu.interface
+[type: gettext/glade]ui/composer_accelerators.ui
+[type: gettext/glade]ui/composer.glade
+[type: gettext/glade]ui/find_bar.glade
+[type: gettext/glade]ui/login.glade
+[type: gettext/glade]ui/message.glade
+[type: gettext/glade]ui/password-dialog.glade
+[type: gettext/glade]ui/preferences.glade
+[type: gettext/glade]ui/remove_confirm.glade
+[type: gettext/glade]ui/toolbar_mark_menu.ui
+[type: gettext/glade]ui/toolbar_menu.ui
+[type: gettext/glade]ui/upgrade_dialog.glade
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
new file mode 100644
index 0000000..378eac2
--- /dev/null
+++ b/po/POTFILES.skip
@@ -0,0 +1 @@
+build
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6115f71..4c3a45a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -650,13 +650,6 @@ add_custom_command(
 include(GSettings)
 add_schemas(geary ${GSETTINGS_DIR} ${CMAKE_INSTALL_PREFIX})
 
-IF (XGETTEXT_FOUND)
-    MESSAGE("Creating POT file")
-    GETTEXT_CREATE_POT(${GETTEXT_PACKAGE}.pot OPTION ${XGETTEXT_OPTIONS} SRC ${CLIENT_SRC} ${ENGINE_SRC} 
GLADE ${GLADE_FILES})
-ELSE ()
-    message(STATUS "xgettext not found")
-ENDIF()
-
 # Console app
 #################################################
 vala_precompile(CONSOLE_VALA_C geary-console
diff --git a/src/client/application/geary-application.vala b/src/client/application/geary-application.vala
index 9f68fd8..c1acbf6 100644
--- a/src/client/application/geary-application.vala
+++ b/src/client/application/geary-application.vala
@@ -15,22 +15,13 @@ public class GearyApplication : Gtk.Application {
     public const string NAME = "Geary";
     public const string PRGNAME = "geary";
     public const string APP_ID = "org.yorba.geary";
-    public const string DESCRIPTION = DESKTOP_GENERIC_NAME;
+    public const string DESCRIPTION = _("Mail Client");
     public const string COPYRIGHT = _("Copyright 2011-2013 Yorba Foundation");
     public const string WEBSITE = "http://www.yorba.org";;
     public const string WEBSITE_LABEL = _("Visit the Yorba web site");
     public const string BUGREPORT = "http://redmine.yorba.org/projects/geary/issues";;
     public const string DONATE = "http://www.yorba.org/about/donate";;
     
-    // These strings must match corresponding strings in desktop/geary.desktop *exactly* and be
-    // internationalizable
-    public const string DESKTOP_NAME = _("Geary");
-    public const string DESKTOP_GENERIC_NAME = _("Mail Client");
-    public const string DESKTOP_GNOME_FULLNAME = _("Geary Mail");
-    public const string DESKTOP_COMMENT = _("Send and receive email");
-    public const string DESKTOP_KEYWORDS = _("Email;E-mail;Mail;");
-    public const string DESKTOP_COMPOSE_NAME = _("Compose Message");
-    
     public const string VERSION = _VERSION;
     public const string INSTALL_PREFIX = _INSTALL_PREFIX;
     public const string GSETTINGS_DIR = _GSETTINGS_DIR;
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index a6d5767..b04dbe2 100644
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -16,7 +16,3 @@ install(FILES remove_confirm.glade DESTINATION ${UI_DEST})
 install(FILES toolbar_mark_menu.ui DESTINATION ${UI_DEST})
 install(FILES toolbar_menu.ui DESTINATION ${UI_DEST})
 install(FILES upgrade_dialog.glade DESTINATION ${UI_DEST})
-
-#
-# NOTE: Update GLADE_FILES in ../CMakeLists.txt with additions and removals
-#
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]