From a3e588c78ea932e9090eaab74080b81310df53a7 Mon Sep 17 00:00:00 2001 From: Alexandre Franke Date: Sun, 3 Apr 2022 23:45:05 +0200 Subject: [PATCH] Use proper quotes in strings --- .../ui/account-settings-change-password-subpage.ui | 2 +- data/resources/ui/error-page.ui | 2 +- data/resources/ui/identity-verification-widget.ui | 4 ++-- data/resources/ui/login-advanced-dialog.ui | 2 +- data/resources/ui/session-verification.ui | 2 +- src/session/account_settings/devices_page/device_list.rs | 2 +- src/session/account_settings/devices_page/device_row.rs | 2 +- .../content/room_details/invite_subpage/invitee_list.rs | 2 +- src/session/content/room_history/message_row/mod.rs | 4 ++-- src/session/room/event.rs | 2 +- src/session/room/member.rs | 2 +- src/session/room/mod.rs | 6 +++--- src/session/room_creation/mod.rs | 4 ++-- src/session/verification/mod.rs | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/data/resources/ui/account-settings-change-password-subpage.ui b/data/resources/ui/account-settings-change-password-subpage.ui index 7065b8f1..38d25f27 100644 --- a/data/resources/ui/account-settings-change-password-subpage.ui +++ b/data/resources/ui/account-settings-change-password-subpage.ui @@ -61,7 +61,7 @@ - Fractal's support for encryption is unstable so you might lose access to your encrypted message history. It is recommended to backup your encryption keys from another Matrix client before proceeding. + Fractal’s support for encryption is unstable so you might lose access to your encrypted message history. It is recommended to backup your encryption keys from another Matrix client before proceeding. True word-char 0.0 diff --git a/data/resources/ui/error-page.ui b/data/resources/ui/error-page.ui index 6f1bb35b..c68e66d0 100644 --- a/data/resources/ui/error-page.ui +++ b/data/resources/ui/error-page.ui @@ -184,7 +184,7 @@ true word-char 0.0 - Check the application logs and your distribution's documentation for more details. + Check the application logs and your distribution’s documentation for more details. diff --git a/data/resources/ui/identity-verification-widget.ui b/data/resources/ui/identity-verification-widget.ui index ca7368c5..deeb223c 100644 --- a/data/resources/ui/identity-verification-widget.ui +++ b/data/resources/ui/identity-verification-widget.ui @@ -112,7 +112,7 @@ - Can't scan QR code? + Can’t scan QR code? True word-char center @@ -213,7 +213,7 @@ - Can't scan QR code? + Can’t scan QR code? True word-char center diff --git a/data/resources/ui/login-advanced-dialog.ui b/data/resources/ui/login-advanced-dialog.ui index 762d4407..d38f1fde 100644 --- a/data/resources/ui/login-advanced-dialog.ui +++ b/data/resources/ui/login-advanced-dialog.ui @@ -11,7 +11,7 @@ - Auto-discovery, also known as "well-known lookup", allows to discover the URL of a Matrix homeserver from a domain name. This should only be disabled if your homeserver doesn’t support auto-discovery or if you want to provide the URL yourself. + Auto-discovery, also known as “well-known lookup”, allows to discover the URL of a Matrix homeserver from a domain name. This should only be disabled if your homeserver doesn’t support auto-discovery or if you want to provide the URL yourself. _Auto-discovery diff --git a/data/resources/ui/session-verification.ui b/data/resources/ui/session-verification.ui index 47e0cddb..d66f18ce 100644 --- a/data/resources/ui/session-verification.ui +++ b/data/resources/ui/session-verification.ui @@ -205,7 +205,7 @@ - If you don't have any of these you can reset your identity, but be aware this makes your old messages inaccessible forever. + If you don’t have any of these you can reset your identity, but be aware this makes your old messages inaccessible forever. True word-char center diff --git a/src/session/account_settings/devices_page/device_list.rs b/src/session/account_settings/devices_page/device_list.rs index deab564f..f191ce2a 100644 --- a/src/session/account_settings/devices_page/device_list.rs +++ b/src/session/account_settings/devices_page/device_list.rs @@ -187,7 +187,7 @@ impl DeviceList { })); } Err(error) => { - error!("Couldn't load device list: {}", error); + error!("Couldn’t load device list: {}", error); self.update_list(vec![DeviceItem::for_error(gettext( "Failed to load 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 6d60400d..6858087e 100644 --- a/src/session/account_settings/devices_page/device_row.rs +++ b/src/session/account_settings/devices_page/device_row.rs @@ -226,7 +226,7 @@ impl DeviceRow { self.imp().delete_logout_button.set_loading(true); let window: Option = self.root().and_then(|root| root.downcast().ok()); - let dialog = gtk::MessageDialog::new(window.as_ref(), gtk::DialogFlags::MODAL, gtk::MessageType::Info, gtk::ButtonsType::OkCancel, &gettext("Fractal's support for encryption is unstable so you might lose access to your encrypted message history. It is recommended to backup your encryption keys from another Matrix client before proceeding.")); + let dialog = gtk::MessageDialog::new(window.as_ref(), gtk::DialogFlags::MODAL, gtk::MessageType::Info, gtk::ButtonsType::OkCancel, &gettext("Fractal’s support for encryption is unstable so you might lose access to your encrypted message history. It is recommended to backup your encryption keys from another Matrix client before proceeding.")); dialog.show(); dialog.connect_response( clone!(@weak self as obj, @weak dialog => move |_, response| { diff --git a/src/session/content/room_details/invite_subpage/invitee_list.rs b/src/session/content/room_details/invite_subpage/invitee_list.rs index 079eacee..59bedac0 100644 --- a/src/session/content/room_details/invite_subpage/invitee_list.rs +++ b/src/session/content/room_details/invite_subpage/invitee_list.rs @@ -282,7 +282,7 @@ impl InviteeList { self.set_state(InviteeListState::Matching); } Err(error) => { - error!("Couldn't load matching users: {}", error); + error!("Couldn’t load matching users: {}", error); self.set_state(InviteeListState::Error); self.clear_list(); } diff --git a/src/session/content/room_history/message_row/mod.rs b/src/session/content/room_history/message_row/mod.rs index dfd32372..e5ae47c7 100644 --- a/src/session/content/room_history/message_row/mod.rs +++ b/src/session/content/room_history/message_row/mod.rs @@ -394,7 +394,7 @@ fn build_content(parent: &adw::Bin, event: &Event, compact: bool) { child.sticker(content, &event.room().session(), compact); } Some(AnyMessageLikeEventContent::RoomEncrypted(content)) => { - warn!("Couldn't decrypt event {:?}", content); + warn!("Couldn’t decrypt event {:?}", content); let child = if let Some(Ok(child)) = parent.child().map(|w| w.downcast::()) { child @@ -403,7 +403,7 @@ fn build_content(parent: &adw::Bin, event: &Event, compact: bool) { parent.set_child(Some(&child)); child }; - child.text(gettext("Fractal couldn't decrypt this message.")); + child.text(gettext("Fractal couldn’t decrypt this message.")); } Some(AnyMessageLikeEventContent::RoomRedaction(_)) => { let child = if let Some(Ok(child)) = parent.child().map(|w| w.downcast::()) diff --git a/src/session/room/event.rs b/src/session/room/event.rs index f75d3bfe..27903e00 100644 --- a/src/session/room/event.rs +++ b/src/session/room/event.rs @@ -92,7 +92,7 @@ mod imp { glib::ParamSpecBoolean::new( "can-hide-header", "Can hide header", - "Whether this event is allowed to hide it's header or not.", + "Whether this event is allowed to hide its header or not.", false, glib::ParamFlags::READABLE, ), diff --git a/src/session/room/member.rs b/src/session/room/member.rs index 6469b821..5c47058f 100644 --- a/src/session/room/member.rs +++ b/src/session/room/member.rs @@ -94,7 +94,7 @@ mod imp { glib::ParamSpecEnum::new( "membership", "Membership", - "This member's membership state.", + "This member’s membership state.", Membership::static_type(), Membership::default() as i32, glib::ParamFlags::READABLE | glib::ParamFlags::EXPLICIT_NOTIFY, diff --git a/src/session/room/mod.rs b/src/session/room/mod.rs index d17f2f36..63c1a997 100644 --- a/src/session/room/mod.rs +++ b/src/session/room/mod.rs @@ -197,7 +197,7 @@ mod imp { glib::ParamSpecObject::new( "latest-read", "Latest Read", - "The latest read event in the room's timeline", + "The latest read event in the room’s timeline", Event::static_type(), glib::ParamFlags::READABLE, ), @@ -635,7 +635,7 @@ impl Room { }, Err(error) => { error!( - "Couldn’t get the user's read receipt for room {}: {}", + "Couldn’t get the user’s read receipt for room {}: {}", obj.room_id(), error ); @@ -700,7 +700,7 @@ impl Room { } Err(error) => { error!( - "Couldn’t get the event of the user's read receipt for room {}: {}", + "Couldn’t get the event of the user’s read receipt for room {}: {}", self.room_id(), error ); diff --git a/src/session/room_creation/mod.rs b/src/session/room_creation/mod.rs index c1c58712..36ce7316 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/session/verification/mod.rs b/src/session/verification/mod.rs index bb67f3e7..39761cc4 100644 --- a/src/session/verification/mod.rs +++ b/src/session/verification/mod.rs @@ -10,7 +10,7 @@ pub use self::{ }, verification_list::VerificationList, }; -/// The time a verification is valid after it's creation. +/// The time a verification is valid after its creation. #[allow(dead_code)] pub const VERIFICATION_CREATION_TIMEOUT: Duration = Duration::from_secs(60 * 10); /// The time a verification is valid after it was received by the client.