[fractal/fractal-next] app: Fix spelling mistakes
- From: Julian Sparber <jsparber src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [fractal/fractal-next] app: Fix spelling mistakes
- Date: Wed, 19 Jan 2022 23:12:17 +0000 (UTC)
commit c2848743c7411cc37ace95d0978869212833b24e
Author: Kévin Commaille <zecakeh tedomum fr>
Date: Wed Jan 19 21:52:19 2022 +0100
app: Fix spelling mistakes
data/resources/ui/content-invite-subpage.ui | 5 ++---
src/components/loading_listbox_row.rs | 2 +-
src/main.rs | 2 +-
src/session/account_settings/devices_page/mod.rs | 6 +++---
src/session/avatar.rs | 2 +-
src/session/content/room_details/member_page/member_menu.rs | 2 +-
src/session/content/room_history/mod.rs | 2 +-
src/session/content/room_history/verification_info_bar.rs | 2 +-
.../content/verification/identity_verification_widget.rs | 2 +-
src/session/content/verification/session_verification.rs | 6 +++---
src/session/room/event.rs | 2 +-
src/session/room/mod.rs | 2 +-
src/session/room/timeline.rs | 4 ++--
src/session/room_creation/mod.rs | 2 +-
src/session/verification/identity_verification.rs | 10 +++++-----
src/session/verification/verification_list.rs | 2 +-
src/utils.rs | 2 +-
17 files changed, 27 insertions(+), 28 deletions(-)
---
diff --git a/data/resources/ui/content-invite-subpage.ui b/data/resources/ui/content-invite-subpage.ui
index 1bc2c339..f859af82 100644
--- a/data/resources/ui/content-invite-subpage.ui
+++ b/data/resources/ui/content-invite-subpage.ui
@@ -37,7 +37,7 @@
<property name="hexpand">true</property>
<child>
<object class="CustomEntry">
- <!-- FIXME: inserting a Pill makes the Entry grow, therefore we force more height so that
it doens't grow visually
+ <!-- FIXME: inserting a Pill makes the Entry grow, therefore we force more height so that
it doesn't grow visually
Would be nice to fix it properly. Including the vertical alignment of Pills in the
textview
-->
<property name="height-request">74</property>
@@ -129,7 +129,7 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="icon-name">dialog-error-symbolic</property>
- <property name="description" translatable="yes">An error occured while searching for
matches</property>
+ <property name="description" translatable="yes">An error occurred while searching for
matches</property>
</object>
</child>
<child>
@@ -149,4 +149,3 @@
</property>
</template>
</interface>
-
diff --git a/src/components/loading_listbox_row.rs b/src/components/loading_listbox_row.rs
index d0e92830..281dfdc1 100644
--- a/src/components/loading_listbox_row.rs
+++ b/src/components/loading_listbox_row.rs
@@ -109,7 +109,7 @@ mod imp {
}
glib::wrapper! {
- /// This is a `ListBoxRow` continaing a loading spinner.
+ /// This is a `ListBoxRow` containing a loading spinner.
///
/// It's also possible to set an error once the loading fails including a retry button.
pub struct LoadingListBoxRow(ObjectSubclass<imp::LoadingListBoxRow>)
diff --git a/src/main.rs b/src/main.rs
index 21775c14..163e9365 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -47,7 +47,7 @@ fn main() {
gtk::glib::set_application_name("Fractal");
gtk::init().expect("Unable to start GTK4");
- gst::init().expect("Failed to initalize gst");
+ gst::init().expect("Failed to initialize gst");
let res = gio::Resource::load(RESOURCES_FILE).expect("Could not load gresource file");
gio::resources_register(&res);
diff --git a/src/session/account_settings/devices_page/mod.rs
b/src/session/account_settings/devices_page/mod.rs
index 393b18b0..905ecefe 100644
--- a/src/session/account_settings/devices_page/mod.rs
+++ b/src/session/account_settings/devices_page/mod.rs
@@ -138,11 +138,11 @@ impl DevicesPage {
device_list.connect_items_changed(
clone!(@weak self as obj => move |device_list, _, _, _| {
- obj.set_other_sessions_visiblity(device_list.n_items() > 0)
+ obj.set_other_sessions_visibility(device_list.n_items() > 0)
}),
);
- self.set_other_sessions_visiblity(device_list.n_items() > 0);
+ self.set_other_sessions_visibility(device_list.n_items() > 0);
device_list.connect_notify_local(
Some("current-device"),
@@ -164,7 +164,7 @@ impl DevicesPage {
self.notify("user");
}
- fn set_other_sessions_visiblity(&self, visible: bool) {
+ fn set_other_sessions_visibility(&self, visible: bool) {
let priv_ = imp::DevicesPage::from_instance(self);
priv_.other_sessions_group.set_visible(visible);
}
diff --git a/src/session/avatar.rs b/src/session/avatar.rs
index cf9f2c97..59acb9d6 100644
--- a/src/session/avatar.rs
+++ b/src/session/avatar.rs
@@ -305,7 +305,7 @@ where
Ok(response.content_uri)
}
-/// Error occuring when updating an avatar.
+/// Error occurring when updating an avatar.
#[derive(Debug)]
pub enum AvatarError {
Filesystem(std::io::Error),
diff --git a/src/session/content/room_details/member_page/member_menu.rs
b/src/session/content/room_details/member_page/member_menu.rs
index c095409b..ce02764f 100644
--- a/src/session/content/room_details/member_page/member_menu.rs
+++ b/src/session/content/room_details/member_page/member_menu.rs
@@ -186,7 +186,7 @@ impl MemberMenu {
}
button
.downcast::<gtk::ToggleButton>()
- .expect("The parent of a MemberMenu needs to ba a gtk::ToggleButton")
+ .expect("The parent of a MemberMenu needs to be a gtk::ToggleButton")
.set_active(false);
}
}
diff --git a/src/session/content/room_history/mod.rs b/src/session/content/room_history/mod.rs
index 2cad72ad..3258e1e0 100644
--- a/src/session/content/room_history/mod.rs
+++ b/src/session/content/room_history/mod.rs
@@ -132,7 +132,7 @@ mod imp {
glib::ParamSpecBoolean::new(
"empty",
"Empty",
- "Wheter there is currently a room shown",
+ "Whether there is currently a room shown",
false,
glib::ParamFlags::READABLE,
),
diff --git a/src/session/content/room_history/verification_info_bar.rs
b/src/session/content/room_history/verification_info_bar.rs
index 489bf0e9..454fb2a3 100644
--- a/src/session/content/room_history/verification_info_bar.rs
+++ b/src/session/content/room_history/verification_info_bar.rs
@@ -167,7 +167,7 @@ impl VerificationInfoBar {
priv_.cancel_btn.set_label(&gettext("Decline"));
true
} else {
- priv_.label.set_label(&gettext("Verification in progess"));
+ priv_.label.set_label(&gettext("Verification in progress"));
priv_.accept_btn.set_label(&gettext("Continue"));
priv_.cancel_btn.set_label(&gettext("Cancel"));
true
diff --git a/src/session/content/verification/identity_verification_widget.rs
b/src/session/content/verification/identity_verification_widget.rs
index f06c3267..dafe25ac 100644
--- a/src/session/content/verification/identity_verification_widget.rs
+++ b/src/session/content/verification/identity_verification_widget.rs
@@ -589,7 +589,7 @@ impl IdentityVerificationWidget {
name
));
priv_.label12.set_markup(&gettext("Verification Complete"));
- priv_.label13.set_markup(&gettext!("<b>{}</b>is now verified and you can now be sure that
your comunication will be private.", name));
+ priv_.label13.set_markup(&gettext!("<b>{}</b> is verified and you can now be sure that your
communication will be private.", name));
priv_.label14.set_markup(&gettext!("Waiting for {}", name));
priv_.label15.set_markup(&gettext!(
"Ask <b>{}</b> to accept the verification request.",
diff --git a/src/session/content/verification/session_verification.rs
b/src/session/content/verification/session_verification.rs
index c2ad31c8..37548e37 100644
--- a/src/session/content/verification/session_verification.rs
+++ b/src/session/content/verification/session_verification.rs
@@ -310,11 +310,11 @@ impl SessionVerification {
let error_message = match result {
Some(Ok(_)) => None,
Some(Err(error)) => {
- error!("Failed to bootstap cross singing: {}", error);
- Some(gettext("An error occured during the creation of the encryption keys."))
+ error!("Failed to bootstrap cross-signing: {}", error);
+ Some(gettext("An error occurred during the creation of the encryption keys."))
},
None => {
- error!("Failed to bootstap cross singing: User cancelled the authentication");
+ error!("Failed to bootstrap cross-signing: User cancelled the authentication");
Some(gettext("You cancelled the authentication needed to create the encryption keys."))
},
};
diff --git a/src/session/room/event.rs b/src/session/room/event.rs
index d523267b..1144acbd 100644
--- a/src/session/room/event.rs
+++ b/src/session/room/event.rs
@@ -654,7 +654,7 @@ impl Event {
/// - Image message (`MessageType::Image`).
/// - Video message (`MessageType::Video`).
///
- /// Returns `Ok((uid, filename, binary_content))` on success, `Err` if an error occured while
+ /// Returns `Ok((uid, filename, binary_content))` on success, `Err` if an error occurred while
/// fetching the content. Panics on an incompatible event. `uid` is a unique identifier for this
/// media.
pub async fn get_media_content(&self) -> Result<(String, String, Vec<u8>), matrix_sdk::Error> {
diff --git a/src/session/room/mod.rs b/src/session/room/mod.rs
index 41b79100..405b8bbc 100644
--- a/src/session/room/mod.rs
+++ b/src/session/room/mod.rs
@@ -1045,7 +1045,7 @@ impl Room {
glib::PRIORITY_DEFAULT_IDLE,
clone!(@weak self as this => async move {
match handle.await.unwrap() {
- Ok(_avatar_uri) => info!("Sucessfully updated room avatar"),
+ Ok(_avatar_uri) => info!("Successfully updated room avatar"),
Err(error) => error!("Couldn’t update room avatar: {}", error),
};
})
diff --git a/src/session/room/timeline.rs b/src/session/room/timeline.rs
index a7b76320..db776d78 100644
--- a/src/session/room/timeline.rs
+++ b/src/session/room/timeline.rs
@@ -42,7 +42,7 @@ mod imp {
pub loading: Cell<bool>,
pub complete: Cell<bool>,
pub oldest_event: RefCell<Option<Box<EventId>>>,
- /// The most recent verification reuqest event
+ /// The most recent verification request event
pub verification: RefCell<Option<IdentityVerification>>,
}
@@ -609,7 +609,7 @@ impl Timeline {
self.notify("complete");
}
- // Wether the timeline is full loaded
+ // Whether the timeline is fully loaded
pub fn is_complete(&self) -> bool {
let priv_ = imp::Timeline::from_instance(self);
priv_.complete.get()
diff --git a/src/session/room_creation/mod.rs b/src/session/room_creation/mod.rs
index e8174484..894fb587 100644
--- a/src/session/room_creation/mod.rs
+++ b/src/session/room_creation/mod.rs
@@ -257,7 +257,7 @@ impl RoomCreation {
None
}
- /// Display the error that occured during creation
+ /// Display the error that occurred during creation
fn handle_error(&self, error: HttpError) {
let priv_ = imp::RoomCreation::from_instance(self);
diff --git a/src/session/verification/identity_verification.rs
b/src/session/verification/identity_verification.rs
index 1be3668f..50b3953b 100644
--- a/src/session/verification/identity_verification.rs
+++ b/src/session/verification/identity_verification.rs
@@ -283,7 +283,7 @@ mod imp {
self.main_sender.replace(Some(main_sender));
- // We don't need to track ourselfs because we show "Login Request" as name in that case.
+ // We don't need to track ourselves because we show "Login Request" as name in that case.
if obj.user() != obj.session().user().unwrap() {
obj.user().connect_notify_local(
Some("display-name"),
@@ -612,7 +612,7 @@ impl IdentityVerification {
};
let error_message = error_message.unwrap_or_else(|| {
- gettext("An unknown error occured during the verification process.")
+ gettext("An unknown error occurred during the verification process.")
});
let error = Error::new(move |_| {
@@ -697,7 +697,7 @@ impl IdentityVerification {
}
}
- /// Accept an incomming request
+ /// Accept an incoming request
pub fn accept(&self) {
let priv_ = imp::IdentityVerification::from_instance(self);
if self.state() == State::Requested {
@@ -1027,7 +1027,7 @@ impl Context {
} else if let Some(decimal) = request.decimals() {
SasData::Decimal(decimal)
} else {
- error!("Sas verification failed because emoji nor deciaml are supported by the server");
+ error!("SAS verification failed because neither emoji nor decimal are supported by the server");
return Ok(State::Error);
};
@@ -1035,7 +1035,7 @@ impl Context {
self.send_state(State::SasV1);
// Wait for match user action
- debug!("Wait for user action match or missmatch");
+ debug!("Wait for user action match or mismatch");
wait_without_scanning_sas![self];
request.confirm().await?;
diff --git a/src/session/verification/verification_list.rs b/src/session/verification/verification_list.rs
index 6d919cc6..1f4d3644 100644
--- a/src/session/verification/verification_list.rs
+++ b/src/session/verification/verification_list.rs
@@ -211,7 +211,7 @@ impl VerificationList {
if let Some(request) = request {
request.notify_state();
} else {
- warn!("Recevied verification event, but we don't have the inital event.");
+ warn!("Received verification event, but we don't have the initial event.");
}
}
}
diff --git a/src/utils.rs b/src/utils.rs
index 6eec9379..f3e7bc33 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -36,7 +36,7 @@ macro_rules! event_from_sync_event {
/// Spawn a future on the default `MainContext`
///
-/// This was taken from `gtk-macors`
+/// This was taken from `gtk-macros`
/// but allows setting optionally the priority
///
/// FIXME: this should maybe be upstreamed
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
