aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/empathy.schemas.in8
-rw-r--r--libempathy-gtk/empathy-account-widget-icq.ui2
-rw-r--r--libempathy-gtk/empathy-account-widget-irc.ui2
-rw-r--r--libempathy-gtk/empathy-account-widget-local-xmpp.ui2
-rw-r--r--libempathy-gtk/empathy-account-widget-msn.ui2
-rw-r--r--libempathy-gtk/empathy-account-widget-yahoo.ui8
-rw-r--r--libempathy-gtk/empathy-avatar-chooser.c2
-rw-r--r--libempathy-gtk/empathy-chat.c2
-rw-r--r--libempathy-gtk/empathy-contact-menu.c2
-rw-r--r--libempathy-gtk/empathy-contact-widget.ui6
-rw-r--r--nautilus-sendto-plugin/empathy-nautilus-sendto.c4
-rw-r--r--src/empathy-account-assistant.c8
-rw-r--r--src/empathy-accounts-dialog.c2
-rw-r--r--src/empathy-call-window.c2
-rw-r--r--src/empathy-chat-window.ui2
-rw-r--r--src/empathy-event-manager.c4
-rw-r--r--src/empathy-preferences.ui2
-rw-r--r--src/empathy-tube-dispatch.c2
18 files changed, 31 insertions, 31 deletions
diff --git a/data/empathy.schemas.in b/data/empathy.schemas.in
index 44b278f0a..232f13542 100644
--- a/data/empathy.schemas.in
+++ b/data/empathy.schemas.in
@@ -25,7 +25,7 @@
<short>Contact list sort criterion</short>
<long>
Which criterion to use when sorting the contact list.
- Default is to use sort by the contact's name with the value
+ Default is to sort by the contact's name with the value
"name". A value of "state" will sort the contact list by state.
</long>
</locale>
@@ -369,9 +369,9 @@
<type>string</type>
<default></default>
<locale name="C">
- <short>Path of the adium theme to use</short>
+ <short>Path of the Adium theme to use</short>
<long>
- Path of the adium theme to use if the theme used for chat is adium.
+ Path of the Adium theme to use if the theme used for chat is Adium.
</long>
</locale>
</schema>
@@ -413,7 +413,7 @@
<locale name="C">
<short>Spell checking languages</short>
<long>
- Comma separated list of spell checker languages to use (e.g. en, fr, nl).
+ Comma-separated list of spell checker languages to use (e.g. "en, fr, nl").
</long>
</locale>
</schema>
diff --git a/libempathy-gtk/empathy-account-widget-icq.ui b/libempathy-gtk/empathy-account-widget-icq.ui
index a36698a09..495d6e949 100644
--- a/libempathy-gtk/empathy-account-widget-icq.ui
+++ b/libempathy-gtk/empathy-account-widget-icq.ui
@@ -139,7 +139,7 @@
<object class="GtkLabel" id="label_charset">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Charset:</property>
+ <property name="label" translatable="yes">_Character set:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry_charset</property>
</object>
diff --git a/libempathy-gtk/empathy-account-widget-irc.ui b/libempathy-gtk/empathy-account-widget-irc.ui
index a4f7faa7f..08572bb8a 100644
--- a/libempathy-gtk/empathy-account-widget-irc.ui
+++ b/libempathy-gtk/empathy-account-widget-irc.ui
@@ -47,7 +47,7 @@
<object class="GtkLabel" id="label_charset">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Charset:</property>
+ <property name="label" translatable="yes">Character set:</property>
</object>
<packing>
<property name="top_attach">1</property>
diff --git a/libempathy-gtk/empathy-account-widget-local-xmpp.ui b/libempathy-gtk/empathy-account-widget-local-xmpp.ui
index ca633309d..c123aa6ff 100644
--- a/libempathy-gtk/empathy-account-widget-local-xmpp.ui
+++ b/libempathy-gtk/empathy-account-widget-local-xmpp.ui
@@ -186,7 +186,7 @@
<object class="GtkLabel" id="label_email">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Email:</property>
+ <property name="label" translatable="yes">_E-mail address:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry_email</property>
</object>
diff --git a/libempathy-gtk/empathy-account-widget-msn.ui b/libempathy-gtk/empathy-account-widget-msn.ui
index 27de65a2a..083f4f9bd 100644
--- a/libempathy-gtk/empathy-account-widget-msn.ui
+++ b/libempathy-gtk/empathy-account-widget-msn.ui
@@ -220,7 +220,7 @@
<object class="GtkLabel" id="label_id_simple">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">What is your Windows Live user name?</property>
+ <property name="label" translatable="yes">What is your Windows Live ID?</property>
</object>
<packing>
<property name="position">0</property>
diff --git a/libempathy-gtk/empathy-account-widget-yahoo.ui b/libempathy-gtk/empathy-account-widget-yahoo.ui
index 685861970..0880cc7f4 100644
--- a/libempathy-gtk/empathy-account-widget-yahoo.ui
+++ b/libempathy-gtk/empathy-account-widget-yahoo.ui
@@ -61,7 +61,7 @@
<object class="GtkLabel" id="label_id">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Yahoo I_D:</property>
+ <property name="label" translatable="yes">Yahoo! I_D:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry_id</property>
</object>
@@ -142,7 +142,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="checkbutton_ignore_invites">
- <property name="label" translatable="yes">_Ignore conference and chatroom invitations</property>
+ <property name="label" translatable="yes">_Ignore conference and chat room invitations</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -174,7 +174,7 @@
<object class="GtkLabel" id="label_charset">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Charset:</property>
+ <property name="label" translatable="yes">_Character set:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry_charset</property>
</object>
@@ -276,7 +276,7 @@
</child>
<child>
<object class="GtkCheckButton" id="checkbutton_yahoojp">
- <property name="label" translatable="yes">Use _Yahoo Japan</property>
+ <property name="label" translatable="yes">Use _Yahoo! Japan</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index df47d48e8..9c79eb852 100644
--- a/libempathy-gtk/empathy-avatar-chooser.c
+++ b/libempathy-gtk/empathy-avatar-chooser.c
@@ -447,7 +447,7 @@ avatar_chooser_maybe_convert_and_scale (EmpathyAvatarChooser *chooser,
/* If there is no format we can use, report error to the user. */
if (new_mime_type == NULL || new_format_name == NULL) {
avatar_chooser_error_show (chooser, _("Couldn't convert image"),
- _("None of the accepted image formats is "
+ _("None of the accepted image formats are "
"supported on your system"));
return NULL;
}
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index c01b12519..3e565585b 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -618,7 +618,7 @@ chat_command_join_cb (EmpathyDispatchOperation *dispatch,
if (error != NULL) {
DEBUG ("Error: %s", error->message);
empathy_chat_view_append_event (chat->view,
- _("Failed to join chatroom"));
+ _("Failed to join chat room"));
}
}
diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c
index 578f8756a..f42bc6bdb 100644
--- a/libempathy-gtk/empathy-contact-menu.c
+++ b/libempathy-gtk/empathy-contact-menu.c
@@ -524,7 +524,7 @@ empathy_contact_invite_menu_item_new (EmpathyContact *contact)
g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
- item = gtk_image_menu_item_new_with_mnemonic (_("_Invite to chatroom"));
+ item = gtk_image_menu_item_new_with_mnemonic (_("_Invite to chat room"));
image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_GROUP_MESSAGE,
GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
diff --git a/libempathy-gtk/empathy-contact-widget.ui b/libempathy-gtk/empathy-contact-widget.ui
index 2e2ec3969..df8f535fb 100644
--- a/libempathy-gtk/empathy-contact-widget.ui
+++ b/libempathy-gtk/empathy-contact-widget.ui
@@ -358,7 +358,7 @@
<child>
<object class="GtkLabel" id="label670">
<property name="xalign">0</property>
- <property name="label" translatable="yes">Fullname:</property>
+ <property name="label" translatable="yes">Full name:</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
@@ -368,7 +368,7 @@
<child>
<object class="GtkLabel" id="label650">
<property name="xalign">0</property>
- <property name="label" translatable="yes">Email:</property>
+ <property name="label" translatable="yes">E-mail address:</property>
</object>
<packing>
<property name="top_attach">1</property>
@@ -380,7 +380,7 @@
<child>
<object class="GtkLabel" id="label651">
<property name="xalign">0</property>
- <property name="label" translatable="yes">Web site:</property>
+ <property name="label" translatable="yes">Website:</property>
</object>
<packing>
<property name="top_attach">2</property>
diff --git a/nautilus-sendto-plugin/empathy-nautilus-sendto.c b/nautilus-sendto-plugin/empathy-nautilus-sendto.c
index aae29d54d..503e51808 100644
--- a/nautilus-sendto-plugin/empathy-nautilus-sendto.c
+++ b/nautilus-sendto-plugin/empathy-nautilus-sendto.c
@@ -105,13 +105,13 @@ validate_destination (NstPlugin *plugin,
if (!empathy_contact_can_send_files (contact))
{
- *error = g_strdup (_("The contact selected cannot receive files."));
+ *error = g_strdup (_("The selected contact cannot receive files."));
ret = FALSE;
}
if (ret && !empathy_contact_is_online (contact))
{
- *error = g_strdup (_("The contact selected is offline."));
+ *error = g_strdup (_("The selected contact is offline."));
ret = FALSE;
}
diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
index 6c43f447d..eecbb5d7b 100644
--- a/src/empathy-account-assistant.c
+++ b/src/empathy-account-assistant.c
@@ -115,15 +115,15 @@ account_assistant_build_error_page (EmpathyAccountAssistant *self,
gtk_widget_show (w);
if (page_num == PAGE_IMPORT)
- message = _("There has been an error while importing the accounts.");
+ message = _("There was an error while importing the accounts.");
else if (page_num >= PAGE_ENTER_CREATE &&
priv->first_resp == RESPONSE_ENTER_ACCOUNT)
- message = _("There has been an error while parsing the account details.");
+ message = _("There was an error while parsing the account details.");
else if (page_num >= PAGE_ENTER_CREATE &&
priv->first_resp == RESPONSE_CREATE_ACCOUNT)
- message = _("There has been an error while creating the account.");
+ message = _("There was an error while creating the account.");
else
- message = _("There has been an error.");
+ message = _("There was an error.");
w = gtk_label_new (message);
gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 8a466b442..88f5e0a73 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -62,7 +62,7 @@
/* The primary text of the dialog shown to the user when he is about to lose
* unsaved changes */
#define PENDING_CHANGES_QUESTION_PRIMARY_TEXT \
- _("There are unsaved modification regarding your %s account.")
+ _("There are unsaved modifications to your %s account.")
/* The primary text of the dialog shown to the user when he is about to lose
* an unsaved new account */
#define UNSAVED_NEW_ACCOUNT_QUESTION_PRIMARY_TEXT \
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index de19b69a4..4a7d9f2f2 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -1830,7 +1830,7 @@ media_stream_error_to_txt (EmpathyCallWindow *self,
"product=Telepathy&amp;component=%s", cm);
result = g_strdup_printf (
- _("Something not expected happened in a Telepathy component. "
+ _("Something unexpected happened in a Telepathy component. "
"Please <a href=\"%s\">report this bug</a> and attach "
"logs gathered from the 'Debug' window in the Help menu."), url);
diff --git a/src/empathy-chat-window.ui b/src/empathy-chat-window.ui
index 13b812572..c2b56251c 100644
--- a/src/empathy-chat-window.ui
+++ b/src/empathy-chat-window.ui
@@ -28,7 +28,7 @@
<child>
<object class="GtkToggleAction" id="menu_conv_favorite">
<property name="name">menu_conv_favorite</property>
- <property name="label" translatable="yes">_Favorite Chatroom</property>
+ <property name="label" translatable="yes">_Favorite Chat Room</property>
</object>
</child>
<child>
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index c9e925d21..e85837c67 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -346,8 +346,8 @@ event_channel_process_voip_func (EventPriv *event)
gtk_message_dialog_format_secondary_text (
GTK_MESSAGE_DIALOG (dialog), video ?
- _("%s is video calling you, do you want to answer?"):
- _("%s is calling you, do you want to answer?"),
+ _("%s is video calling you. Do you want to answer?"):
+ _("%s is calling you. Do you want to answer?"),
empathy_contact_get_name (event->approval->contact));
/* Set image of the dialog */
diff --git a/src/empathy-preferences.ui b/src/empathy-preferences.ui
index 2e32fe9dd..8e4e1c221 100644
--- a/src/empathy-preferences.ui
+++ b/src/empathy-preferences.ui
@@ -532,7 +532,7 @@
</child>
<child>
<object class="GtkCheckButton" id="checkbutton_location_resource_network">
- <property name="label" translatable="yes">_Network (IP, Wifi)</property>
+ <property name="label" translatable="yes">_Network (IP, Wi-Fi)</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
diff --git a/src/empathy-tube-dispatch.c b/src/empathy-tube-dispatch.c
index 66efa217d..60f7f4b72 100644
--- a/src/empathy-tube-dispatch.c
+++ b/src/empathy-tube-dispatch.c
@@ -445,7 +445,7 @@ empathy_tube_dispatch_handle (EmpathyTubeDispatch *tube_dispatch)
msg = g_strdup_printf (
_("An invitation was offered for service %s, but you don't have the "
- "needed application to handle it"), priv->service);
+ "application necessary to handle it"), priv->service);
empathy_tube_dispatch_show_error (tube_dispatch, msg);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 02:13:06 +0800