diff options
| author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-11-17 22:55:48 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-11-17 22:55:48 +0800 |
| commit | 900d019a0332b24d2bee7ea1407b149fca2c0598 (patch) | |
| tree | 627edf5d63874be616d41c9a043571a80fc542f5 /mail/mail-config.ui | |
| parent | cdb09641dc6be772931e5381cdf1e6a824a15684 (diff) | |
| parent | badc11edcf5e73bc6148c7b5cdccee739eb9d7ae (diff) | |
| download | gsoc2013-evolution-900d019a0332b24d2bee7ea1407b149fca2c0598.tar gsoc2013-evolution-900d019a0332b24d2bee7ea1407b149fca2c0598.tar.gz gsoc2013-evolution-900d019a0332b24d2bee7ea1407b149fca2c0598.tar.bz2 gsoc2013-evolution-900d019a0332b24d2bee7ea1407b149fca2c0598.tar.lz gsoc2013-evolution-900d019a0332b24d2bee7ea1407b149fca2c0598.tar.xz gsoc2013-evolution-900d019a0332b24d2bee7ea1407b149fca2c0598.tar.zst gsoc2013-evolution-900d019a0332b24d2bee7ea1407b149fca2c0598.zip | |
Merge branch 'master' into wip/gsettings
Diffstat (limited to 'mail/mail-config.ui')
| -rw-r--r-- | mail/mail-config.ui | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/mail/mail-config.ui b/mail/mail-config.ui index 02bf640a3a..e95a812b59 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -594,7 +594,7 @@ for display purposes only. </property> <object class="GtkTable" id="replies-and-forwards-table"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="n_rows">6</property> + <property name="n_rows">7</property> <property name="n_columns">2</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> @@ -697,6 +697,23 @@ for display purposes only. </property> </packing> </child> <child> + <object class="GtkCheckButton" id="chkSignReplyIfSigned"> + <property name="label" translatable="yes">Digitally _sign messages when original message signed (PGP or S/MIME)</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="right_attach">2</property> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> + <property name="y_options"></property> + </packing> + </child> + <child> <object class="GtkAlignment" id="reply-style-alignment"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -4887,6 +4904,7 @@ For example: "Work" or "Personal"</property> <property name="yalign">0</property> <property name="label" translatable="yes">description</property> <property name="wrap">True</property> + <property name="width-chars">40</property> </object> <packing> <property name="left_attach">1</property> @@ -5398,6 +5416,7 @@ For example: "Work" or "Personal"</property> <property name="yalign">0</property> <property name="label" translatable="yes">description</property> <property name="wrap">True</property> + <property name="width-chars">40</property> </object> <packing> <property name="left_attach">1</property> |