[geary/wip/only-incomplete: 16/16] Merge branch 'master' into wip/only-incomplete
- From: Jim Nelson <jnelson src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary/wip/only-incomplete: 16/16] Merge branch 'master' into wip/only-incomplete
- Date: Wed, 11 Jun 2014 19:38:25 +0000 (UTC)
commit 415ccb3f149aa2dca628767a8216b6f95b7f04fc
Merge: 7ff0365 34deaf7
Author: Jim Nelson <jim yorba org>
Date: Wed Jun 11 12:38:18 2014 -0700
Merge branch 'master' into wip/only-incomplete
po/cs.po | 483 ++++++++++---------
po/he.po | 371 ++++++++-------
po/pl.po | 222 +++++----
po/pt_BR.po | 514 +++++++++++---------
po/sv.po | 21 +-
src/CMakeLists.txt | 1 +
src/client/accounts/add-edit-page.vala | 1 -
src/client/application/geary-config.vala | 2 +-
src/client/application/geary-controller.vala | 8 +-
src/client/components/main-toolbar.vala | 2 +-
src/client/components/pill-toolbar.vala | 65 ++-
src/client/components/stylish-webview.vala | 63 +++
src/client/composer/composer-widget.vala | 10 +-
.../conversation-viewer/conversation-viewer.vala | 2 +
.../conversation-viewer/conversation-web-view.vala | 30 ++-
theming/message-viewer.css | 18 +-
theming/message-viewer.html | 5 +-
ui/composer.glade | 2 +
ui/login.glade | 28 +-
19 files changed, 1045 insertions(+), 803 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]