merge in from git
This commit is contained in:
@@ -24,6 +24,21 @@
|
||||
<column type="gchararray"/>
|
||||
</columns>
|
||||
</object>
|
||||
<object class="GtkMenu" id="fprclipboard_menu">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="ubuntu_local">True</property>
|
||||
<child>
|
||||
<object class="GtkMenuItem" id="copyfprclipboard_item">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="use_action_appearance">False</property>
|
||||
<property name="label" translatable="yes" comments="Context menu item">Copy to clipboard</property>
|
||||
<property name="use_underline">True</property>
|
||||
<signal name="activate" handler="clipboard_button_cb"/>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<object class="GtkNotebook" id="notebook1">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
@@ -53,7 +68,7 @@
|
||||
<child>
|
||||
<object class="GtkLabel" id="fingerprint_label_desc">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Fingerprint:</property>
|
||||
<property name="label" translatable="yes" comments="Descriptive label">Fingerprint:</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
@@ -63,10 +78,9 @@
|
||||
<child>
|
||||
<object class="GtkLabel" id="fingerprint_label">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes"><tt>-------- -------- -------- -------- -------- </tt></property>
|
||||
<property name="label"><tt>-------- -------- -------- -------- -------- </tt></property>
|
||||
<property name="use_markup">True</property>
|
||||
<property name="selectable">True</property>
|
||||
<property name="ellipsize">end</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="position">1</property>
|
||||
@@ -80,7 +94,7 @@
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkButton" id="regenerate_button">
|
||||
<property name="label" translatable="yes">(Re-)generate</property>
|
||||
<property name="label" translatable="yes" comments="Generate Fingerprint button">(Re-)generate</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">True</property>
|
||||
@@ -107,7 +121,7 @@
|
||||
<property name="orientation">vertical</property>
|
||||
<child>
|
||||
<object class="GtkCheckButton" id="enable_check">
|
||||
<property name="label" translatable="yes">Enable private (Off-the-Record) messaging</property>
|
||||
<property name="label" translatable="yes" comments="checkbox">Enable private (Off-the-Record) messaging</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">False</property>
|
||||
@@ -120,7 +134,7 @@
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkCheckButton" id="advertise_check">
|
||||
<property name="label" translatable="yes">Advertise Off-the-Record messaging support</property>
|
||||
<property name="label" translatable="yes" comments="checkbox">Advertise Off-the-Record messaging support</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">False</property>
|
||||
@@ -133,7 +147,7 @@
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkCheckButton" id="autoinitiate_check">
|
||||
<property name="label" translatable="yes">Automatically start private messaging</property>
|
||||
<property name="label" translatable="yes" comments="checkbox">Automatically start private messaging</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">False</property>
|
||||
@@ -146,7 +160,7 @@
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkCheckButton" id="require_check">
|
||||
<property name="label" translatable="yes">Require private messaging</property>
|
||||
<property name="label" translatable="yes" comments="checkbox">Require private messaging</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">False</property>
|
||||
@@ -164,7 +178,7 @@
|
||||
<child type="label">
|
||||
<object class="GtkLabel" id="label3">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes"><b>Default OTR Settings</b></property>
|
||||
<property name="label" translatable="yes" comments="title above options"><b>Default OTR Settings</b></property>
|
||||
<property name="use_markup">True</property>
|
||||
</object>
|
||||
</child>
|
||||
@@ -185,7 +199,7 @@
|
||||
<child>
|
||||
<object class="GtkLabel" id="label4">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes"><b>Off-the-Record settings for:</b></property>
|
||||
<property name="label" translatable="yes" comments="label for account selector"><b>Off-the-Record settings for:</b></property>
|
||||
<property name="use_markup">True</property>
|
||||
</object>
|
||||
<packing>
|
||||
@@ -222,7 +236,7 @@
|
||||
<child type="tab">
|
||||
<object class="GtkLabel" id="label1">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">OTR Settings</property>
|
||||
<property name="label" translatable="yes" comments="tab label">OTR Settings</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="tab_fill">False</property>
|
||||
@@ -246,10 +260,11 @@
|
||||
<property name="model">fingerprint_store</property>
|
||||
<property name="search_column">0</property>
|
||||
<property name="tooltip_column">5</property>
|
||||
<signal name="button-press-event" handler="fpr_button_pressed_cb" swapped="no"/>
|
||||
<child>
|
||||
<object class="GtkTreeViewColumn" id="name_column">
|
||||
<property name="resizable">True</property>
|
||||
<property name="title" translatable="yes">Name</property>
|
||||
<property name="title">Name</property>
|
||||
<child>
|
||||
<object class="GtkCellRendererText" id="cellrenderertext2"/>
|
||||
<attributes>
|
||||
@@ -261,7 +276,7 @@
|
||||
<child>
|
||||
<object class="GtkTreeViewColumn" id="status_column">
|
||||
<property name="resizable">True</property>
|
||||
<property name="title" translatable="yes">Status</property>
|
||||
<property name="title">Status</property>
|
||||
<child>
|
||||
<object class="GtkCellRendererText" id="cellrenderertext3"/>
|
||||
<attributes>
|
||||
@@ -273,7 +288,7 @@
|
||||
<child>
|
||||
<object class="GtkTreeViewColumn" id="validated_column">
|
||||
<property name="resizable">True</property>
|
||||
<property name="title" translatable="yes">Validated</property>
|
||||
<property name="title">Validated</property>
|
||||
<child>
|
||||
<object class="GtkCellRendererToggle" id="cellrenderertoggle1"/>
|
||||
<attributes>
|
||||
@@ -285,7 +300,7 @@
|
||||
<child>
|
||||
<object class="GtkTreeViewColumn" id="fingerprint_column">
|
||||
<property name="resizable">True</property>
|
||||
<property name="title" translatable="yes">Fingerprint</property>
|
||||
<property name="title">Fingerprint</property>
|
||||
<child>
|
||||
<object class="GtkCellRendererText" id="cellrenderertext4"/>
|
||||
<attributes>
|
||||
@@ -297,7 +312,7 @@
|
||||
<child>
|
||||
<object class="GtkTreeViewColumn" id="account_column">
|
||||
<property name="resizable">True</property>
|
||||
<property name="title" translatable="yes">Account</property>
|
||||
<property name="title">Account</property>
|
||||
<child>
|
||||
<object class="GtkCellRendererText" id="cellrenderertext5"/>
|
||||
<attributes>
|
||||
@@ -320,7 +335,7 @@
|
||||
<property name="homogeneous">True</property>
|
||||
<child>
|
||||
<object class="GtkButton" id="verify_button">
|
||||
<property name="label" translatable="yes">Verify Fingerprint</property>
|
||||
<property name="label" translatable="yes" comments="button">Verify Fingerprint</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">True</property>
|
||||
@@ -332,7 +347,7 @@
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkButton" id="forget_button">
|
||||
<property name="label" translatable="yes">Forget Fingerprint</property>
|
||||
<property name="label" translatable="yes" comments="button">Forget Fingerprint</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">True</property>
|
||||
@@ -356,7 +371,7 @@
|
||||
<child type="tab">
|
||||
<object class="GtkLabel" id="label2">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Known Fingerprints</property>
|
||||
<property name="label" translatable="yes" comments="tab label">Known Fingerprints</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="position">1</property>
|
||||
|
||||
Reference in New Issue
Block a user