Commit e5e70ca7 authored by Amin Bandali's avatar Amin Bandali Committed by Sébastien Blin
Browse files

various typo fixes

These were reported by Debian's lintian tool.

Change-Id: I004dd3df2da7a684f9c27d306104661966b19f19
parent bad03417
......@@ -21,7 +21,7 @@ improvement ideas, the bug tracker is the perfect place to submit them.
## Documentation
The documentation should be as up-to-date as possible to help users, devs and
anyone who wants to get informations. This wiki is currently located [here](https://git.jami.net/savoirfairelinux/ring-project/wikis/home).
anyone who wants to get information. This wiki is currently located [here](https://git.jami.net/savoirfairelinux/ring-project/wikis/home).
## Testing
......
......@@ -324,15 +324,15 @@ account_creation_show_error_view(AccountCreationWizard *view, const std::string&
switch (priv->mode) {
case Mode::ADD_LOCAL:
gtk_label_set_text(GTK_LABEL(priv->label_error_view),
_("An error occured during the account creation."));
_("An error occurred during the account creation."));
break;
case Mode::ADD_RENDEZVOUS:
gtk_label_set_text(GTK_LABEL(priv->label_error_view),
_("An error occured during the rendez-vous creation."));
_("An error occurred during the rendez-vous creation."));
break;
case Mode::ADD_SIP:
gtk_label_set_text(GTK_LABEL(priv->label_error_view),
_("An error occured during the SIP account creation."));
_("An error occurred during the SIP account creation."));
break;
case Mode::IMPORT_FROM_DEVICE:
gtk_label_set_text(GTK_LABEL(priv->label_error_view),
......
......@@ -336,7 +336,7 @@ update_conversation(ConversationsView *self, const std::string& uid) {
0 /* col# */, &uidModel /* data */,
-1);
if(std::string(uid) == uidModel) {
// Get informations
// Get information
auto conversation = (*priv->accountInfo_)->conversationModel->getConversationForUID(uidModel);
if (conversation.participants.empty()) {
g_free(uidModel);
......
......@@ -832,7 +832,7 @@ invite_to_conversation(GtkListBox*, GtkListBoxRow* row, CurrentCallView* self)
const auto& call = (*priv->cpp->accountInfo)->callModel->getCall(callToRender);
(*priv->cpp->accountInfo)->callModel->callAndAddParticipant(custom_data, callToRender, call.isAudioOnly);
} catch (...) {
g_warning("Can't add participant to inexistant call");
g_warning("Can't add participant to inexistent call");
}
} else if (GPOINTER_TO_INT(custom_type) == (int)RowType::CALL
|| GPOINTER_TO_INT(custom_type) == (int)RowType::CONFERENCE) {
......@@ -1443,7 +1443,7 @@ CppImpl::setCallInfo()
&& call.type != lrc::api::call::Type::CONFERENCE
&& call.participantsInfos.empty());
} catch (...) {
g_warning("Can't change preview visibility for non existant call");
g_warning("Can't change preview visibility for non existent call");
}
const lrc::api::video::Renderer* vRenderer =
......@@ -1524,7 +1524,7 @@ CppImpl::setCallInfo()
&& call.type != lrc::api::call::Type::CONFERENCE
&& call.participantsInfos.empty());
} catch (...) {
g_warning("Can't set preview visible for inexistant call");
g_warning("Can't set preview visible for inexistent call");
}
updateNameAndPhoto();
updateState();
......@@ -1779,7 +1779,7 @@ CppImpl::update_participants_hovers(const QString& callId)
&& call.type != lrc::api::call::Type::CONFERENCE
&& call.participantsInfos.empty());
} catch (...) {
g_warning("Can't set preview visible for inexistant call");
g_warning("Can't set preview visible for inexistent call");
}
}
}
......
......@@ -511,7 +511,7 @@ get_devicename_from_row(GtkWidget* row)
static void
replace_name_from_row(GtkWidget* row, const QString& name, const QString& id)
{
// Remove previous informations
// Remove previous information
auto* list_iterator = get_row_iterator(row);
auto* box_info = g_list_next(g_list_first(list_iterator)); // box infos
auto* action_button = g_list_last(list_iterator);
......@@ -645,7 +645,7 @@ add_device(NewAccountSettingsView *view, const lrc::api::Device& device)
GtkStyleContext* context_box;
context_box = gtk_widget_get_style_context(GTK_WIDGET(device_box));
gtk_style_context_add_class(context_box, "boxitem");
// Fill with devices informations
// Fill with devices information
auto* device_info_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
auto* label_name = gtk_label_new(qUtf8Printable(device.name));
gtk_box_pack_start(GTK_BOX(device_info_box), label_name, false, false, 0);
......@@ -741,7 +741,7 @@ add_banned(NewAccountSettingsView *view, const std::string& contactUri)
context_box = gtk_widget_get_style_context(GTK_WIDGET(banned_box));
gtk_style_context_add_class(context_box, "boxitem");
// Fill with devices informations
// Fill with devices information
auto* contact_info_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
if (!contact.registeredName.isEmpty()) {
auto* label_name = gtk_label_new(qUtf8Printable(contact.registeredName));
......@@ -840,8 +840,8 @@ show_change_password_dialog(GtkListBox*, GtkListBoxRow *row, NewAccountSettingsV
priv->vbox_change_password = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_set_spacing(GTK_BOX(priv->vbox_change_password), 10);
auto* label_informations = gtk_label_new(_("Note: this will change the password only on this device."));
gtk_container_add(GTK_CONTAINER(priv->vbox_change_password), label_informations);
auto* label_information = gtk_label_new(_("Note: this will change the password only on this device."));
gtk_container_add(GTK_CONTAINER(priv->vbox_change_password), label_information);
priv->entry_current_password = gtk_entry_new();
gtk_entry_set_placeholder_text(GTK_ENTRY(priv->entry_current_password), _("Current password"));
gtk_entry_set_input_purpose(GTK_ENTRY(priv->entry_current_password), GTK_INPUT_PURPOSE_PASSWORD);
......@@ -2013,7 +2013,7 @@ new_account_settings_view_update(NewAccountSettingsView *view, gboolean reset_vi
priv->currentProp_ = new lrc::api::account::ConfProperties_t();
*priv->currentProp_ = (*priv->accountInfo_)->accountModel->getAccountConfig(accountId);
} catch (std::out_of_range& e) {
g_debug("Can't get acount config for current account");
g_debug("Can't get account config for current account");
return;
}
......
......@@ -239,7 +239,7 @@ add_plugin(PluginSettingsView *view, const QString plugin)
GtkStyleContext* context_box;
context_box = gtk_widget_get_style_context(GTK_WIDGET(plugin_box));
gtk_style_context_add_class(context_box, "boxitem");
// Fill with plugin informations
// Fill with plugin information
auto* plugin_info_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_set_can_focus(plugin_info_box, false);
auto* label_name = gtk_label_new(qUtf8Printable(details.name));
......
......@@ -135,7 +135,7 @@
<property name="use_markup">True</property>
</object>
</child>
<!-- Explaination row -->
<!-- Explanation row -->
<child>
<object class="GtkLabel" id="label_explaination">
<property name="visible">True</property>
......@@ -147,7 +147,7 @@
<property name="wrap">True</property>
</object>
</child>
<!-- End of Explaination row -->
<!-- End of Explanation row -->
<!-- Password entry -->
<child>
<object class="GtkLabel" id="entry_password_export_label">
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment