From add48f2a2f574ff4150e64ddd6074a8db19cbaa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Fri, 8 May 2020 16:33:52 -0400
Subject: [PATCH] ui: misc fixes on labels
Change-Id: I0b613b169c831a04ac9dbc451fcbe0461cd048dc
---
ui/generalsettingsview.ui | 38 +++++++++++++++++++++++++++++++-----
ui/newaccountsettingsview.ui | 2 +-
2 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/ui/generalsettingsview.ui b/ui/generalsettingsview.ui
index 1151600b..d67476ca 100644
--- a/ui/generalsettingsview.ui
+++ b/ui/generalsettingsview.ui
@@ -859,7 +859,7 @@
<object class="GtkLabel" id="label_accept_untrusted">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Accept from untrusted contacts</property>
+ <property name="label" translatable="yes">Allow incoming files from unknown contacts</property>
</object>
</child>
<child>
@@ -878,12 +878,12 @@
<child>
<!-- Accept limit -->
- <object class="GtkListBoxRow" id="transfer_limit_row">
+ <object class="GtkListBoxRow" id="auto_accept_files_row">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">fill</property>
<child>
- <object class="GtkBox" id="transfer_limit_box">
+ <object class="GtkBox" id="auto_accept_files_box">
<property name="visible">True</property>
<property name="halign">fill</property>
<property name="orientation">horizontal</property>
@@ -893,10 +893,10 @@
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<child>
- <object class="GtkLabel" id="label_transfer_limit">
+ <object class="GtkLabel" id="label_auto_accept_files">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Accept transfer behind (Mb, 0 = unlimited)</property>
+ <property name="label" translatable="yes">Automatically accept incoming files</property>
</object>
</child>
@@ -909,6 +909,34 @@
<property name="pack_type">end</property>
</packing>
</child>
+ </object>
+ </child>
+ </object>
+ </child>
+
+ <child>
+ <!-- Accept limit -->
+ <object class="GtkListBoxRow" id="transfer_limit_row">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">fill</property>
+ <child>
+ <object class="GtkBox" id="transfer_limit_box">
+ <property name="visible">True</property>
+ <property name="halign">fill</property>
+ <property name="orientation">horizontal</property>
+ <property name="margin_left">12</property>
+ <property name="margin_right">12</property>
+ <property name="spacing">12</property>
+ <property name="margin_top">12</property>
+ <property name="margin_bottom">12</property>
+ <child>
+ <object class="GtkLabel" id="label_transfer_limit">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Accept transfer below (in Mb, 0 = unlimited)</property>
+ </object>
+ </child>
<child>
<object class="GtkSpinButton" id="spinbutton_limit_transfer">
diff --git a/ui/newaccountsettingsview.ui b/ui/newaccountsettingsview.ui
index a3db4848..06cd23ce 100644
--- a/ui/newaccountsettingsview.ui
+++ b/ui/newaccountsettingsview.ui
@@ -1143,7 +1143,7 @@
<object class="GtkLabel" id="label_allow">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Allow call from untrusted peers</property>
+ <property name="label" translatable="yes">Allow incoming calls from unknown contacts</property>
</object>
</child>
<child>
--
GitLab