hueso/gajim-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge in from git

Browse Source
This commit is contained in:
Kjell Braden
2012-10-13 18:50:35 +02:00
parent 4b1a7e4bad
commit 09898b73ab
4 changed files with 118 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
gotr/contact_otr_window.ui
View File

@@ -16,7 +16,7 @@
<object class="GtkLabel" id="our_fp_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Your fingerprint:
<property name="label">Your fingerprint:
&lt;span weight="bold" face="monospace"&gt;01234567 89ABCDEF 01234567 89ABCDEF 01234567&lt;/span&gt;</property>
<property name="use_markup">True</property>
<property name="selectable">True</property>
@@ -29,7 +29,7 @@
<object class="GtkLabel" id="their_fp_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Purported fingerprint for asdfasdf@xyzxyzxyz.de:
<property name="label">Purported fingerprint for asdfasdf@xyzxyzxyz.de:
&lt;span weight="bold" face="monospace"&gt;01234567 89ABCDEF 01234567 89ABCDEF 01234567&lt;/span&gt;</property>
<property name="use_markup">True</property>
<property name="selectable">True</property>
@@ -39,37 +39,16 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox1">
<object class="GtkComboBox" id="verified_combobox">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="model">verifiedmodel</property>
<property name="active">0</property>
<child>
<object class="GtkComboBox" id="verified_combobox">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="model">verifiedmodel</property>
<property name="active">0</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext1"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="xalign">0.20000000298023224</property>
<property name="label" translatable="yes">verified that the purported fingerprint is in fact the correct fingerprint for that contact.</property>
<property name="wrap">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
<object class="GtkCellRendererText" id="cellrenderertext1"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
<packing>
@@ -81,7 +60,7 @@
<child type="tab">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="label" translatable="yes">Authentication</property>
<property name="label" translatable="yes" comments="tab label">Authentication</property>
</object>
<packing>
<property name="position">1</property>
@@ -102,7 +81,7 @@
<property name="homogeneous">True</property>
<child>
<object class="GtkCheckButton" id="otr_policy_allow_v2_checkbutton">
<property name="label" translatable="yes">OTR version 2 allowed</property>
<property name="label" translatable="yes" comments="checkbox">OTR version 2 allowed</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -115,7 +94,7 @@
</child>
<child>
<object class="GtkCheckButton" id="otr_policy_require_checkbutton">
<property name="label" translatable="yes">Encryption required</property>
<property name="label" translatable="yes" comments="checkbox">Encryption required</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -127,7 +106,7 @@
</child>
<child>
<object class="GtkCheckButton" id="otr_policy_send_tag_checkbutton">
<property name="label" translatable="yes">Show others we understand OTR</property>
<property name="label" translatable="yes" comments="checkbox">Show others we understand OTR</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -140,7 +119,7 @@
</child>
<child>
<object class="GtkCheckButton" id="otr_policy_start_on_tag_checkbutton">
<property name="label" translatable="yes">Automatically initiate encryption if partner understands OTR</property>
<property name="label" translatable="yes" comments="checkbox">Automatically initiate encryption if partner understands OTR</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -155,7 +134,7 @@
</child>
<child type="label">
<object class="GtkCheckButton" id="otr_default_checkbutton">
<property name="label" translatable="yes">Use the default settings</property>
<property name="label" translatable="yes" comments="checkbox">Use the default settings</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -171,7 +150,7 @@
<child type="tab">
<object class="GtkLabel" id="label2">
<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="position">1</property>
@@ -186,10 +165,10 @@
</columns>
<data>
<row>
<col id="0" translatable="yes">I have NOT</col>
<col id="0" translatable="yes" comments="unverified option (dropdown label)">I have NOT verified that the purported fingerprint is in fact the correct fingerprint for that contact.</col>
</row>
<row>
<col id="0" translatable="yes">I have</col>
<col id="0" translatable="yes" comments="verified option (dropdown label)">I have verified that the purported fingerprint is in fact the correct fingerprint for that contact.</col>
</row>
</data>
</object>
@@ -208,7 +187,7 @@
<child>
<object class="GtkLabel" id="desclabel1">
<property name="visible">True</property>
<property name="label" translatable="yes">label</property>
<property name="label">label</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
</object>
@@ -221,7 +200,7 @@
<property name="visible">True</property>
<child>
<object class="GtkCheckButton" id="qcheckbutton">
<property name="label" translatable="yes">Use question: </property>
<property name="label" translatable="yes" comments="checkbox for socialist millionaire protocol with question support">Use question: </property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -250,7 +229,7 @@
<child>
<object class="GtkLabel" id="desclabel2">
<property name="visible">True</property>
<property name="label" translatable="yes">label</property>
<property name="label">label</property>
</object>
<packing>
<property name="position">2</property>
@@ -333,14 +312,14 @@
<object class="GtkMenuItem" id="otr_submenu">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="label" translatable="yes">Off-the-Record Encryption</property>
<property name="label" translatable="yes" comments="contact's submenu entry">Off-the-Record Encryption</property>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu" id="otr_submenu_menu">
<child>
<object class="GtkMenuItem" id="otr_settings_menuitem">
<property name="visible">True</property>
<property name="label" translatable="yes">OTR settings / fingerprint</property>
<property name="label" translatable="yes" comments="menu entry for contact's otr settings">OTR settings / fingerprint</property>
<property name="use_underline">True</property>
<signal name="activate" handler="_on_otr_settings_menuitem_activate"/>
</object>
@@ -348,7 +327,7 @@
<child>
<object class="GtkMenuItem" id="smp_otr_menuitem">
<property name="visible">True</property>
<property name="label" translatable="yes">Authenticate contact</property>
<property name="label" translatable="yes" comments="menu entry for SMP authentication">Authenticate contact</property>
<property name="use_underline">True</property>
<signal name="activate" handler="_on_smp_otr_menuitem_activate"/>
</object>
@@ -356,7 +335,7 @@
<child>
<object class="GtkMenuItem" id="start_otr_menuitem">
<property name="visible">True</property>
<property name="label" translatable="yes">Start / Refresh OTR</property>
<property name="label" translatable="yes" comments="menu entry for starting OTR session">Start / Refresh OTR</property>
<property name="use_underline">True</property>
<signal name="activate" handler="_on_start_otr_menuitem_activate"/>
</object>
@@ -365,7 +344,7 @@
<object class="GtkMenuItem" id="end_otr_menuitem">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="label" translatable="yes">End OTR </property>
<property name="label" translatable="yes" comments="menu entry for killing an OTR session">End OTR</property>
<property name="use_underline">True</property>
<signal name="activate" handler="_on_end_otr_menuitem_activate"/>
</object>