diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-11-23 03:52:33 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-11-23 03:52:33 +0800 |
| commit | 00e495279937c6495d6fab99fe7f89583859ecd1 (patch) | |
| tree | 34b9779e6406e44a646bd8bf65a66dc55654f51a /po | |
| parent | 0c83b9b25d967ce6d6793ef851e86bc272a2f129 (diff) | |
| parent | f3abed7ac2c6099dbf5fd3e7c2483b6d75a637b5 (diff) | |
| download | gsoc2013-evolution-00e495279937c6495d6fab99fe7f89583859ecd1.tar gsoc2013-evolution-00e495279937c6495d6fab99fe7f89583859ecd1.tar.gz gsoc2013-evolution-00e495279937c6495d6fab99fe7f89583859ecd1.tar.bz2 gsoc2013-evolution-00e495279937c6495d6fab99fe7f89583859ecd1.tar.lz gsoc2013-evolution-00e495279937c6495d6fab99fe7f89583859ecd1.tar.xz gsoc2013-evolution-00e495279937c6495d6fab99fe7f89583859ecd1.tar.zst gsoc2013-evolution-00e495279937c6495d6fab99fe7f89583859ecd1.zip | |
Merge branch 'master' into wip/gsettings
Conflicts:
mail/e-mail-paned-view.c
Diffstat (limited to 'po')
| -rw-r--r-- | po/POTFILES.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index d8953dbfe9..8632377caf 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -272,6 +272,8 @@ modules/mail/em-composer-prefs.c modules/mail/em-mailer-prefs.c modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in modules/mailto-handler/evolution-mailto-handler.c +modules/mdn/evolution-mdn.c +modules/mdn/evolution-mdn.error.xml modules/offline-alert/evolution-offline-alert.error.xml modules/online-accounts/camel-sasl-xoauth.c modules/online-accounts/e-online-accounts-google.c |