[fractal/strings-again] Improve wording

[Alexandre Franke <afranke src gnome org>]

commit 9056eb42d96602eb98945e802b317e2cc9738b55
Author: Alexandre Franke <afranke gnome org>
Date:   Tue Apr 5 14:47:17 2022 +0200

    Improve wording

 data/resources/ui/components-loading-listbox-row.ui      | 2 +-
 data/resources/ui/content-state-tombstone.ui             | 4 ++--
 data/resources/ui/error-page.ui                          | 6 +++---
 src/session/account_settings/devices_page/device_list.rs | 2 +-
 src/session/account_settings/devices_page/device_row.rs  | 6 +++---
 src/session/content/room_history/state_row/creation.rs   | 2 +-
 src/session/content/room_history/state_row/mod.rs        | 2 +-
 src/session/room_creation/mod.rs                         | 4 ++--
 src/user_facing_error.rs                                 | 2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/data/resources/ui/components-loading-listbox-row.ui 
b/data/resources/ui/components-loading-listbox-row.ui
index bb2d4b3d7..9fe65b670 100644
--- a/data/resources/ui/components-loading-listbox-row.ui
+++ b/data/resources/ui/components-loading-listbox-row.ui
@@ -29,7 +29,7 @@
             </child>
             <child>
               <object class="GtkButton" id="retry_button">
-                <property name="label" translatable="yes">Retry</property>
+                <property name="label" translatable="yes">Try again</property>
                 <property name="halign">center</property>
               </object>
             </child>
diff --git a/data/resources/ui/content-state-tombstone.ui b/data/resources/ui/content-state-tombstone.ui
index 40f6bba5b..736af60ca 100644
--- a/data/resources/ui/content-state-tombstone.ui
+++ b/data/resources/ui/content-state-tombstone.ui
@@ -11,12 +11,12 @@
           <object class="GtkLabel">
             <property name="wrap">True</property>
             <property name="wrap-mode">word-char</property>
-            <property name="label" translatable="yes">This room was upgraded.</property>
+            <property name="label" translatable="yes">There is a newer version of this room.</property>
           </object>
         </child>
         <child>
           <object class="GtkButton" id="new_room_btn">
-            <property name="label" translatable="yes">Go to the Upgraded Room</property>
+            <property name="label" translatable="yes">Go there</property>
           </object>
         </child>
       </object>
diff --git a/data/resources/ui/error-page.ui b/data/resources/ui/error-page.ui
index c68e66d06..91641d6ba 100644
--- a/data/resources/ui/error-page.ui
+++ b/data/resources/ui/error-page.ui
@@ -48,7 +48,7 @@
                                 <property name="wrap">true</property>
                                 <property name="wrap-mode">word-char</property>
                                 <property name="xalign">0.0</property>
-                                <property name="label" translatable="yes">Alternatively, we could delete 
this session for you. This means you will have to login again and you will lose access to your encrypted 
messages, unless you have a session open in another client or you have already backed up your encryption 
keys.</property>
+                                <property name="label" translatable="yes">Alternatively, we could disconnect 
this session for you. This means you will have to login again and you will lose access to your encrypted 
messages, unless you have a session open in another client or you have already backed up your encryption 
keys.</property>
                               </object>
                             </child>
                             <child>
@@ -71,7 +71,7 @@
                                     <property name="wrap">true</property>
                                     <property name="wrap-mode">word-char</property>
                                     <property name="xalign">0.0</property>
-                                    <property name="label" translatable="yes">Clicking this button might 
delete more than one session!</property>
+                                    <property name="label" translatable="yes">Clicking this button might 
disconnect more than one session!</property>
                                   </object>
                                 </child>
                               </object>
@@ -83,7 +83,7 @@
                                   <class name="pill"/>
                                 </style>
                                 <property name="halign">center</property>
-                                <property name="label" translatable="yes">Delete the corrupted 
session</property>
+                                <property name="label" translatable="yes">Disconnect the corrupted 
session</property>
                                 <property 
name="action-name">error-page.remove-secret-error-session</property>
                               </object>
                             </child>
diff --git a/src/session/account_settings/devices_page/device_list.rs 
b/src/session/account_settings/devices_page/device_list.rs
index f191ce2aa..c16ec0129 100644
--- a/src/session/account_settings/devices_page/device_list.rs
+++ b/src/session/account_settings/devices_page/device_list.rs
@@ -189,7 +189,7 @@ impl DeviceList {
             Err(error) => {
                 error!("Couldn’t load device list: {}", error);
                 self.update_list(vec![DeviceItem::for_error(gettext(
-                    "Failed to load connected devices.",
+                    "Failed to load the list of connected devices.",
                 ))]);
             }
         }
diff --git a/src/session/account_settings/devices_page/device_row.rs 
b/src/session/account_settings/devices_page/device_row.rs
index 6858087e9..76ef9cda8 100644
--- a/src/session/account_settings/devices_page/device_row.rs
+++ b/src/session/account_settings/devices_page/device_row.rs
@@ -107,7 +107,7 @@ mod imp {
             match &obj.is_current_device() {
                 false => self
                     .delete_logout_button
-                    .set_label(&gettext("Delete Session")),
+                    .set_label(&gettext("Disconnect Session")),
                 true => {
                     self.delete_logout_button.set_label(&gettext("Log Out"));
                     self.delete_logout_button
@@ -209,10 +209,10 @@ impl DeviceRow {
                     Ok(_) => obj.hide(),
                     Err(AuthError::UserCancelled) => {},
                     Err(err) => {
-                        error!("Failed to delete device {}: {err:?}", device.device_id());
+                        error!("Failed to disconnect device {}: {err:?}", device.device_id());
                         if let Some(adw_window) = window.and_then(|w| 
w.downcast::<adw::PreferencesWindow>().ok()) {
                             let device_name = device.display_name();
-                            let error_message = gettext!("Failed to delete device “{}”", device_name);
+                            let error_message = gettext!("Failed to disconnect device “{}”", device_name);
                             adw_window.add_toast(&Toast::new(&error_message).into());
                         }
                     },
diff --git a/src/session/content/room_history/state_row/creation.rs 
b/src/session/content/room_history/state_row/creation.rs
index 1a68ea032..afcf56dc2 100644
--- a/src/session/content/room_history/state_row/creation.rs
+++ b/src/session/content/room_history/state_row/creation.rs
@@ -65,7 +65,7 @@ impl StateCreation {
             priv_.previous_room_btn.set_action_name(None);
             priv_
                 .description
-                .set_label(&gettext("The beginning of this room."));
+                .set_label(&gettext("This is the beginning of this room."));
         }
     }
 }
diff --git a/src/session/content/room_history/state_row/mod.rs 
b/src/session/content/room_history/state_row/mod.rs
index 8e411ed47..37a9ef676 100644
--- a/src/session/content/room_history/state_row/mod.rs
+++ b/src/session/content/room_history/state_row/mod.rs
@@ -66,7 +66,7 @@ impl StateRow {
                 WidgetType::Creation(StateCreation::new(&event))
             }
             AnyStateEventContent::RoomEncryption(_event) => {
-                WidgetType::Text(gettext("This room is now encrypted."))
+                WidgetType::Text(gettext("This room is encrypted from this point on."))
             }
             AnyStateEventContent::RoomMember(event) => {
                 let display_name = event
diff --git a/src/session/room_creation/mod.rs b/src/session/room_creation/mod.rs
index 36ce73167..3778cd314 100644
--- a/src/session/room_creation/mod.rs
+++ b/src/session/room_creation/mod.rs
@@ -326,12 +326,12 @@ impl RoomCreation {
         let (is_address_valid, has_error) = if room_address.find(':').is_some() {
             priv_
                 .room_address_error
-                .set_text(&gettext("Can’t contain `:`"));
+                .set_text(&gettext("Can’t contain “:”"));
             (false, true)
         } else if room_address.find('#').is_some() {
             priv_
                 .room_address_error
-                .set_text(&gettext("Can’t contain `#`"));
+                .set_text(&gettext("Can’t contain “#”"));
             (false, true)
         } else if room_address.len() > MAX_BYTES {
             priv_
diff --git a/src/user_facing_error.rs b/src/user_facing_error.rs
index 9076fc229..defcc9899 100644
--- a/src/user_facing_error.rs
+++ b/src/user_facing_error.rs
@@ -26,7 +26,7 @@ impl UserFacingError for HttpError {
             HttpError::ClientApi(FromHttpResponseError::Server(ServerError::Known(error))) => {
                 match error.kind {
                     Forbidden => gettext("The provided username or password is invalid."),
-                    UserDeactivated => gettext("The user is deactivated."),
+                    UserDeactivated => gettext("The account is deactivated."),
                     LimitExceeded { retry_after_ms } => {
                         if let Some(ms) = retry_after_ms {
                             gettext!(